From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-39541-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 5294 invoked by alias); 18 May 2005 03:43:51 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 5098 invoked from network); 18 May 2005 03:43:27 -0000
Received: from unknown (HELO nevyn.them.org) (66.93.172.17)
  by sourceware.org with SMTP; 18 May 2005 03:43:27 -0000
Received: from drow by nevyn.them.org with local (Exim 4.50)
	id 1DYFSw-0007YR-DS; Tue, 17 May 2005 23:43:26 -0400
Date: Wed, 18 May 2005 04:44:00 -0000
From: Daniel Jacobowitz <drow@false.org>
To: Dennis Brueni <dbrueni@slickedit.com>, gdb-patches@sources.redhat.com,
	bob@brasko.net
Subject: Re: [RFC] fullname attribute for GDB/MI stack frames
Message-ID: <20050518034326.GF10888@nevyn.them.org>
Mail-Followup-To: Dennis Brueni <dbrueni@slickedit.com>,
	gdb-patches@sources.redhat.com, bob@brasko.net
References: <ECCC6E9907B4CD4A83260A191A91F20E22C6D2@wampa.office.slickedit.com> <20050430191755.GF7009@nevyn.them.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20050430191755.GF7009@nevyn.them.org>
User-Agent: Mutt/1.5.8i
X-SW-Source: 2005-05/txt/msg00444.txt.bz2

On Sat, Apr 30, 2005 at 03:17:55PM -0400, Daniel Jacobowitz wrote:
> On Fri, Apr 01, 2005 at 02:13:33PM -0500, Dennis Brueni wrote:
> > 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.

> A couple administrative things about submitting GDB patches:

> You don't need to redo the patch; I'll take care of it once my first
> questions are resolved.

Which, eventually, they were.  I have committed this revised version of
the patch; that almost completely resolves this thread (I have one
other issue to follow up on later).

--=20
Daniel Jacobowitz
CodeSourcery, LLC

2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
	    Dennis Brueni  <dennis@slickedit.com>

	* stack.c (print_frame): In MI mode, output a fullname attribute
	with the stack frame.

2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
	    Dennis Brueni  <dennis@slickedit.com>

	* gdb.texinfo (GDB/MI Breakpoint Table Commands)
	(GDB/MI Data Manipulation, GDB/MI Program Control)
	(GDB/MI Stack Manipulation): Update examples to include the fullname
	attribute in stack frames.

2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
	    Dennis Brueni  <dennis@slickedit.com>

	* gdb.mi/mi-cli.exp, gdb.mi/mi-return.exp, gdb.mi/mi-stack.exp,
	gdb.mi/mi-stepi.exp, gdb.mi/mi-syn-frame.exp, gdb.mi/mi-until.exp,
	gdb.mi/mi-var-display.exp, gdb.mi/mi-watch.exp, gdb.mi/mi2-cli.exp,
	gdb.mi/mi2-return.exp, gdb.mi/mi2-stack.exp,
	gdb.mi/mi2-syn-frame.exp, gdb.mi/mi2-until.exp,
	gdb.mi/mi2-var-display.exp: Expect fullname field in stack frames.
	* lib/mi-support.exp (mi_runto, mi_execute_to_helper): Likewise.

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.131
diff -u -p -r1.131 stack.c
--- stack.c	12 May 2005 20:21:17 -0000	1.131
+++ stack.c	18 May 2005 03:39:14 -0000
@@ -680,6 +680,12 @@ print_frame (struct frame_info *fi,=20
       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))
+	{
+	  const char *fullname =3D symtab_to_fullname (sal.symtab);
+	  if (fullname !=3D NULL)
+	    ui_out_field_string (uiout, "fullname", fullname);
+	}
       annotate_frame_source_file_end ();
       ui_out_text (uiout, ":");
       annotate_frame_source_line ();
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.253
diff -u -p -r1.253 gdb.texinfo
--- doc/gdb.texinfo	12 May 2005 09:05:42 -0000	1.253
+++ doc/gdb.texinfo	18 May 2005 03:39:18 -0000
@@ -17431,7 +17431,8 @@ Setting a watchpoint on a variable in th
 ^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"@}
