From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13296 invoked by alias); 1 Apr 2005 19:13:59 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 12890 invoked from network); 1 Apr 2005 19:13:24 -0000 Received: from unknown (HELO wampa.office.slickedit.com) (24.106.178.205) by sourceware.org with SMTP; 1 Apr 2005 19:13:24 -0000 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: Re: [RFC] fullname attribute for GDB/MI stack frames Date: Fri, 01 Apr 2005 19:13:00 -0000 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: From: "Dennis Brueni" To: Cc: X-SW-Source: 2005-04/txt/msg00010.txt.bz2 > -----Original Message----- > From: Bob Rossi [mailto:bob@brasko.net]=20 > Sent: Thursday, March 31, 2005 9:40 PM > To: Dennis Brueni > Cc: gdb-patches@sources.redhat.com > Subject: Re: [RFC] fullname attribute for GDB/MI stack frames >=20 >=20 > > > I would look at mi-file.exp. Make sure the regex you use in the=20 > > > testsuite for matching the fullname is fullname=3D\"/.*/${srcfile}\" > > >=20 > > > I know that I originally committed something different,=20 > and it ended=20 > > > up morphing into this, so that it could pass the testsuite in a=20 > > > variety of different environments. > > >=20 > > > Bob Rossi > >=20 > >=20 > > Apologies for the broken lines; I also noticed that, after=20 > the fact :(=20 > > Updated patch set follows. > >=20 > > I have fixed the path issues in gdb.texinfo and also added=20 > ChangeLog=20 > > entries to the patch set. > >=20 > > For the testsuite regex's, I was just trying to remain=20 > consistent with=20 > > the tests for "file=3D" and not break anything. > > # # NOTE: cagney/2003-02-03: Not yet. > > # mi_gdb_test "-exec-continue" \ > > ! #=20=20=20=20 > {.*\*stopped,reason=3D"breakpoint-hit",.*func=3D"callee4".*file=3D". > *basics.c",line=3D"8"\}} \ > > # "-interpreter-exec console \"continue to callee4\"" > > send_gdb "999-exec-continue\n" > > gdb_expect { > > --- 100,106 ---- > >=20=20=20 > > # # NOTE: cagney/2003-02-03: Not yet. > > # mi_gdb_test "-exec-continue" \ > > ! #=20=20=20=20 > {.*\*stopped,reason=3D"breakpoint-hit",.*func=3D"callee4".*file=3D". > *basics.c",fullname=3D".*basics.c",line=3D"8"\}} \ > > # "-interpreter-exec console \"continue to callee4\"" > > send_gdb "999-exec-continue\n" > > gdb_expect { >=20 > Hi, >=20 > Again, for the fullname regex, I would recommend using the=20 > same regex used in mi-file.exp. This would be like=20 > fullname=3D"/.*basics.c" This forces the regex to ensure that=20 > the path is absolute, which the check you have does not. >=20 > Bob Rossi > As promised, here is an updated patch set with the regex changes you suggested, plus checking for a little more directory information with respect to the fullname path, to the extent that we can be sure the test case still passes in all environments. Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/ChangeLog,v retrieving revision 1.7049 diff -c -p -b -r1.7049 ChangeLog *** ChangeLog 31 Mar 2005 20:39:08 -0000 1.7049 --- ChangeLog 1 Apr 2005 16:06:42 -0000 *************** *** 1,3 **** --- 1,8 ---- + 2005-03-29 Dennis Brueni +=20 + * stack.c (print_frame): In MI mode, + output fullname attribute with stack frame +=20 2005-03-31 Kevin Buettner =20=20 * solib-frv.c (struct lm_info): Add new field ``lm_addr''. Index: stack.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/stack.c,v retrieving revision 1.130 diff -c -p -b -r1.130 stack.c *** stack.c 28 Feb 2005 17:00:49 -0000 1.130 --- stack.c 1 Apr 2005 16:06:42 -0000 *************** print_frame (struct frame_info *fi,=20 *** 679,684 **** --- 679,692 ---- ui_out_text (uiout, " at "); annotate_frame_source_file (); ui_out_field_string (uiout, "file", sal.symtab->filename); + if (ui_out_is_mi_like_p(uiout)) { + if (!sal.symtab->fullname) { + symtab_to_fullname(sal.symtab); + } + if (sal.symtab->fullname) { + ui_out_field_string (uiout, "fullname", sal.symtab->fullname); + } + } annotate_frame_source_file_end (); ui_out_text (uiout, ":"); annotate_frame_source_line (); Index: doc/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/doc/ChangeLog,v retrieving revision 1.473 diff -c -p -b -r1.473 ChangeLog *** doc/ChangeLog 10 Mar 2005 13:12:32 -0000 1.473 --- doc/ChangeLog 1 Apr 2005 16:06:43 -0000 *************** *** 1,3 **** --- 1,7 ---- + 2005-03-29 Dennis Brueni +=20 + * gdb.texinfo: Update docs for MI stack frames with fullname attribute. +=20 2005-03-10 Bob Rossi =20=20 * gdb.texinfo: Update copyright Index: doc/gdb.texinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v retrieving revision 1.233 diff -c -p -b -r1.233 gdb.texinfo *** doc/gdb.texinfo 10 Mar 2005 13:12:33 -0000 1.233 --- doc/gdb.texinfo 1 Apr 2005 16:06:47 -0000 *************** Setting a watchpoint on a variable in th *** 15894,15900 **** ^running ^done,reason=3D"watchpoint-trigger",wpt=3D@{number=3D"2",exp=3D"x"@}, value=3D@{old=3D"-268439212",new=3D"55"@}, ! frame=3D@{func=3D"main",args=3D[],file=3D"recursive2.c",line=3D"5"@} (@value{GDBP}) @end smallexample =20=20 --- 15894,15901 ---- ^running ^done,reason=3D"watchpoint-trigger",wpt=3D@{number=3D"2",exp=3D"x"@}, value=3D@{old=3D"-268439212",new=3D"55"@}, ! frame=3D@{func=3D"main",args=3D[],file=3D"recursive2.c", ! fullname=3D"/home/foo/bar/devo/myproject/recursive2.c",line=3D"5"@} (@value{GDBP}) @end smallexample =20=20 *************** for the watchpoint going out of scope. *** 15912,15925 **** ^done,reason=3D"watchpoint-trigger", wpt=3D@{number=3D"5",exp=3D"C"@},value=3D@{old=3D"-276895068",new=3D"3"@}, frame=3D@{func=3D"callee4",args=3D[], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"13"@} (@value{GDBP}) -exec-continue ^running ^done,reason=3D"watchpoint-scope",wpnum=3D"5", frame=3D@{func=3D"callee3",args=3D[@{name=3D"strarg", value=3D"0x11940 \"A string argument.\""@}], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"18"@} (@value{GDBP}) @end smallexample =20=20 --- 15913,15928 ---- ^done,reason=3D"watchpoint-trigger", wpt=3D@{number=3D"5",exp=3D"C"@},value=3D@{old=3D"-276895068",new=3D"3"@}, frame=3D@{func=3D"callee4",args=3D[], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"13"= @} (@value{GDBP}) -exec-continue ^running ^done,reason=3D"watchpoint-scope",wpnum=3D"5", frame=3D@{func=3D"callee3",args=3D[@{name=3D"strarg", value=3D"0x11940 \"A string argument.\""@}], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"18"= @} (@value{GDBP}) @end smallexample =20=20 *************** enabled=3D"y",addr=3D"",what=3D"C",times=3D"0"@} *** 15951,15957 **** ^done,reason=3D"watchpoint-trigger",wpt=3D@{number=3D"2",exp=3D"C"@}, value=3D@{old=3D"-276895068",new=3D"3"@}, frame=3D@{func=3D"callee4",args=3D[], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"13"@} (@value{GDBP}) -break-list ^done,BreakpointTable=3D@{nr_rows=3D"2",nr_cols=3D"6", --- 15954,15961 ---- ^done,reason=3D"watchpoint-trigger",wpt=3D@{number=3D"2",exp=3D"C"@}, value=3D@{old=3D"-276895068",new=3D"3"@}, frame=3D@{func=3D"callee4",args=3D[], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"13"= @} (@value{GDBP}) -break-list ^done,BreakpointTable=3D@{nr_rows=3D"2",nr_cols=3D"6", *************** enabled=3D"y",addr=3D"",what=3D"C",times=3D"-5"@ *** 15972,15978 **** ^done,reason=3D"watchpoint-scope",wpnum=3D"2", frame=3D@{func=3D"callee3",args=3D[@{name=3D"strarg", value=3D"0x11940 \"A string argument.\""@}], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"18"@} (@value{GDBP}) -break-list ^done,BreakpointTable=3D@{nr_rows=3D"1",nr_cols=3D"6", --- 15976,15983 ---- ^done,reason=3D"watchpoint-scope",wpnum=3D"2", frame=3D@{func=3D"callee3",args=3D[@{name=3D"strarg", value=3D"0x11940 \"A string argument.\""@}], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"18"= @} (@value{GDBP}) -break-list ^done,BreakpointTable=3D@{nr_rows=3D"1",nr_cols=3D"6", *************** On a PPC MBX board: *** 16207,16213 **** =20=20 (@value{GDBP}) *stopped,reason=3D"breakpoint-hit",bkptno=3D"1",frame=3D@{func=3D"main", ! args=3D[],file=3D"try.c",line=3D"5"@} (@value{GDBP}) -data-list-changed-registers ^done,changed-registers=3D["0","1","2","4","5","6","7","8","9", --- 16212,16218 ---- =20=20 (@value{GDBP}) *stopped,reason=3D"breakpoint-hit",bkptno=3D"1",frame=3D@{func=3D"main", ! args=3D[],file=3D"try.c",fullname=3D"/home/foo/bar/devo/myproject/try.c",= line=3D"5"@} (@value{GDBP}) -data-list-changed-registers ^done,changed-registers=3D["0","1","2","4","5","6","7","8","9", *************** The corresponding @value{GDBN} correspon *** 16814,16820 **** (@value{GDBP}) @@Hello world *stopped,reason=3D"breakpoint-hit",bkptno=3D"2",frame=3D@{func=3D"foo",ar= gs=3D[], ! file=3D"hello.c",line=3D"13"@} (@value{GDBP}) @end smallexample =20=20 --- 16819,16825 ---- (@value{GDBP}) @@Hello world *stopped,reason=3D"breakpoint-hit",bkptno=3D"2",frame=3D@{func=3D"foo",ar= gs=3D[], ! file=3D"hello.c",fullname=3D"/home/foo/bar/devo/myproject/hello.c",line= =3D"13"@} (@value{GDBP}) @end smallexample =20=20 *************** Function returning @code{void}. *** 16846,16852 **** (@value{GDBP}) @@hello from foo *stopped,reason=3D"function-finished",frame=3D@{func=3D"main",args=3D[], ! file=3D"hello.c",line=3D"7"@} (@value{GDBP}) @end smallexample =20=20 --- 16851,16857 ---- (@value{GDBP}) @@hello from foo *stopped,reason=3D"function-finished",frame=3D@{func=3D"main",args=3D[], ! file=3D"hello.c",fullname=3D"/home/foo/bar/devo/myproject/hello.c",line= =3D"7"@} (@value{GDBP}) @end smallexample =20=20 *************** value itself. *** 16860,16866 **** (@value{GDBP}) *stopped,reason=3D"function-finished",frame=3D@{addr=3D"0x000107b0",func= =3D"foo", args=3D[@{name=3D"a",value=3D"1"],@{name=3D"b",value=3D"9"@}@}, ! file=3D"recursive2.c",line=3D"14"@}, gdb-result-var=3D"$1",return-value=3D"0" (@value{GDBP}) @end smallexample --- 16865,16871 ---- (@value{GDBP}) *stopped,reason=3D"function-finished",frame=3D@{addr=3D"0x000107b0",func= =3D"foo", args=3D[@{name=3D"a",value=3D"1"],@{name=3D"b",value=3D"9"@}@}, ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive2= .c",line=3D"14"@}, gdb-result-var=3D"$1",return-value=3D"0" (@value{GDBP}) @end smallexample *************** The corresponding @value{GDBN} command i *** 16897,16903 **** 222^done (@value{GDBP}) 111*stopped,signal-name=3D"SIGINT",signal-meaning=3D"Interrupt", ! frame=3D@{addr=3D"0x00010140",func=3D"foo",args=3D[],file=3D"try.c",line= =3D"13"@} (@value{GDBP}) =20=20 (@value{GDBP}) --- 16902,16909 ---- 222^done (@value{GDBP}) 111*stopped,signal-name=3D"SIGINT",signal-meaning=3D"Interrupt", ! frame=3D@{addr=3D"0x00010140",func=3D"foo",args=3D[],file=3D"try.c", ! fullname=3D"/home/foo/bar/devo/myproject/try.c",line=3D"13"@} (@value{GDBP}) =20=20 (@value{GDBP}) *************** file=3D"../../../devo/gdb/testsuite/gdb.mi *** 16995,17001 **** (@value{GDBP}) 000*stopped,reason=3D"breakpoint-hit",bkptno=3D"1", frame=3D@{func=3D"callee4",args=3D[], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"8"@} (@value{GDBP}) 205-break-delete 205^done --- 17001,17008 ---- (@value{GDBP}) 000*stopped,reason=3D"breakpoint-hit",bkptno=3D"1", frame=3D@{func=3D"callee4",args=3D[], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"8"@} (@value{GDBP}) 205-break-delete 205^done *************** file=3D"../../../devo/gdb/testsuite/gdb.mi *** 17004,17010 **** 111^done,frame=3D@{level=3D"0",func=3D"callee3", args=3D[@{name=3D"strarg", value=3D"0x11940 \"A string argument.\""@}], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"18"@} (@value{GDBP}) @end smallexample =20=20 --- 17011,17018 ---- 111^done,frame=3D@{level=3D"0",func=3D"callee3", args=3D[@{name=3D"strarg", value=3D"0x11940 \"A string argument.\""@}], ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"18"= @} (@value{GDBP}) @end smallexample =20=20 *************** The corresponding @value{GDBN} command i *** 17037,17043 **** ^running (@value{GDBP}) *stopped,reason=3D"breakpoint-hit",bkptno=3D"1", ! frame=3D@{func=3D"main",args=3D[],file=3D"recursive2.c",line=3D"4"@} (@value{GDBP}) @end smallexample =20=20 --- 17045,17052 ---- ^running (@value{GDBP}) *stopped,reason=3D"breakpoint-hit",bkptno=3D"1", ! frame=3D@{func=3D"main",args=3D[],file=3D"recursive2.c", ! fullname=3D"/home/foo/bar/devo/myproject/recursive2.c",line=3D"4"@} (@value{GDBP}) @end smallexample =20=20 *************** Stepping into a function: *** 17090,17096 **** (@value{GDBP}) *stopped,reason=3D"end-stepping-range", frame=3D@{func=3D"foo",args=3D[@{name=3D"a",value=3D"10"@}, ! @{name=3D"b",value=3D"0"@}],file=3D"recursive2.c",line=3D"11"@} (@value{GDBP}) @end smallexample =20=20 --- 17099,17106 ---- (@value{GDBP}) *stopped,reason=3D"end-stepping-range", frame=3D@{func=3D"foo",args=3D[@{name=3D"a",value=3D"10"@}, ! @{name=3D"b",value=3D"0"@}],file=3D"recursive2.c", ! fullname=3D"/home/foo/bar/devo/myproject/recursive2.c",line=3D"11"@} (@value{GDBP}) @end smallexample =20=20 *************** The corresponding @value{GDBN} command i *** 17133,17146 **** =20=20 (@value{GDBP}) *stopped,reason=3D"end-stepping-range", ! frame=3D@{func=3D"foo",args=3D[],file=3D"try.c",line=3D"10"@} (@value{GDBP}) -exec-step-instruction ^running =20=20 (@value{GDBP}) *stopped,reason=3D"end-stepping-range", ! frame=3D@{addr=3D"0x000100f4",func=3D"foo",args=3D[],file=3D"try.c",line= =3D"10"@} (@value{GDBP}) @end smallexample =20=20 --- 17143,17158 ---- =20=20 (@value{GDBP}) *stopped,reason=3D"end-stepping-range", ! frame=3D@{func=3D"foo",args=3D[],file=3D"try.c", ! fullname=3D"/home/foo/bar/devo/myproject/try.c",line=3D"10"@} (@value{GDBP}) -exec-step-instruction ^running =20=20 (@value{GDBP}) *stopped,reason=3D"end-stepping-range", ! frame=3D@{addr=3D"0x000100f4",func=3D"foo",args=3D[],file=3D"try.c", ! fullname=3D"/home/foo/bar/devo/myproject/try.c",line=3D"10"@} (@value{GDBP}) @end smallexample =20=20 *************** The corresponding @value{GDBN} command i *** 17172,17178 **** (@value{GDBP}) x =3D 55 *stopped,reason=3D"location-reached",frame=3D@{func=3D"main",args=3D[], ! file=3D"recursive2.c",line=3D"6"@} (@value{GDBP}) @end smallexample =20=20 --- 17184,17190 ---- (@value{GDBP}) x =3D 55 *stopped,reason=3D"location-reached",frame=3D@{func=3D"main",args=3D[], ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive2= .c",line=3D"6"@} (@value{GDBP}) @end smallexample =20=20 *************** functionality of @samp{-stack-list-argum *** 17672,17686 **** ^done, stack=3D[ frame=3D@{level=3D"0",addr=3D"0x00010734",func=3D"callee4", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"8"@}, frame=3D@{level=3D"1",addr=3D"0x0001076c",func=3D"callee3", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"17"@}, frame=3D@{level=3D"2",addr=3D"0x0001078c",func=3D"callee2", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"22"@}, frame=3D@{level=3D"3",addr=3D"0x000107b4",func=3D"callee1", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"27"@}, frame=3D@{level=3D"4",addr=3D"0x000107e0",func=3D"main", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c",line=3D"32"@}] (@value{GDBP}) -stack-list-arguments 0 ^done, --- 17684,17703 ---- ^done, stack=3D[ frame=3D@{level=3D"0",addr=3D"0x00010734",func=3D"callee4", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"8"@= }, frame=3D@{level=3D"1",addr=3D"0x0001076c",func=3D"callee3", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"17"= @}, frame=3D@{level=3D"2",addr=3D"0x0001078c",func=3D"callee2", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"22"= @}, frame=3D@{level=3D"3",addr=3D"0x000107b4",func=3D"callee1", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"27"= @}, frame=3D@{level=3D"4",addr=3D"0x000107e0",func=3D"main", ! file=3D"../../../devo/gdb/testsuite/gdb.mi/basics.c", ! fullname=3D"/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line=3D"32"= @}] (@value{GDBP}) -stack-list-arguments 0 ^done, *************** Full stack backtrace: *** 17762,17790 **** -stack-list-frames ^done,stack=3D [frame=3D@{level=3D"0",addr=3D"0x0001076c",func=3D"foo", ! file=3D"recursive2.c",line=3D"11"@}, frame=3D@{level=3D"1",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"2",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"3",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"4",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"5",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"6",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"7",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"8",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"9",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"10",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"11",addr=3D"0x00010738",func=3D"main", ! file=3D"recursive2.c",line=3D"4"@}] (@value{GDBP}) @end smallexample =20=20 --- 17779,17807 ---- -stack-list-frames ^done,stack=3D [frame=3D@{level=3D"0",addr=3D"0x0001076c",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"11"@}, frame=3D@{level=3D"1",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"2",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"3",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"4",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"5",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"6",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"7",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"8",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"9",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"10",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"11",addr=3D"0x00010738",func=3D"main", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"4"@}] (@value{GDBP}) @end smallexample =20=20 *************** Show frames between @var{low_frame} and=20 *** 17795,17805 **** -stack-list-frames 3 5 ^done,stack=3D [frame=3D@{level=3D"3",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"4",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}, frame=3D@{level=3D"5",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}] (@value{GDBP}) @end smallexample =20=20 --- 17812,17822 ---- -stack-list-frames 3 5 ^done,stack=3D [frame=3D@{level=3D"3",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"4",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}, frame=3D@{level=3D"5",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}] (@value{GDBP}) @end smallexample =20=20 *************** Show a single frame: *** 17810,17816 **** -stack-list-frames 3 3 ^done,stack=3D [frame=3D@{level=3D"3",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",line=3D"14"@}] (@value{GDBP}) @end smallexample =20=20 --- 17827,17833 ---- -stack-list-frames 3 3 ^done,stack=3D [frame=3D@{level=3D"3",addr=3D"0x000107a4",func=3D"foo", ! file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursiv= e2.c",line=3D"14"@}] (@value{GDBP}) @end smallexample =20=20 Index: testsuite/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/ChangeLog,v retrieving revision 1.1096 diff -c -p -b -r1.1096 ChangeLog *** testsuite/ChangeLog 29 Mar 2005 20:37:18 -0000 1.1096 --- testsuite/ChangeLog 1 Apr 2005 16:06:50 -0000 *************** *** 1,3 **** --- 1,22 ---- + 2005-03-29 Dennis Brueni +=20 + * gdb.mi/mi-cli.exp: Add tests for fullname in stack frame. + * gdb.mi/mi-return.exp: Likewise. + * gdb.mi/mi-stack.exp: Likewise. + * gdb.mi/mi-stepi.exp: Likewise. + * gdb.mi/mi-syn-frame.exp: Likewise. + * gdb.mi/mi-until.exp: Likewise. + * gdb.mi/mi-var-display.exp: Likewise. + * gdb.mi/mi-watch.exp: Likewise. + * gdb.mi/mi2-cli.exp: Likewise. + * gdb.mi/mi2-return.exp: Likewise. + * gdb.mi/mi2-stack.exp: Likewise. + * gdb.mi/mi2-stepi.exp: Likewise. + * gdb.mi/mi2-syn-frame.exp: Likewise. + * gdb.mi/mi2-until.exp: Likewise. + * gdb.mi/mi2-var-display.exp: Likewise. + * lib/mi-support.exp: Likewise. +=20 2005-03-29 Daniel Jacobowitz =20=20 * gdb.base/ptr-typedef.exp, gdb.base/ptr-typedef.c: New files. Index: testsuite/gdb.mi/mi-cli.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-cli.exp,v retrieving revision 1.3 diff -c -p -b -r1.3 mi-cli.exp *** testsuite/gdb.mi/mi-cli.exp 15 Aug 2004 10:15:58 -0000 1.3 --- testsuite/gdb.mi/mi-cli.exp 1 Apr 2005 16:06:51 -0000 *************** mi_gdb_test "-interpreter-exec console \ *** 100,106 **** =20=20 # # NOTE: cagney/2003-02-03: Not yet. # mi_gdb_test "-exec-continue" \ ! # {.*\*stopped,reason=3D"breakpoint-hit",.*func=3D"callee4".*file=3D".= *basics.c",line=3D"8"\}} \ # "-interpreter-exec console \"continue to callee4\"" send_gdb "999-exec-continue\n" gdb_expect { --- 100,106 ---- =20=20 # # NOTE: cagney/2003-02-03: Not yet. # mi_gdb_test "-exec-continue" \ ! # {.*\*stopped,reason=3D"breakpoint-hit",.*func=3D"callee4".*file=3D".= *basics.c",fullname=3D"/.*/gdb/testsuite/gdb.mi/basics.c",line=3D"8"\}} \ # "-interpreter-exec console \"continue to callee4\"" send_gdb "999-exec-continue\n" gdb_expect { *************** mi_gdb_test "600-break-insert -t basics. *** 161,171 **** "-break-insert -t basics.c:\$line_main_hello" =20=20 # mi_gdb_test "-exec-continue" \ ! # {.*\*stopped.*,file=3D".*basics.c",line=3D"$line_main_hello"\}} \ # "-exec-continue to line \$line_main_hello" send_gdb "700-exec-continue\n" gdb_expect { ! -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=3D.*basi= cs.c.,line=3D.$line_main_hello.*$mi_gdb_prompt$" { pass "-exec-continue to line \$line_main_hello" } timeout { --- 161,171 ---- "-break-insert -t basics.c:\$line_main_hello" =20=20 # mi_gdb_test "-exec-continue" \ ! # {.*\*stopped.*,file=3D".*basics.c",fullname=3D"/.*/gdb/testsuite/gdb.= mi/basics.c",line=3D"$line_main_hello"\}} \ # "-exec-continue to line \$line_main_hello" send_gdb "700-exec-continue\n" gdb_expect { ! -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=3D\".*ba= sics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/basics.c\",line=3D.$line_mai= n_hello.*$mi_gdb_prompt$" { pass "-exec-continue to line \$line_main_hello" } timeout { *************** gdb_expect { *** 175,185 **** =20=20 # NOTE: cagney/2003-02-03: Not yet. # mi_gdb_test "-exec-next" \ ! # {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",lin= e=3D"$line_main_return"\}} \ # "-exec-next to line \$line_main_return" send_gdb "800-exec-next\n" gdb_expect { ! -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=3D.end-s= tepping-range.*,file=3D.*basics.c.,line=3D.$line_main_return.*$mi_gdb_promp= t$" { pass "-exec-next to line \$line_main_return" } timeout { --- 175,185 ---- =20=20 # NOTE: cagney/2003-02-03: Not yet. # mi_gdb_test "-exec-next" \ ! # {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",ful= lname=3D"/.*/gdb/testsuite/gdb.mi/basics.c",line=3D"$line_main_return"\}} \ # "-exec-next to line \$line_main_return" send_gdb "800-exec-next\n" gdb_expect { ! -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=3D.end-s= tepping-range.*,file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi= /basics.c\",line=3D.$line_main_return.*$mi_gdb_prompt$" { pass "-exec-next to line \$line_main_return" } timeout { Index: testsuite/gdb.mi/mi-return.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-return.exp,v retrieving revision 1.11 diff -c -p -b -r1.11 mi-return.exp *** testsuite/gdb.mi/mi-return.exp 15 Aug 2004 10:15:58 -0000 1.11 --- testsuite/gdb.mi/mi-return.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_return_simple {} { *** 53,59 **** =20=20 send_gdb "111-exec-return\n" gdb_expect { ! -re "111\\^done,frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"callee3= \",args=3D\\\[.*\\\],file=3D\".*basics.c\",line=3D\"$line_callee3_close_bra= ce\"\}\r\n$mi_gdb_prompt$" {pass "return from callee4 now"} -re ".*\r\n$mi_gdb_prompt$" { fail "return from callee4 now" } timeout { fail "return from callee4 now (timeout)" } --- 53,59 ---- =20=20 send_gdb "111-exec-return\n" gdb_expect { ! -re "111\\^done,frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"callee3= \",args=3D\\\[.*\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/g= db.mi/basics.c\",line=3D\"$line_callee3_close_brace\"\}\r\n$mi_gdb_prompt$"= {pass "return from callee4 now"} -re ".*\r\n$mi_gdb_prompt$" { fail "return from callee4 now" } timeout { fail "return from callee4 now (timeout)" } Index: testsuite/gdb.mi/mi-stack.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stack.exp,v retrieving revision 1.14 diff -c -p -b -r1.14 mi-stack.exp *** testsuite/gdb.mi/mi-stack.exp 15 Aug 2004 10:15:58 -0000 1.14 --- testsuite/gdb.mi/mi-stack.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_stack_frame_listing {} { *** 57,63 **** # -stack-list-frames 1 3 =20=20 mi_gdb_test "231-stack-list-frames" \ ! "231\\^done,stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func= =3D\"callee4\",file=3D\".*basics.c\",line=3D\"$line_callee4_body\"\},frame= =3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"callee3\",.*\},frame=3D\{level= =3D\"2\",addr=3D\"$hex\",func=3D\"callee2\",.*\},frame=3D\{level=3D\"3\",ad= dr=3D\"$hex\",func=3D\"callee1\",.*\},frame=3D\{level=3D\"4\",addr=3D\"$hex= \",func=3D\"main\",.*\}\\\]" \ "stack frame listing" mi_gdb_test "232-stack-list-frames 1 1" \ "232\\^done,stack=3D\\\[frame=3D\{level=3D\"1\",addr=3D\"$hex\",func= =3D\"callee3\",.*\}\\\]" \ --- 57,63 ---- # -stack-list-frames 1 3 =20=20 mi_gdb_test "231-stack-list-frames" \ ! "231\\^done,stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func= =3D\"callee4\",file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/= basics.c\",line=3D\"$line_callee4_body\"\},frame=3D\{level=3D\"1\",addr=3D\= "$hex\",func=3D\"callee3\",.*\},frame=3D\{level=3D\"2\",addr=3D\"$hex\",fun= c=3D\"callee2\",.*\},frame=3D\{level=3D\"3\",addr=3D\"$hex\",func=3D\"calle= e1\",.*\},frame=3D\{level=3D\"4\",addr=3D\"$hex\",func=3D\"main\",.*\}\\\]"= \ "stack frame listing" mi_gdb_test "232-stack-list-frames 1 1" \ "232\\^done,stack=3D\\\[frame=3D\{level=3D\"1\",addr=3D\"$hex\",func= =3D\"callee3\",.*\}\\\]" \ *************** set line_callee4_return_0 [gdb_get_line_ *** 161,167 **** # step until A, B, C, have some reasonable values. send_gdb "-exec-next 3\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"end-stepping= -range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee4\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"$line_callee4_return_0\"\}= \r\n$mi_gdb_prompt$" { pass "next's in callee4" } timeout { fail "next in callee4 (timeout)" } --- 161,167 ---- # step until A, B, C, have some reasonable values. send_gdb "-exec-next 3\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"end-stepping= -range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee4\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" { pass "next's in callee4" } timeout { fail "next in callee4 (timeout)" } Index: testsuite/gdb.mi/mi-stepi.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stepi.exp,v retrieving revision 1.10 diff -c -p -b -r1.10 mi-stepi.exp *** testsuite/gdb.mi/mi-stepi.exp 15 Aug 2004 10:15:58 -0000 1.10 --- testsuite/gdb.mi/mi-stepi.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_stepi_nexti {} { *** 53,59 **** =20=20 send_gdb "111-exec-step-instruction\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_= prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "step-instruction at main" --- 53,59 ---- =20=20 send_gdb "111-exec-step-instruction\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "step-instruction at main" *************** proc test_stepi_nexti {} { *** 67,73 **** } send_gdb "222-exec-next-instruction\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_= prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" --- 67,73 ---- } send_gdb "222-exec-next-instruction\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" *************** proc test_stepi_nexti {} { *** 81,87 **** } send_gdb "333-exec-next-instruction\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_= prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" --- 81,87 ---- } send_gdb "333-exec-next-instruction\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" Index: testsuite/gdb.mi/mi-syn-frame.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-syn-frame.exp,v retrieving revision 1.2 diff -c -p -b -r1.2 mi-syn-frame.exp *** testsuite/gdb.mi/mi-syn-frame.exp 24 Feb 2003 20:15:47 -0000 1.2 --- testsuite/gdb.mi/mi-syn-frame.exp 1 Apr 2005 16:06:51 -0000 *************** gdb_expect { *** 69,75 **** } } =20=20 ! mi_gdb_test "404-stack-list-frames 0 0" "404\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= line=3D\"$decimal\"\}.*\\\]" =20=20 =20=20 # --- 69,75 ---- } } =20=20 ! mi_gdb_test "404-stack-list-frames 0 0" "404\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"\= }.*\\\]" =20=20 =20=20 # *************** mi_gdb_test "406-data-evaluate-expressio *** 83,89 **** # We should have both a signal handler and a call dummy frame # in this next output. =20=20 ! mi_gdb_test "407-stack-list-frames" "407\\^done,reason=3D\"breakpoint-hit= \",bkptno=3D\"3\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func= =3D\"subroutine\",args=3D\\\[\{name=3D\"in\",value=3D\"$decimal\"\}\\\],fil= e=3D\".*mi-syn-frame.c\",line=3D\"$decimal\"\},stack=3D\\\[frame=3D\{level= =3D\"0\",addr=3D\"$hex\",func=3D\"subroutine\",file=3D\".*mi-syn-frame.c\",= line=3D\"$decimal\"\},frame=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"hand= ler\",file=3D\".*mi-syn-frame.c\",line=3D\"$decimal\"\},frame=3D\{level=3D\= "2\",addr=3D\"$hex\",func=3D\"\"\},.*frame=3D\{level= =3D\"$decimal\",addr=3D\"$hex\",func=3D\"have_a_very_merry_interrupt\",file= =3D\".*mi-syn-frame.c\",line=3D\"$decimal\"\},frame=3D\{level=3D\"$decimal\= ",addr=3D\"$hex\",func=3D\"\"\},frame=3D\{level= =3D\"$decimal\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\"= ,line=3D\"$decimal\"\}.*\\\]" =20=20 =20=20 send_gdb "408-exec-continue\n" --- 83,89 ---- # We should have both a signal handler and a call dummy frame # in this next output. =20=20 ! mi_gdb_test "407-stack-list-frames" "407\\^done,reason=3D\"breakpoint-hit= \",bkptno=3D\"3\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func= =3D\"subroutine\",args=3D\\\[\{name=3D\"in\",value=3D\"$decimal\"\}\\\],fil= e=3D\".*mi-syn-frame.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame= .c\",line=3D\"$decimal\"\},stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$he= x\",func=3D\"subroutine\",file=3D\".*mi-syn-frame.c\",fullname=3D\"/.*/gdb/= testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"\},frame=3D\{level=3D\= "1\",addr=3D\"$hex\",func=3D\"handler\",file=3D\".*mi-syn-frame.c\",fullnam= e=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"\},frame= =3D\{level=3D\"2\",addr=3D\"$hex\",func=3D\"\"\},.*f= rame=3D\{level=3D\"$decimal\",addr=3D\"$hex\",func=3D\"have_a_very_merry_in= terrupt\",file=3D\".*mi-syn-frame.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi= /mi-syn-frame.c\",line=3D\"$decimal\"\},frame=3D\{level=3D\"$decimal\",addr= =3D\"$hex\",func=3D\"\"\},frame=3D\{level=3D\"$de= cimal\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",fullnam= e=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"\}.*\\\]" =20=20 =20=20 send_gdb "408-exec-continue\n" *************** gdb_expect { *** 96,102 **** } } =20=20 ! mi_gdb_test "409-stack-list-frames 0 0" "409\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= line=3D\"$decimal\"\}.*\\\]" =20=20 # # Call bar() by hand, which should get an exception while running. --- 96,102 ---- } } =20=20 ! mi_gdb_test "409-stack-list-frames 0 0" "409\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"\= }.*\\\]" =20=20 # # Call bar() by hand, which should get an exception while running. *************** mi_gdb_test "409-stack-list-frames 0 0"=20 *** 104,110 **** =20=20 mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"= The program being debugged was signaled while in a function called from GDB= .\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was receive= d.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal= on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the f= unction \\(bar\\) will be abandoned.\\\\n\"\[\r\n\]+410\\^error,msg=3D\"The= program being debugged was signaled while in a function called from GDB.\\= \\nGDB remains in the frame where the signal was received.\\\\nTo change th= is behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the exp= ression containing the function \\(bar\\) will be abandoned.\"" "call infer= ior function which raises exception" =20=20 ! mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-receive= d\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",f= rame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-f= rame.c\",line=3D\"$decimal\"\},stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\= "$hex\",func=3D\"bar\",file=3D\".*mi-syn-frame.c\",line=3D\"$decimal\"},fra= me=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"\"\= },frame=3D\{level=3D\"2\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn= -frame.c\",line=3D\"$decimal\"}.*\\\]" "backtrace from inferior function at= exception" =20=20 mi_gdb_exit =20=20 --- 104,110 ---- =20=20 mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"= The program being debugged was signaled while in a function called from GDB= .\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was receive= d.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal= on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the f= unction \\(bar\\) will be abandoned.\\\\n\"\[\r\n\]+410\\^error,msg=3D\"The= program being debugged was signaled while in a function called from GDB.\\= \\nGDB remains in the frame where the signal was received.\\\\nTo change th= is behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the exp= ression containing the function \\(bar\\) will be abandoned.\"" "call infer= ior function which raises exception" =20=20 ! mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-receive= d\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",f= rame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-f= rame.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$d= ecimal\"\},stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"bar= \",file=3D\".*mi-syn-frame.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn= -frame.c\",line=3D\"$decimal\"},frame=3D\{level=3D\"1\",addr=3D\"$hex\",fun= c=3D\"\"\},frame=3D\{level=3D\"2\",addr=3D\"$hex\= ",func=3D\"main\",file=3D\".*mi-syn-frame.c\",fullname=3D\"/.*/gdb/testsuit= e/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"}.*\\\]" "backtrace from infer= ior function at exception" =20=20 mi_gdb_exit =20=20 Index: testsuite/gdb.mi/mi-until.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-until.exp,v retrieving revision 1.8 diff -c -p -b -r1.8 mi-until.exp *** testsuite/gdb.mi/mi-until.exp 9 Aug 2004 16:32:44 -0000 1.8 --- testsuite/gdb.mi/mi-until.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_until {} { *** 78,84 **** =20=20 send_gdb "111-exec-until\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\"= ,args=3D\\\[\\\],file=3D\".*until.c\",line=3D\"12\"\}\r\n$mi_gdb_prompt$" { pass "until after while loop" } timeout { --- 78,84 ---- =20=20 send_gdb "111-exec-until\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\"= ,args=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi= /until.c\",line=3D\"12\"\}\r\n$mi_gdb_prompt$" { pass "until after while loop" } timeout { *************** proc test_until {} { *** 88,94 **** =20=20 send_gdb "222-exec-until 15\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" { pass "until line number" } timeout { --- 88,94 ---- =20=20 send_gdb "222-exec-until 15\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/u= ntil.c\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" { pass "until line number" } timeout { *************** proc test_until {} { *** 98,104 **** =20=20 send_gdb "333-exec-until until.c:17\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" { pass "until line number:file" } timeout { --- 98,104 ---- =20=20 send_gdb "333-exec-until until.c:17\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/u= ntil.c\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" { pass "until line number:file" } timeout { *************** proc test_until {} { *** 110,116 **** =20=20 send_gdb "444-exec-until until.c:25\n" gdb_expect { ! -re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",= args=3D\\\[\\\],file=3D\".*until.c\",line=3D\"24\"\}\r\n$mi_gdb_prompt$" { pass "until after current function" } timeout { --- 110,116 ---- =20=20 send_gdb "444-exec-until until.c:25\n" gdb_expect { ! -re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",= args=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/= until.c\",line=3D\"24\"\}\r\n$mi_gdb_prompt$" { pass "until after current function" } timeout { Index: testsuite/gdb.mi/mi-var-display.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-display.exp,v retrieving revision 1.12 diff -c -p -b -r1.12 mi-var-display.exp *** testsuite/gdb.mi/mi-var-display.exp 17 Aug 2004 09:38:29 -0000 1.12 --- testsuite/gdb.mi/mi-var-display.exp 1 Apr 2005 16:06:51 -0000 *************** mi_gdb_test "200-break-insert $line_dct_ *** 48,54 **** mi_run_cmd # The running part has been checked already by mi_run_cmd gdb_expect { ! -re "\[\r\n\]*000\\*stopped,reason=3D\"breakpoint-hit\",bkptno=3D\"1\= ",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"do_children_tes= ts\",args=3D\\\[\\\],file=3D\".*var-cmd.c\",line=3D\"$line_dct_close_brace\= "\}\r\n$mi_gdb_prompt$" { pass "run to do_children_tests" } -re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"} --- 48,54 ---- mi_run_cmd # The running part has been checked already by mi_run_cmd gdb_expect { ! -re "\[\r\n\]*000\\*stopped,reason=3D\"breakpoint-hit\",bkptno=3D\"1\= ",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"do_children_tes= ts\",args=3D\\\[\\\],file=3D\".*var-cmd.c\",fullname=3D\"/.*/gdb/testsuite/= gdb.mi/var-cmd.c\",line=3D\"$line_dct_close_brace\"\}\r\n$mi_gdb_prompt$" { pass "run to do_children_tests" } -re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"} *************** mi_gdb_test "200-break-insert do_special *** 332,338 **** =20=20 send_gdb "-exec-continue\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"2\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"do_special_tests\",args=3D\\\[\\\],file=3D\".*var-cmd.c\",line=3D\"$li= ne_dst_a_1\"\}\r\n$mi_gdb_prompt$" { pass "continue to do_special_tests" } timeout { --- 332,338 ---- =20=20 send_gdb "-exec-continue\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"2\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"do_special_tests\",args=3D\\\[\\\],file=3D\".*var-cmd.c\",fullname=3D\= "/.*/gdb/testsuite/gdb.mi/var-cmd.c\",line=3D\"$line_dst_a_1\"\}\r\n$mi_gdb= _prompt$" { pass "continue to do_special_tests" } timeout { *************** mi_gdb_test "200-break-insert incr_a" \ *** 592,601 **** "break-insert operation" send_gdb "-exec-continue\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"2\.*\"\}\\\],file=3D\".*v= ar-cmd.c\",line=3D\"$line_incr_a_b_a\"\}\r\n$mi_gdb_prompt$" { pass "continue to incr_a" } ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"\.*\"\}\\\],file=3D\".*va= r-cmd.c\",line=3D\"([expr $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]= |$line_incr_a_b_a)\"\}\r\n$mi_gdb_prompt$" { fail "continue to incr_a (compiler debug info incorrect)" } -re "\\^running\r\n${mi_gdb_prompt}.*\r\n$mi_gdb_prompt$" { --- 592,601 ---- "break-insert operation" send_gdb "-exec-continue\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"2\.*\"\}\\\],file=3D\".*v= ar-cmd.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/var-cmd.c\",line=3D\"$line= _incr_a_b_a\"\}\r\n$mi_gdb_prompt$" { pass "continue to incr_a" } ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"\.*\"\}\\\],file=3D\".*va= r-cmd.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/var-cmd.c\",line=3D\"([expr= $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]|$line_incr_a_b_a)\"\}\r\= n$mi_gdb_prompt$" { fail "continue to incr_a (compiler debug info incorrect)" } -re "\\^running\r\n${mi_gdb_prompt}.*\r\n$mi_gdb_prompt$" { Index: testsuite/gdb.mi/mi-watch.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-watch.exp,v retrieving revision 1.11 diff -c -p -b -r1.11 mi-watch.exp *** testsuite/gdb.mi/mi-watch.exp 15 Aug 2004 10:15:58 -0000 1.11 --- testsuite/gdb.mi/mi-watch.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_watchpoint_triggering {} { *** 139,145 **** gdb_expect { -re "222\\^running\r\n$mi_gdb_prompt" { gdb_expect { ! -re "222\\*stopped,reason=3D\"watchpoint-trigger\",wpt=3D\{number=3D= \"2\",exp=3D\"C\"\},value=3D\{old=3D\".*\",new=3D\"3\"\},thread-id=3D\"\[01= \]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee4\",args=3D\\\[\\\],file=3D\"= .*basics.c\",line=3D\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" { pass "watchpoint trigger" } -re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (2)"} --- 139,145 ---- gdb_expect { -re "222\\^running\r\n$mi_gdb_prompt" { gdb_expect { ! -re "222\\*stopped,reason=3D\"watchpoint-trigger\",wpt=3D\{number=3D= \"2\",exp=3D\"C\"\},value=3D\{old=3D\".*\",new=3D\"3\"\},thread-id=3D\"\[01= \]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee4\",args=3D\\\[\\\],file=3D\"= .*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/basics.c\",line=3D\"$lin= e_callee4_return_0\"\}\r\n$mi_gdb_prompt$" { pass "watchpoint trigger" } -re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (2)"} *************** proc test_watchpoint_triggering {} { *** 154,160 **** gdb_expect { -re "223\\^running\r\n$mi_gdb_prompt" { gdb_expect { ! -re "\[\r\n\]*223\\*stopped,reason=3D\"watchpoint-scope\",wpnum=3D\"= 2\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee3\",arg= s=3D\\\[.*\\\],file=3D\".*basics.c\",line=3D\"$line_callee3_close_brace\"\}= \r\n$mi_gdb_prompt$" { pass "wp out of scope" } -re ".*$mi_gdb_prompt$" {fail "wp out of scope (2)"} --- 154,160 ---- gdb_expect { -re "223\\^running\r\n$mi_gdb_prompt" { gdb_expect { ! -re "\[\r\n\]*223\\*stopped,reason=3D\"watchpoint-scope\",wpnum=3D\"= 2\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee3\",arg= s=3D\\\[.*\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/= basics.c\",line=3D\"$line_callee3_close_brace\"\}\r\n$mi_gdb_prompt$" { pass "wp out of scope" } -re ".*$mi_gdb_prompt$" {fail "wp out of scope (2)"} Index: testsuite/gdb.mi/mi2-cli.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-cli.exp,v retrieving revision 1.2 diff -c -p -b -r1.2 mi2-cli.exp *** testsuite/gdb.mi/mi2-cli.exp 15 Aug 2004 10:15:58 -0000 1.2 --- testsuite/gdb.mi/mi2-cli.exp 1 Apr 2005 16:06:51 -0000 *************** mi_gdb_test "600-break-insert -t basics. *** 161,171 **** "-break-insert -t basics.c:\$line_main_hello" =20=20 # mi_gdb_test "-exec-continue" \ ! # {.*\*stopped.*,file=3D".*basics.c",line=3D"$line_main_hello"\}} \ # "-exec-continue to line \$line_main_hello" send_gdb "700-exec-continue\n" gdb_expect { ! -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=3D.*basi= cs.c.,line=3D.$line_main_hello.*$mi_gdb_prompt$" { pass "-exec-continue to line \$line_main_hello" } timeout { --- 161,171 ---- "-break-insert -t basics.c:\$line_main_hello" =20=20 # mi_gdb_test "-exec-continue" \ ! # {.*\*stopped.*,file=3D".*basics.c",fullname=3D"/.*/gdb/testsuite/gdb.= mi/basics.c",line=3D"$line_main_hello"\}} \ # "-exec-continue to line \$line_main_hello" send_gdb "700-exec-continue\n" gdb_expect { ! -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=3D\".*ba= sics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/basics.c\",line=3D.$line_mai= n_hello.*$mi_gdb_prompt$" { pass "-exec-continue to line \$line_main_hello" } timeout { *************** gdb_expect { *** 175,185 **** =20=20 # NOTE: cagney/2003-02-03: Not yet. # mi_gdb_test "-exec-next" \ ! # {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",lin= e=3D"$line_main_return"\}} \ # "-exec-next to line \$line_main_return" send_gdb "800-exec-next\n" gdb_expect { ! -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=3D.end-s= tepping-range.*,file=3D.*basics.c.,line=3D.$line_main_return.*$mi_gdb_promp= t$" { pass "-exec-next to line \$line_main_return" } timeout { --- 175,185 ---- =20=20 # NOTE: cagney/2003-02-03: Not yet. # mi_gdb_test "-exec-next" \ ! # {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",ful= lname=3D"/.*/gdb/testsuite/gdb.mi/basics.c",line=3D"$line_main_return"\}} \ # "-exec-next to line \$line_main_return" send_gdb "800-exec-next\n" gdb_expect { ! -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=3D.end-s= tepping-range.*,file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi= /basics.c\",line=3D.$line_main_return.*$mi_gdb_prompt$" { pass "-exec-next to line \$line_main_return" } timeout { Index: testsuite/gdb.mi/mi2-return.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-return.exp,v retrieving revision 1.3 diff -c -p -b -r1.3 mi2-return.exp *** testsuite/gdb.mi/mi2-return.exp 15 Aug 2004 10:15:58 -0000 1.3 --- testsuite/gdb.mi/mi2-return.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_return_simple {} { *** 53,59 **** =20=20 send_gdb "111-exec-return\n" gdb_expect { ! -re "111\\^done,frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"callee3= \",args=3D\\\[.*\\\],file=3D\".*basics.c\",line=3D\"$line_callee3_close_bra= ce\"\}\r\n$mi_gdb_prompt$" {pass "return from callee4 now"} -re ".*\r\n$mi_gdb_prompt$" { fail "return from callee4 now" } timeout { fail "return from callee4 now (timeout)" } --- 53,59 ---- =20=20 send_gdb "111-exec-return\n" gdb_expect { ! -re "111\\^done,frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"callee3= \",args=3D\\\[.*\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/g= db.mi/basics.c\",line=3D\"$line_callee3_close_brace\"\}\r\n$mi_gdb_prompt$"= {pass "return from callee4 now"} -re ".*\r\n$mi_gdb_prompt$" { fail "return from callee4 now" } timeout { fail "return from callee4 now (timeout)" } Index: testsuite/gdb.mi/mi2-stack.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-stack.exp,v retrieving revision 1.3 diff -c -p -b -r1.3 mi2-stack.exp *** testsuite/gdb.mi/mi2-stack.exp 15 Aug 2004 10:15:58 -0000 1.3 --- testsuite/gdb.mi/mi2-stack.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_stack_frame_listing {} { *** 57,63 **** # -stack-list-frames 1 3 =20=20 mi_gdb_test "231-stack-list-frames" \ ! "231\\^done,stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func= =3D\"callee4\",file=3D\".*basics.c\",line=3D\"$line_callee4_body\"\},frame= =3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"callee3\",.*\},frame=3D\{level= =3D\"2\",addr=3D\"$hex\",func=3D\"callee2\",.*\},frame=3D\{level=3D\"3\",ad= dr=3D\"$hex\",func=3D\"callee1\",.*\},frame=3D\{level=3D\"4\",addr=3D\"$hex= \",func=3D\"main\",.*\}\\\]" \ "stack frame listing" mi_gdb_test "232-stack-list-frames 1 1" \ "232\\^done,stack=3D\\\[frame=3D\{level=3D\"1\",addr=3D\"$hex\",func= =3D\"callee3\",.*\}\\\]" \ --- 57,63 ---- # -stack-list-frames 1 3 =20=20 mi_gdb_test "231-stack-list-frames" \ ! "231\\^done,stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func= =3D\"callee4\",file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/= basics.c\",line=3D\"$line_callee4_body\"\},frame=3D\{level=3D\"1\",addr=3D\= "$hex\",func=3D\"callee3\",.*\},frame=3D\{level=3D\"2\",addr=3D\"$hex\",fun= c=3D\"callee2\",.*\},frame=3D\{level=3D\"3\",addr=3D\"$hex\",func=3D\"calle= e1\",.*\},frame=3D\{level=3D\"4\",addr=3D\"$hex\",func=3D\"main\",.*\}\\\]"= \ "stack frame listing" mi_gdb_test "232-stack-list-frames 1 1" \ "232\\^done,stack=3D\\\[frame=3D\{level=3D\"1\",addr=3D\"$hex\",func= =3D\"callee3\",.*\}\\\]" \ *************** set line_callee4_return_0 [gdb_get_line_ *** 160,166 **** # step until A, B, C, have some reasonable values. send_gdb "-exec-next 3\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"end-stepping= -range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee4\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"$line_callee4_return_0\"\}= \r\n$mi_gdb_prompt$" { pass "next's in callee4" } timeout { fail "next in callee4 (timeout)" } --- 160,166 ---- # step until A, B, C, have some reasonable values. send_gdb "-exec-next 3\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"end-stepping= -range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee4\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" { pass "next's in callee4" } timeout { fail "next in callee4 (timeout)" } Index: testsuite/gdb.mi/mi2-stepi.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-stepi.exp,v retrieving revision 1.3 diff -c -p -b -r1.3 mi2-stepi.exp *** testsuite/gdb.mi/mi2-stepi.exp 15 Aug 2004 10:15:58 -0000 1.3 --- testsuite/gdb.mi/mi2-stepi.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_stepi_nexti {} { *** 53,59 **** =20=20 send_gdb "111-exec-step-instruction\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_= prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "step-instruction at main" --- 53,59 ---- =20=20 send_gdb "111-exec-step-instruction\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "step-instruction at main" *************** proc test_stepi_nexti {} { *** 67,73 **** } send_gdb "222-exec-next-instruction\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_= prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" --- 67,73 ---- } send_gdb "222-exec-next-instruction\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" *************** proc test_stepi_nexti {} { *** 81,87 **** } send_gdb "333-exec-next-instruction\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_= prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" --- 81,87 ---- } send_gdb "333-exec-next-instruction\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\= ",args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"/.*/gdb/testsuite/gdb.= mi/basics.c\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" { set line $expect_out(1,string) if { $line >=3D $line_main_body && $line <=3D $line_main_hello } { pass "next-instruction at main" Index: testsuite/gdb.mi/mi2-syn-frame.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-syn-frame.exp,v retrieving revision 1.1 diff -c -p -b -r1.1 mi2-syn-frame.exp *** testsuite/gdb.mi/mi2-syn-frame.exp 7 Aug 2003 17:47:42 -0000 1.1 --- testsuite/gdb.mi/mi2-syn-frame.exp 1 Apr 2005 16:06:51 -0000 *************** gdb_expect { *** 69,75 **** } } =20=20 ! mi_gdb_test "404-stack-list-frames 0 0" "404\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= line=3D\"$decimal\"\}.*\\\]" =20=20 =20=20 # --- 69,75 ---- } } =20=20 ! mi_gdb_test "404-stack-list-frames 0 0" "404\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"\= }.*\\\]" =20=20 =20=20 # *************** gdb_expect { *** 96,102 **** } } =20=20 ! mi_gdb_test "409-stack-list-frames 0 0" "409\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= line=3D\"$decimal\"\}.*\\\]" =20=20 # # Call bar() by hand, which should get an exception while running. --- 96,102 ---- } } =20=20 ! mi_gdb_test "409-stack-list-frames 0 0" "409\\^done,stack=3D\\\[frame=3D\= {level=3D\"0\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\",= fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"\= }.*\\\]" =20=20 # # Call bar() by hand, which should get an exception while running. *************** mi_gdb_test "409-stack-list-frames 0 0"=20 *** 104,110 **** =20=20 mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"= The program being debugged was signaled while in a function called from GDB= .\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was receive= d.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal= on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the f= unction \\(bar\\) will be abandoned.\\\\n\"\[\r\n\]+410\\^error,msg=3D\"The= program being debugged was signaled while in a function called from GDB.\\= \\nGDB remains in the frame where the signal was received.\\\\nTo change th= is behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the exp= ression containing the function \\(bar\\) will be abandoned.\"" "call infer= ior function which raises exception" =20=20 ! mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-receive= d\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",f= rame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-f= rame.c\",line=3D\"$decimal\"\},stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\= "$hex\",func=3D\"bar\",file=3D\".*mi-syn-frame.c\",line=3D\"$decimal\"},fra= me=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"\"\= },frame=3D\{level=3D\"2\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn= -frame.c\",line=3D\"$decimal\"}.*\\\]" "backtrace from inferior function at= exception" =20=20 mi_gdb_exit =20=20 --- 104,110 ---- =20=20 mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"= The program being debugged was signaled while in a function called from GDB= .\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was receive= d.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal= on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the f= unction \\(bar\\) will be abandoned.\\\\n\"\[\r\n\]+410\\^error,msg=3D\"The= program being debugged was signaled while in a function called from GDB.\\= \\nGDB remains in the frame where the signal was received.\\\\nTo change th= is behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the exp= ression containing the function \\(bar\\) will be abandoned.\"" "call infer= ior function which raises exception" =20=20 ! mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-receive= d\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",f= rame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-f= rame.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn-frame.c\",line=3D\"$d= ecimal\"\},stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"bar= \",file=3D\".*mi-syn-frame.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/mi-syn= -frame.c\",line=3D\"$decimal\"},frame=3D\{level=3D\"1\",addr=3D\"$hex\",fun= c=3D\"\"\},frame=3D\{level=3D\"2\",addr=3D\"$hex\= ",func=3D\"main\",file=3D\".*mi-syn-frame.c\",fullname=3D\"/.*/gdb/testsuit= e/gdb.mi/mi-syn-frame.c\",line=3D\"$decimal\"}.*\\\]" "backtrace from infer= ior function at exception" =20=20 mi_gdb_exit =20=20 Index: testsuite/gdb.mi/mi2-until.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-until.exp,v retrieving revision 1.2 diff -c -p -b -r1.2 mi2-until.exp *** testsuite/gdb.mi/mi2-until.exp 9 Aug 2004 22:21:54 -0000 1.2 --- testsuite/gdb.mi/mi2-until.exp 1 Apr 2005 16:06:51 -0000 *************** proc test_until {} { *** 78,84 **** =20=20 send_gdb "111-exec-until\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\"= ,args=3D\\\[\\\],file=3D\".*until.c\",line=3D\"12\"\}\r\n$mi_gdb_prompt$" { pass "until after while loop" } timeout { --- 78,84 ---- =20=20 send_gdb "111-exec-until\n" gdb_expect { ! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-stepp= ing-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\"= ,args=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi= /until.c\",line=3D\"12\"\}\r\n$mi_gdb_prompt$" { pass "until after while loop" } timeout { *************** proc test_until {} { *** 88,94 **** =20=20 send_gdb "222-exec-until 15\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" { pass "until line number" } timeout { --- 88,94 ---- =20=20 send_gdb "222-exec-until 15\n" gdb_expect { ! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/u= ntil.c\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" { pass "until line number" } timeout { *************** proc test_until {} { *** 98,104 **** =20=20 send_gdb "333-exec-until until.c:17\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" { pass "until line number:file" } timeout { --- 98,104 ---- =20=20 send_gdb "333-exec-until until.c:17\n" gdb_expect { ! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",a= rgs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/u= ntil.c\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" { pass "until line number:file" } timeout { *************** proc test_until {} { *** 110,116 **** =20=20 send_gdb "444-exec-until until.c:25\n" gdb_expect { ! -re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",= args=3D\\\[\\\],file=3D\".*until.c\",line=3D\"24\"\}\r\n$mi_gdb_prompt$" { pass "until after current function" } timeout { --- 110,116 ---- =20=20 send_gdb "444-exec-until until.c:25\n" gdb_expect { ! -re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=3D\"location-= reached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",= args=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/= until.c\",line=3D\"24\"\}\r\n$mi_gdb_prompt$" { pass "until after current function" } timeout { Index: testsuite/gdb.mi/mi2-var-display.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-var-display.exp,v retrieving revision 1.4 diff -c -p -b -r1.4 mi2-var-display.exp *** testsuite/gdb.mi/mi2-var-display.exp 17 Aug 2004 09:38:29 -0000 1.4 --- testsuite/gdb.mi/mi2-var-display.exp 1 Apr 2005 16:06:51 -0000 *************** mi_gdb_test "200-break-insert incr_a" \ *** 592,601 **** "break-insert operation" send_gdb "-exec-continue\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"2\.*\"\}\\\],file=3D\".*v= ar-cmd.c\",line=3D\"$line_incr_a_b_a\"\}\r\n$mi_gdb_prompt$" { pass "continue to incr_a" } ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"\.*\"\}\\\],file=3D\".*va= r-cmd.c\",line=3D\"([expr $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]= |$line_incr_a_b_a)\"\}\r\n$mi_gdb_prompt$" { fail "continue to incr_a (compiler debug info incorrect)" } -re "\\^running\r\n${mi_gdb_prompt}.*\r\n$mi_gdb_prompt$" { --- 592,601 ---- "break-insert operation" send_gdb "-exec-continue\n" gdb_expect { ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"2\.*\"\}\\\],file=3D\".*v= ar-cmd.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/var-cmd.c\",line=3D\"$line= _incr_a_b_a\"\}\r\n$mi_gdb_prompt$" { pass "continue to incr_a" } ! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-h= it\",bkptno=3D\"3\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func= =3D\"incr_a\",args=3D\\\[\{name=3D\"a\",value=3D\"\.*\"\}\\\],file=3D\".*va= r-cmd.c\",fullname=3D\"/.*/gdb/testsuite/gdb.mi/var-cmd.c\",line=3D\"([expr= $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]|$line_incr_a_b_a)\"\}\r\= n$mi_gdb_prompt$" { fail "continue to incr_a (compiler debug info incorrect)" } -re "\\^running\r\n${mi_gdb_prompt}.*\r\n$mi_gdb_prompt$" { Index: testsuite/lib/mi-support.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/lib/mi-support.exp,v retrieving revision 1.26 diff -c -p -b -r1.26 mi-support.exp *** testsuite/lib/mi-support.exp 25 Mar 2005 20:38:55 -0000 1.26 --- testsuite/lib/mi-support.exp 1 Apr 2005 16:06:51 -0000 *************** proc mi_runto {func} { *** 813,819 **** =20=20 mi_run_cmd gdb_expect { ! -re ".*000\\*stopped,reason=3D\"breakpoint-hit\",bkptno=3D\"$bkptno\"= ,thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\"$func\",args= =3D\(\\\[.*\\\]\|\{.*\}\),file=3D\".*\",line=3D\"\[0-9\]*\"\}\r\n$mi_gdb_pr= ompt$" { pass "$test" return 0 } --- 813,819 ---- =20=20 mi_run_cmd gdb_expect { ! -re ".*000\\*stopped,reason=3D\"breakpoint-hit\",bkptno=3D\"$bkptno\"= ,thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\"$func\",args= =3D\(\\\[.*\\\]\|\{.*\}\),file=3D\".*\",fullname=3D\"/.*\",line=3D\"\[0-9\]= *\"\}\r\n$mi_gdb_prompt$" { pass "$test" return 0 } *************** proc mi_execute_to_helper { cmd reason f *** 859,869 **** global decimal send_gdb "220-$cmd\n" gdb_expect { ! -re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=3D\"$reas= on\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\"$func\",ar= gs=3D$args,file=3D\".*$file\",line=3D\"$line\"\}$extra\r\n$mi_gdb_prompt$" { pass "$test" return 0 } ! -re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=3D\"$reas= on\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\".*\",args= =3D\[\\\[\{\].*\[\\\]\}\],file=3D\".*\",line=3D\"\[0-9\]*\"\}.*\r\n$mi_gdb_= prompt$" { fail "$test (stopped at wrong place)" return -1 } --- 859,869 ---- global decimal send_gdb "220-$cmd\n" gdb_expect { ! -re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=3D\"$reas= on\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\"$func\",ar= gs=3D$args,file=3D\".*$file\",fullname=3D\"/.*/$file\",line=3D\"$line\"\}$e= xtra\r\n$mi_gdb_prompt$" { pass "$test" return 0 } ! -re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=3D\"$reas= on\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\".*\",args= =3D\[\\\[\{\].*\[\\\]\}\],file=3D\".*\",fullname=3D\"/.*\",line=3D\"\[0-9\]= *\"\}.*\r\n$mi_gdb_prompt$" { fail "$test (stopped at wrong place)" return -1 }