+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
@@ -17449,14 +17450,16 @@ for the watchpoint going out of scope.
 ^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"@}
+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",line=3D"18"@}
+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
@@ -17488,7 +17491,8 @@ enabled=3D"y",addr=3D"",what=3D"C",times=3D"0"@}
 ^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"@}
+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",
@@ -17509,7 +17513,8 @@ enabled=3D"y",addr=3D"",what=3D"C",times=3D"-5"@
 ^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"@}
+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",
@@ -17744,7 +17749,7 @@ On a PPC MBX board:
=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"@}
+args=3D[],file=3D"try.c",fullname=3D"/home/foo/bar/devo/myproject/try.c",l=
ine=3D"5"@}
 (@value{GDBP})
 -data-list-changed-registers
 ^done,changed-registers=3D["0","1","2","4","5","6","7","8","9",
@@ -18351,7 +18356,7 @@ The corresponding @value{GDBN} correspon
 (@value{GDBP})
 @@Hello world
 *stopped,reason=3D"breakpoint-hit",bkptno=3D"2",frame=3D@{func=3D"foo",arg=
s=3D[],
-file=3D"hello.c",line=3D"13"@}
+file=3D"hello.c",fullname=3D"/home/foo/bar/devo/myproject/hello.c",line=3D=
"13"@}
 (@value{GDBP})
 @end smallexample
=20
@@ -18383,7 +18388,7 @@ Function returning @code{void}.
 (@value{GDBP})
 @@hello from foo
 *stopped,reason=3D"function-finished",frame=3D@{func=3D"main",args=3D[],
-file=3D"hello.c",line=3D"7"@}
+file=3D"hello.c",fullname=3D"/home/foo/bar/devo/myproject/hello.c",line=3D=
"7"@}
 (@value{GDBP})
 @end smallexample
=20
@@ -18397,7 +18402,7 @@ value itself.
 (@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"@},
+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
@@ -18434,7 +18439,8 @@ The corresponding @value{GDBN} command i
 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"@}
+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
 (@value{GDBP})
@@ -18532,7 +18538,8 @@ file=3D"../../../devo/gdb/testsuite/gdb.mi
 (@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"@}
+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
@@ -18541,7 +18548,8 @@ file=3D"../../../devo/gdb/testsuite/gdb.mi
 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"@}
+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
@@ -18574,7 +18582,8 @@ The corresponding @value{GDBN} command i
 ^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"@}
+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
@@ -18627,7 +18636,8 @@ Stepping into a function:
 (@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"@}
+@{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
@@ -18670,14 +18680,16 @@ The corresponding @value{GDBN} command i
=20
 (@value{GDBP})
 *stopped,reason=3D"end-stepping-range",
-frame=3D@{func=3D"foo",args=3D[],file=3D"try.c",line=3D"10"@}
+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
 (@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"@}
+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
@@ -18709,7 +18721,7 @@ The corresponding @value{GDBN} command i
 (@value{GDBP})
 x =3D 55
 *stopped,reason=3D"location-reached",frame=3D@{func=3D"main",args=3D[],
-file=3D"recursive2.c",line=3D"6"@}
+file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive2.=
c",line=3D"6"@}
 (@value{GDBP})
 @end smallexample
=20
@@ -19209,15 +19221,20 @@ functionality of @samp{-stack-list-argum
 ^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"@},
+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",line=3D"17"@},
+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",line=3D"22"@},
+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",line=3D"27"@},
+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",line=3D"32"@}]
+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,
@@ -19299,29 +19316,29 @@ Full stack backtrace:
 -stack-list-frames
 ^done,stack=3D
 [frame=3D@{level=3D"0",addr=3D"0x0001076c",func=3D"foo",
-  file=3D"recursive2.c",line=3D"11"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"11"@},
 frame=3D@{level=3D"1",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"2",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"3",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"4",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"5",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"6",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"7",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"8",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"9",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"10",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"11",addr=3D"0x00010738",func=3D"main",
-  file=3D"recursive2.c",line=3D"4"@}]
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"4"@}]
 (@value{GDBP})
 @end smallexample
=20
@@ -19332,11 +19349,11 @@ Show frames between @var{low_frame} and=20
 -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"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"4",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@},
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@},
 frame=3D@{level=3D"5",addr=3D"0x000107a4",func=3D"foo",
-  file=3D"recursive2.c",line=3D"14"@}]
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@}]
 (@value{GDBP})
 @end smallexample
=20
@@ -19347,7 +19364,7 @@ Show a single frame:
 -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"@}]
+  file=3D"recursive2.c",fullname=3D"/home/foo/bar/devo/myproject/recursive=
2.c",line=3D"14"@}]
 (@value{GDBP})
 @end smallexample
=20
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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -100,7 +100,7 @@ mi_gdb_test "-interpreter-exec console \
=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"\}} \
+#    {.*\*stopped,reason=3D"breakpoint-hit",.*func=3D"callee4".*file=3D".*=
basics.c",fullname=3D"${fullname_syntax}${srcfile}",line=3D"8"\}} \
 #    "-interpreter-exec console \"continue to callee4\""
 send_gdb "999-exec-continue\n"
 gdb_expect {
@@ -161,11 +161,11 @@ mi_gdb_test "600-break-insert -t basics.
 	"-break-insert -t basics.c:\$line_main_hello"
=20
 # mi_gdb_test "-exec-continue" \
-#   {.*\*stopped.*,file=3D".*basics.c",line=3D"$line_main_hello"\}} \
+#   {.*\*stopped.*,file=3D".*basics.c",fullname=3D"${fullname_syntax}${src=
file}",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.*basic=
s.c.,line=3D.$line_main_hello.*$mi_gdb_prompt$" {
+    -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=3D\".*bas=
ics.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D.$line_main_hell=
o.*$mi_gdb_prompt$" {
 	pass "-exec-continue to line \$line_main_hello"
     }
     timeout {
@@ -175,11 +175,11 @@ gdb_expect {
=20
 # NOTE: cagney/2003-02-03: Not yet.
 # mi_gdb_test "-exec-next" \
-#   {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",line=
=3D"$line_main_return"\}} \
+#   {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",full=
name=3D"${fullname_syntax}${srcfile}",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-st=
epping-range.*,file=3D.*basics.c.,line=3D.$line_main_return.*$mi_gdb_prompt=
$" {
+    -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=3D.end-st=
epping-range.*,file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${srcfi=
le}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, I=
nc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,14 +46,14 @@ mi_gdb_load ${binfile}
=20
 proc test_return_simple {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     set line_callee3_head         [gdb_get_line_number "callee3 ("]
     set line_callee3_close_brace  [expr $line_callee3_head + 3]
=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_brac=
e\"\}\r\n$mi_gdb_prompt$" {pass "return from callee4 now"}
+	-re "111\\^done,frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"callee3\=
",args=3D\\\[.*\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${=
srcfile}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ mi_gdb_load ${binfile}
=20
 proc test_stack_frame_listing {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     set line_callee4_head [gdb_get_line_number "callee4 ("]
     set line_callee4_body [expr $line_callee4_head + 2]
@@ -57,7 +57,7 @@ proc test_stack_frame_listing {} {
     # -stack-list-frames 1 3
=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\",.*\}\\\]" \
+	    "231\\^done,stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=
=3D\"callee4\",file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${srcfi=
le}\",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\",addr=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\",.*\}\\\]" \
@@ -143,7 +143,7 @@ proc test_stack_info_depth {} {
=20
 proc test_stack_locals_listing {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     # Obtain lists for locals for the stack frames
     # Tests:
@@ -161,7 +161,7 @@ set line_callee4_return_0 [gdb_get_line_
 # 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$" {
+    -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\"${fullname_syntax}${src=
file}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, I=
nc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ mi_gdb_load ${binfile}
=20
 proc test_stepi_nexti {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     set line_main_head  [gdb_get_line_number "main ("]
     set line_main_body  [expr $line_main_head + 2]
@@ -53,8 +53,8 @@ proc test_stepi_nexti {} {
=20
     send_gdb "111-exec-step-instruction\n"
     gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-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_p=
rompt$" {
-	    set line $expect_out(1,string)
+	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\"=
,args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${src=
file}\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
+	    set line $expect_out(2,string)
 	    if { $line >=3D $line_main_body && $line <=3D $line_main_hello } {
 		pass "step-instruction at main"
 	    } else {
@@ -67,8 +67,8 @@ proc test_stepi_nexti {} {
     }
     send_gdb "222-exec-next-instruction\n"
     gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-steppi=
ng-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_p=
rompt$" {
-	    set line $expect_out(1,string)
+	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\"=
,args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${src=
file}\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
+	    set line $expect_out(2,string)
 	    if { $line >=3D $line_main_body && $line <=3D $line_main_hello } {
 		pass "next-instruction at main"
 	    } else {
@@ -81,8 +81,8 @@ proc test_stepi_nexti {} {
     }
     send_gdb "333-exec-next-instruction\n"
     gdb_expect {
-	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-steppi=
ng-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_p=
rompt$" {
-	    set line $expect_out(1,string)
+	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\"=
,args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${src=
file}\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
+	    set line $expect_out(2,string)
 	    if { $line >=3D $line_main_body && $line <=3D $line_main_hello } {
 		pass "next-instruction at main"
 	    } else {
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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 2002, 2003 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2005 Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ gdb_expect {
   }
 }
=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\",l=
ine=3D\"$decimal\"\}.*\\\]"
+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\",f=
ullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\"\}.*\\\]"
=20
=20
 #
@@ -83,7 +83,7 @@ mi_gdb_test "406-data-evaluate-expressio
 # We should have both a signal handler and a call dummy frame
 # in this next output.
=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\"\}\\\],file=
=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\"<signal handler called>\"\},.*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\"<function called from gdb>\"\},frame=3D\{level=
=3D\"$decimal\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-syn-frame.c\"=
,line=3D\"$decimal\"\}.*\\\]"
+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\"\}\\\],file=
=3D\".*mi-syn-frame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D=
\"$decimal\"\},stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\=
"subroutine\",file=3D\".*mi-syn-frame.c\",fullname=3D\"${fullname_syntax}${=
srcfile}\",line=3D\"$decimal\"\},frame=3D\{level=3D\"1\",addr=3D\"$hex\",fu=
nc=3D\"handler\",file=3D\".*mi-syn-frame.c\",fullname=3D\"${fullname_syntax=
}${srcfile}\",line=3D\"$decimal\"\},frame=3D\{level=3D\"2\",addr=3D\"$hex\"=
,func=3D\"<signal handler called>\"\},.*frame=3D\{level=3D\"$decimal\",addr=
=3D\"$hex\",func=3D\"have_a_very_merry_interrupt\",file=3D\".*mi-syn-frame.=
c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\"\},frame=
=3D\{level=3D\"$decimal\",addr=3D\"$hex\",func=3D\"<function called from gd=
b>\"\},frame=3D\{level=3D\"$decimal\",addr=3D\"$hex\",func=3D\"main\",file=
=3D\".*mi-syn-frame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D=
\"$decimal\"\}.*\\\]"
=20
=20
 send_gdb "408-exec-continue\n"
@@ -96,7 +96,7 @@ gdb_expect {
   }
 }
=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\",l=
ine=3D\"$decimal\"\}.*\\\]"
+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\",f=
ullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\"\}.*\\\]"
=20
 #
 # Call bar() by hand, which should get an exception while running.
@@ -104,7 +104,7 @@ mi_gdb_test "409-stack-list-frames 0 0"=20
=20
 mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"T=
he program being debugged was signaled while in a function called from GDB.=
\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was received=
.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal =
on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the fu=
nction \\(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 thi=
s behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expr=
ession containing the function \\(bar\\) will be abandoned.\"" "call inferi=
or function which raises exception"
=20
-mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-received=
\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",fr=
ame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-fr=
ame.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\"},fram=
e=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"<function called from gdb>\"\}=
,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"
+mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-received=
\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",fr=
ame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-fr=
ame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\"\},s=
tack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"bar\",file=3D\"=
.*mi-syn-frame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$de=
cimal\"},frame=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"<function called =
from gdb>\"\},frame=3D\{level=3D\"2\",addr=3D\"$hex\",func=3D\"main\",file=
=3D\".*mi-syn-frame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D=
\"$decimal\"}.*\\\]" "backtrace from inferior function at exception"
=20
 mi_gdb_exit
=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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -74,11 +74,11 @@ proc test_running_to_foo {} {
=20
 proc test_until {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     send_gdb "111-exec-until\n"
     gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-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$" {
+	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",=
args=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfi=
le}\",line=3D\"12\"\}\r\n$mi_gdb_prompt$" {
 	    pass "until after while loop"
 	}
 	timeout {
@@ -88,7 +88,7 @@ proc test_until {} {
=20
     send_gdb "222-exec-until 15\n"
     gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" {
+	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfile=
}\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" {
 	    pass "until line number"
 	}
 	timeout {
@@ -98,7 +98,7 @@ proc test_until {} {
=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-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" {
+	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfile=
}\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" {
 	    pass "until line number:file"
 	}
 	timeout {
@@ -110,7 +110,7 @@ proc test_until {} {
=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-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",a=
rgs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"24\"\}\r\n$mi_gdb_prompt$" {
+	-re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",a=
rgs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfil=
e}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, I=
nc.
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
 #
 # This Program Is Free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,7 +49,7 @@ mi_gdb_test "200-break-insert $line_dct_
 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_test=
s\",args=3D\\\[\\\],file=3D\".*var-cmd.c\",line=3D\"$line_dct_close_brace\"=
\}\r\n$mi_gdb_prompt$" {
+    -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_test=
s\",args=3D\\\[\\\],file=3D\".*var-cmd.c\",fullname=3D\"${fullname_syntax}$=
{srcfile}\",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)"}
@@ -332,7 +333,7 @@ mi_gdb_test "200-break-insert do_special
=20
 send_gdb "-exec-continue\n"
 gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\"$line_=
dst_a_1\"\}\r\n$mi_gdb_prompt$" {
+    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\"${=
fullname_syntax}${srcfile}\",line=3D\"$line_dst_a_1\"\}\r\n$mi_gdb_prompt$"=
 {
 	pass "continue to do_special_tests"
     }
     timeout {
@@ -592,10 +593,10 @@ mi_gdb_test "200-break-insert incr_a" \
 	"break-insert operation"
 send_gdb "-exec-continue\n"
 gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\".*var-=
cmd.c\",line=3D\"$line_incr_a_b_a\"\}\r\n$mi_gdb_prompt$" {
+    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\".*var-=
cmd.c\",fullname=3D\"${fullname_syntax}${srcfile}\",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-hi=
t\",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\".*var-c=
md.c\",line=3D\"([expr $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]|$l=
ine_incr_a_b_a)\"\}\r\n$mi_gdb_prompt$" {
+    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\".*var-c=
md.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"([expr $line_in=
cr_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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2002, 2004, 2005
+# Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -123,7 +124,7 @@ proc test_rwatch_creation_and_listing {}
=20
 proc test_watchpoint_triggering {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     set line_callee4_return_0     [gdb_get_line_number "return 0;"]
     set line_callee3_head         [gdb_get_line_number "callee3 ("]
@@ -139,7 +140,7 @@ proc test_watchpoint_triggering {} {
     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$" {
+	    -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\"${fullname_syntax}${srcfile}\",line=3D\"$line_call=
ee4_return_0\"\}\r\n$mi_gdb_prompt$" {
             pass "watchpoint trigger"
           }
           -re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (2)"}
@@ -154,7 +155,7 @@ proc test_watchpoint_triggering {} {
     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\",args=
=3D\\\[.*\\\],file=3D\".*basics.c\",line=3D\"$line_callee3_close_brace\"\}\=
r\n$mi_gdb_prompt$" {
+	    -re "\[\r\n\]*223\\*stopped,reason=3D\"watchpoint-scope\",wpnum=3D\"2=
\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"callee3\",args=
=3D\\\[.*\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${srcfil=
e}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -161,11 +161,11 @@ mi_gdb_test "600-break-insert -t basics.
 	"-break-insert -t basics.c:\$line_main_hello"
=20
 # mi_gdb_test "-exec-continue" \
-#   {.*\*stopped.*,file=3D".*basics.c",line=3D"$line_main_hello"\}} \
+#   {.*\*stopped.*,file=3D".*basics.c",fullname=3D"${fullname_syntax}${src=
file}",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.*basic=
s.c.,line=3D.$line_main_hello.*$mi_gdb_prompt$" {
+    -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=3D\".*bas=
ics.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D.$line_main_hell=
o.*$mi_gdb_prompt$" {
 	pass "-exec-continue to line \$line_main_hello"
     }
     timeout {
@@ -175,11 +175,11 @@ gdb_expect {
=20
 # NOTE: cagney/2003-02-03: Not yet.
 # mi_gdb_test "-exec-next" \
-#   {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",line=
=3D"$line_main_return"\}} \
+#   {.*\*stopped,reason=3D"end-stepping-range",.*,file=3D".*basics.c",full=
name=3D"${fullname_syntax}${srcfile}",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-st=
epping-range.*,file=3D.*basics.c.,line=3D.$line_main_return.*$mi_gdb_prompt=
$" {
+    -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=3D.end-st=
epping-range.*,file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${srcfi=
le}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, I=
nc.
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,14 +47,14 @@ mi_gdb_load ${binfile}
=20
 proc test_return_simple {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     set line_callee3_head         [gdb_get_line_number "callee3 ("]
     set line_callee3_close_brace  [expr $line_callee3_head + 3]
=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_brac=
e\"\}\r\n$mi_gdb_prompt$" {pass "return from callee4 now"}
+	-re "111\\^done,frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"callee3\=
",args=3D\\\[.*\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${=
srcfile}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,4 @@
-# Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, I=
nc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ mi_gdb_load ${binfile}
=20
 proc test_stack_frame_listing {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     set line_callee4_head [gdb_get_line_number "callee4 ("]
     set line_callee4_body [expr $line_callee4_head + 2]
@@ -57,7 +57,7 @@ proc test_stack_frame_listing {} {
     # -stack-list-frames 1 3
=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\",.*\}\\\]" \
+	    "231\\^done,stack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=
=3D\"callee4\",file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${srcfi=
le}\",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\",addr=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\",.*\}\\\]" \
@@ -143,7 +143,7 @@ proc test_stack_info_depth {} {
=20
 proc test_stack_locals_listing {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     # Obtain lists for locals for the stack frames
     # Tests:
@@ -160,7 +160,7 @@ set line_callee4_return_0 [gdb_get_line_
 # 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$" {
+    -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\"${fullname_syntax}${src=
file}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, I=
nc.
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,7 +46,7 @@ mi_gdb_load ${binfile}
=20
 proc test_stepi_nexti {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     set line_main_head  [gdb_get_line_number "main ("]
     set line_main_body  [expr $line_main_head + 2]
@@ -53,8 +54,8 @@ proc test_stepi_nexti {} {
=20
     send_gdb "111-exec-step-instruction\n"
     gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-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_p=
rompt$" {
-	    set line $expect_out(1,string)
+	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\"=
,args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${src=
file}\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
+	    set line $expect_out(2,string)
 	    if { $line >=3D $line_main_body && $line <=3D $line_main_hello } {
 		pass "step-instruction at main"
 	    } else {
@@ -67,8 +68,8 @@ proc test_stepi_nexti {} {
     }
     send_gdb "222-exec-next-instruction\n"
     gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-steppi=
ng-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_p=
rompt$" {
-	    set line $expect_out(1,string)
+	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\"=
,args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${src=
file}\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
+	    set line $expect_out(2,string)
 	    if { $line >=3D $line_main_body && $line <=3D $line_main_hello } {
 		pass "next-instruction at main"
 	    } else {
@@ -81,8 +82,8 @@ proc test_stepi_nexti {} {
     }
     send_gdb "333-exec-next-instruction\n"
     gdb_expect {
-	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-steppi=
ng-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_p=
rompt$" {
-	    set line $expect_out(1,string)
+	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\"=
,args=3D\\\[\\\],file=3D\".*basics.c\",fullname=3D\"${fullname_syntax}${src=
file}\",line=3D\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
+	    set line $expect_out(2,string)
 	    if { $line >=3D $line_main_body && $line <=3D $line_main_hello } {
 		pass "next-instruction at main"
 	    } else {
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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,5 @@
-# Copyright 2002, 2003 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2005
+# Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,7 +70,7 @@ gdb_expect {
   }
 }
=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\",l=
ine=3D\"$decimal\"\}.*\\\]"
+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\",f=
ullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\"\}.*\\\]"
=20
=20
 #
@@ -96,7 +97,7 @@ gdb_expect {
   }
 }
=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\",l=
ine=3D\"$decimal\"\}.*\\\]"
+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\",f=
ullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\"\}.*\\\]"
=20
 #
 # Call bar() by hand, which should get an exception while running.
@@ -104,7 +105,7 @@ mi_gdb_test "409-stack-list-frames 0 0"=20
=20
 mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"T=
he program being debugged was signaled while in a function called from GDB.=
\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was received=
.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal =
on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the fu=
nction \\(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 thi=
s behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expr=
ession containing the function \\(bar\\) will be abandoned.\"" "call inferi=
or function which raises exception"
=20
-mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-received=
\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",fr=
ame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-fr=
ame.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\"},fram=
e=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"<function called from gdb>\"\}=
,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"
+mi_gdb_test "411-stack-list-frames" "411\\^done,reason=3D\"signal-received=
\",signal-name=3D\".*\",signal-meaning=3D\".*\",thread-id=3D\"$decimal\",fr=
ame=3D\{addr=3D\"$hex\",func=3D\"bar\",args=3D\\\[\\\],file=3D\".*mi-syn-fr=
ame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\"\},s=
tack=3D\\\[frame=3D\{level=3D\"0\",addr=3D\"$hex\",func=3D\"bar\",file=3D\"=
.*mi-syn-frame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$de=
cimal\"},frame=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"<function called =
from gdb>\"\},frame=3D\{level=3D\"2\",addr=3D\"$hex\",func=3D\"main\",file=
=3D\".*mi-syn-frame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D=
\"$decimal\"}.*\\\]" "backtrace from inferior function at exception"
=20
 mi_gdb_exit
=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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -74,11 +75,11 @@ proc test_running_to_foo {} {
=20
 proc test_until {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
=20
     send_gdb "111-exec-until\n"
     gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-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$" {
+	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=3D\"end-steppi=
ng-range\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",=
args=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfi=
le}\",line=3D\"12\"\}\r\n$mi_gdb_prompt$" {
 	    pass "until after while loop"
 	}
 	timeout {
@@ -88,7 +89,7 @@ proc test_until {} {
=20
     send_gdb "222-exec-until 15\n"
     gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" {
+	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfile=
}\",line=3D\"15\"\}\r\n$mi_gdb_prompt$" {
 	    pass "until line number"
 	}
 	timeout {
@@ -98,7 +99,7 @@ proc test_until {} {
=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-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" {
+	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"foo\",ar=
gs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfile=
}\",line=3D\"17\"\}\r\n$mi_gdb_prompt$" {
 	    pass "until line number:file"
 	}
 	timeout {
@@ -110,7 +111,7 @@ proc test_until {} {
=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-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",a=
rgs=3D\\\[\\\],file=3D\".*until.c\",line=3D\"24\"\}\r\n$mi_gdb_prompt$" {
+	-re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=3D\"location-r=
eached\",thread-id=3D\"\[01\]\",frame=3D\{addr=3D\"$hex\",func=3D\"main\",a=
rgs=3D\\\[\\\],file=3D\".*until.c\",fullname=3D\"${fullname_syntax}${srcfil=
e}\",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 -u -p -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	18 May 2005 03:39:18 -0000
@@ -1,4 +1,5 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, I=
nc.
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
 #
 # This Program Is Free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -592,10 +593,10 @@ mi_gdb_test "200-break-insert incr_a" \
 	"break-insert operation"
 send_gdb "-exec-continue\n"
 gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\".*var-=
cmd.c\",line=3D\"$line_incr_a_b_a\"\}\r\n$mi_gdb_prompt$" {
+    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\".*var-=
cmd.c\",fullname=3D\"${fullname_syntax}${srcfile}\",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-hi=
t\",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\".*var-c=
md.c\",line=3D\"([expr $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]|$l=
ine_incr_a_b_a)\"\}\r\n$mi_gdb_prompt$" {
+    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=3D\"breakpoint-hi=
t\",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\".*var-c=
md.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"([expr $line_in=
cr_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 -u -p -r1.26 mi-support.exp
--- testsuite/lib/mi-support.exp	25 Mar 2005 20:38:55 -0000	1.26
+++ testsuite/lib/mi-support.exp	18 May 2005 03:39:18 -0000
@@ -799,7 +799,7 @@ proc mi_runto {func} {
   }
=20
   global mi_gdb_prompt expect_out
-  global hex decimal
+  global hex decimal fullname_syntax
=20
   set test "mi runto $func"
   mi_gdb_test "200-break-insert $func" \
@@ -813,7 +813,7 @@ proc mi_runto {func} {
=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_promp=
t$" {
+    -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\"${fullname_syntax}.*\",li=
ne=3D\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
       pass "$test"
       return 0
     }
@@ -857,13 +857,14 @@ proc mi_execute_to_helper { cmd reason f
     global mi_gdb_prompt
     global hex
     global decimal
+    global fullname_syntax
     send_gdb "220-$cmd\n"
     gdb_expect {
-	-re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=3D\"$reaso=
n\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\"$func\",arg=
s=3D$args,file=3D\".*$file\",line=3D\"$line\"\}$extra\r\n$mi_gdb_prompt$" {
+	-re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=3D\"$reaso=
n\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\"$func\",arg=
s=3D$args,file=3D\".*$file\",fullname=3D\"${fullname_syntax}$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\"$reaso=
n\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\".*\",args=
=3D\[\\\[\{\].*\[\\\]\}\],file=3D\".*\",line=3D\"\[0-9\]*\"\}.*\r\n$mi_gdb_=
prompt$" {
+	-re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=3D\"$reaso=
n\",thread-id=3D\"$decimal\",frame=3D\{addr=3D\"$hex\",func=3D\".*\",args=
=3D\[\\\[\{\].*\[\\\]\}\],file=3D\".*\",fullname=3D\"${fullname_syntax}.*\"=
,line=3D\"\[0-9\]*\"\}.*\r\n$mi_gdb_prompt$" {
 	    fail "$test (stopped at wrong place)"
 	    return -1
 	}