This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[patch/mi] Change args=... to a list
- To: gdb-patches at sources dot redhat dot com
- Subject: [patch/mi] Change args=... to a list
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Tue, 26 Jun 2001 00:46:43 -0400
Hello (such a big patch for a two line C change :-),
This patch changes the MI output so that argument lists are output as
real lists. This patch ends up tweeking many many test files.
Andrew
Index: ChangeLog
2001-06-25 Andrew Cagney <ac131313@redhat.com>
* stack.c (print_frame): For ui_out, output a list of arguments.
Index: mi/ChangeLog
2001-06-25 Andrew Cagney <ac131313@redhat.com>
* gdbmi.texinfo: Update output examples that contain stop reason
output, change the args=.... to a list.
(exec-return): Ditto.
Index: testsuite/ChangeLog
2001-06-25 Andrew Cagney <ac131313@redhat.com>
* lib/mi-support.exp: Update args=... part of stop-reason
patterns. Accept either a list or a tuple.
Index: testsuite/gdb.mi/ChangeLog
2001-06-25 Andrew Cagney <ac131313@redhat.com>
* mi-console.exp: Update args=... part of stop-reason
patterns. Output changed to a list of arguments.
* mi-disassemble.exp: Ditto.
* mi-simplerun.exp: Ditto.
* mi-return.exp: Ditto.
* mi-read-memory.exp: Ditto.
* mi-eval.exp: Ditto.
* mi-watch.exp: Ditto.
* mi-var-display.exp: Ditto.
* mi-var-cmd.exp: Ditto.
* mi-var-child.exp: Ditto.
* mi-var-block.exp: Ditto.
* mi-until.exp: Ditto.
* mi-stepi.exp: Ditto.
* mi-stack.exp: Ditto.
* mi-regs.exp: Ditto.
Index: stack.c
===================================================================
RCS file: /cvs/src/src/gdb/stack.c,v
retrieving revision 1.20
diff -p -r1.20 stack.c
*** stack.c 2001/05/12 04:08:23 1.20
--- stack.c 2001/06/26 04:25:00
*************** print_frame (struct frame_info *fi,
*** 586,592 ****
args.func = func;
args.stream = gdb_stdout;
#ifdef UI_OUT
! args_list_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "args");
catch_errors (print_args_stub, &args, "", RETURN_MASK_ALL);
/* FIXME: args must be a list. If one argument is a string it will
have " that will not be properly escaped. */
--- 586,592 ----
args.func = func;
args.stream = gdb_stdout;
#ifdef UI_OUT
! args_list_chain = make_cleanup_ui_out_list_begin_end (uiout, "args");
catch_errors (print_args_stub, &args, "", RETURN_MASK_ALL);
/* FIXME: args must be a list. If one argument is a string it will
have " that will not be properly escaped. */
Index: mi/gdbmi.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/mi/gdbmi.texinfo,v
retrieving revision 1.17
diff -p -r1.17 gdbmi.texinfo
*** gdbmi.texinfo 2001/06/25 21:05:11 1.17
--- gdbmi.texinfo 2001/06/26 04:25:13
*************** Setting a watchpoint on a variable in th
*** 936,942 ****
^running
^done,reason="watchpoint-trigger",wpt=@{number="2",exp="x"@},
value=@{old="-268439212",new="55"@},
! frame=@{func="main",args=@{@},file="recursive2.c",line="5"@}
(@value{GDBP})
@end smallexample
--- 936,942 ----
^running
^done,reason="watchpoint-trigger",wpt=@{number="2",exp="x"@},
value=@{old="-268439212",new="55"@},
! frame=@{func="main",args=[],file="recursive2.c",line="5"@}
(@value{GDBP})
@end smallexample
*************** for the watchpoint going out of scope.
*** 953,966 ****
^running
^done,reason="watchpoint-trigger",
wpt=@{number="5",exp="C"@},value=@{old="-276895068",new="3"@},
! frame=@{func="callee4",args=@{@},
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="13"@}
(@value{GDBP})
-exec-continue
^running
^done,reason="watchpoint-scope",wpnum="5",
! frame=@{func="callee3",args=@{@{name="strarg",
! value="0x11940 \"A string argument.\""@}@},
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
@end smallexample
--- 953,966 ----
^running
^done,reason="watchpoint-trigger",
wpt=@{number="5",exp="C"@},value=@{old="-276895068",new="3"@},
! frame=@{func="callee4",args=[],
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="13"@}
(@value{GDBP})
-exec-continue
^running
^done,reason="watchpoint-scope",wpnum="5",
! frame=@{func="callee3",args=[@{name="strarg",
! value="0x11940 \"A string argument.\""@}],
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
@end smallexample
*************** enabled="y",addr="",what="C",times="0"@}
*** 986,992 ****
^running
^done,reason="watchpoint-trigger",wpt=@{number="2",exp="C"@},
value=@{old="-276895068",new="3"@},
! frame=@{func="callee4",args=@{@},
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="13"@}
(@value{GDBP})
-break-list
--- 986,992 ----
^running
^done,reason="watchpoint-trigger",wpt=@{number="2",exp="C"@},
value=@{old="-276895068",new="3"@},
! frame=@{func="callee4",args=[],
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="13"@}
(@value{GDBP})
-break-list
*************** enabled="y",addr="",what="C",times="-5"@
*** 1000,1007 ****
-exec-continue
^running
^done,reason="watchpoint-scope",wpnum="2",
! frame=@{func="callee3",args=@{@{name="strarg",
! value="0x11940 \"A string argument.\""@}@},
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
-break-list
--- 1000,1007 ----
-exec-continue
^running
^done,reason="watchpoint-scope",wpnum="2",
! frame=@{func="callee3",args=[@{name="strarg",
! value="0x11940 \"A string argument.\""@}],
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
-break-list
*************** On a PPC MBX board:
*** 1231,1237 ****
(@value{GDBP})
*stopped,reason="breakpoint-hit",bkptno="1",frame=@{func="main",
! args=@{@},file="try.c",line="5"@}
(@value{GDBP})
-data-list-changed-registers
^done,changed-registers=["0","1","2","4","5","6","7","8","9",
--- 1231,1237 ----
(@value{GDBP})
*stopped,reason="breakpoint-hit",bkptno="1",frame=@{func="main",
! args=[],file="try.c",line="5"@}
(@value{GDBP})
-data-list-changed-registers
^done,changed-registers=["0","1","2","4","5","6","7","8","9",
*************** word. Display each word in hex.
*** 1443,1452 ****
9-data-read-memory -o -6 -- bytes+6 x 1 3 2
9^done,addr="0x00001390",nr-bytes="6",total-bytes="6",
next-row="0x00001396",prev-row="0x0000138e",next-page="0x00001396",
! prev-page="0x0000138a",memory=[
! @{addr="0x00001390",data=["0x00","0x01"]@},
! @{addr="0x00001392",data=["0x02","0x03"]@},
! @{addr="0x00001394",data=["0x04","0x05"]@}]
(@value{GDBP})
@end smallexample
--- 1443,1452 ----
9-data-read-memory -o -6 -- bytes+6 x 1 3 2
9^done,addr="0x00001390",nr-bytes="6",total-bytes="6",
next-row="0x00001396",prev-row="0x0000138e",next-page="0x00001396",
! prev-page="0x0000138a",memory=@{
! @{addr="0x00001390",data=@{"0x00","0x01"@}@},
! @{addr="0x00001392",data=@{"0x02","0x03"@}@},
! @{addr="0x00001394",data=@{"0x04","0x05"@}@}@}
(@value{GDBP})
@end smallexample
*************** display as a single word formatted in de
*** 1458,1465 ****
5-data-read-memory shorts+64 d 2 1 1
5^done,addr="0x00001510",nr-bytes="2",total-bytes="2",
next-row="0x00001512",prev-row="0x0000150e",
! next-page="0x00001512",prev-page="0x0000150e",memory=[
! @{addr="0x00001510",data=["128"]@}]
(@value{GDBP})
@end smallexample
--- 1458,1465 ----
5-data-read-memory shorts+64 d 2 1 1
5^done,addr="0x00001510",nr-bytes="2",total-bytes="2",
next-row="0x00001512",prev-row="0x0000150e",
! next-page="0x00001512",prev-page="0x0000150e",memory=@{
! @{addr="0x00001510",data=@{"128"@}@}@}
(@value{GDBP})
@end smallexample
*************** used as the non-printable character.
*** 1472,1486 ****
4-data-read-memory bytes+16 x 1 8 4 x
4^done,addr="0x000013a0",nr-bytes="32",total-bytes="32",
next-row="0x000013c0",prev-row="0x0000139c",
! next-page="0x000013c0",prev-page="0x00001380",memory=[
! @{addr="0x000013a0",data=["0x10","0x11","0x12","0x13"],ascii="xxxx"@},
! @{addr="0x000013a4",data=["0x14","0x15","0x16","0x17"],ascii="xxxx"@},
! @{addr="0x000013a8",data=["0x18","0x19","0x1a","0x1b"],ascii="xxxx"@},
! @{addr="0x000013ac",data=["0x1c","0x1d","0x1e","0x1f"],ascii="xxxx"@},
! @{addr="0x000013b0",data=["0x20","0x21","0x22","0x23"],ascii=" !\"#"@},
! @{addr="0x000013b4",data=["0x24","0x25","0x26","0x27"],ascii="$%&'"@},
! @{addr="0x000013b8",data=["0x28","0x29","0x2a","0x2b"],ascii="()*+"@},
! @{addr="0x000013bc",data=["0x2c","0x2d","0x2e","0x2f"],ascii=",-./"@}]
(@value{GDBP})
@end smallexample
--- 1472,1486 ----
4-data-read-memory bytes+16 x 1 8 4 x
4^done,addr="0x000013a0",nr-bytes="32",total-bytes="32",
next-row="0x000013c0",prev-row="0x0000139c",
! next-page="0x000013c0",prev-page="0x00001380",memory=@{
! @{addr="0x000013a0",data=@{"0x10","0x11","0x12","0x13"@},ascii="xxxx"@},
! @{addr="0x000013a4",data=@{"0x14","0x15","0x16","0x17"@},ascii="xxxx"@},
! @{addr="0x000013a8",data=@{"0x18","0x19","0x1a","0x1b"@},ascii="xxxx"@},
! @{addr="0x000013ac",data=@{"0x1c","0x1d","0x1e","0x1f"@},ascii="xxxx"@},
! @{addr="0x000013b0",data=@{"0x20","0x21","0x22","0x23"@},ascii=" !\"#"@},
! @{addr="0x000013b4",data=@{"0x24","0x25","0x26","0x27"@},ascii="$%&'"@},
! @{addr="0x000013b8",data=@{"0x28","0x29","0x2a","0x2b"@},ascii="()*+"@},
! @{addr="0x000013bc",data=@{"0x2c","0x2d","0x2e","0x2f"@},ascii=",-./"@}@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} correspon
*** 1791,1797 ****
^running
(@value{GDBP})
@@Hello world
! *stopped,reason="breakpoint-hit",bkptno="2",frame=@{func="foo",args=@{@},
file="hello.c",line="13"@}
(@value{GDBP})
@end smallexample
--- 1791,1797 ----
^running
(@value{GDBP})
@@Hello world
! *stopped,reason="breakpoint-hit",bkptno="2",frame=@{func="foo",args=[],
file="hello.c",line="13"@}
(@value{GDBP})
@end smallexample
*************** Function returning @code{void}.
*** 1823,1829 ****
^running
(@value{GDBP})
@@hello from foo
! *stopped,reason="function-finished",frame=@{func="main",args=@{@},
file="hello.c",line="7"@}
(@value{GDBP})
@end smallexample
--- 1823,1829 ----
^running
(@value{GDBP})
@@hello from foo
! *stopped,reason="function-finished",frame=@{func="main",args=[],
file="hello.c",line="7"@}
(@value{GDBP})
@end smallexample
*************** value itself.
*** 1837,1843 ****
^running
(@value{GDBP})
*stopped,reason="function-finished",frame=@{addr="0x000107b0",func="foo",
! args=@{@{name="a",value="1"@},@{name="b",value="9"@}@},
file="recursive2.c",line="14"@},
gdb-result-var="$1",return-value="0"
(@value{GDBP})
--- 1837,1843 ----
^running
(@value{GDBP})
*stopped,reason="function-finished",frame=@{addr="0x000107b0",func="foo",
! args=[@{name="a",value="1"],@{name="b",value="9"@}@},
file="recursive2.c",line="14"@},
gdb-result-var="$1",return-value="0"
(@value{GDBP})
*************** file="../../../devo/gdb/testsuite/gdb.mi
*** 1972,1978 ****
000^running
(@value{GDBP})
000*stopped,reason="breakpoint-hit",bkptno="1",
! frame=@{func="callee4",args=@{@},
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8"@}
(@value{GDBP})
205-break-delete
--- 1972,1978 ----
000^running
(@value{GDBP})
000*stopped,reason="breakpoint-hit",bkptno="1",
! frame=@{func="callee4",args=[],
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8"@}
(@value{GDBP})
205-break-delete
*************** file="../../../devo/gdb/testsuite/gdb.mi
*** 1980,1987 ****
(@value{GDBP})
111-exec-return
111^done,frame=@{level="0 ",func="callee3",
! args=@{@{name="strarg",
! value="0x11940 \"A string argument.\""@}@},
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
@end smallexample
--- 1980,1987 ----
(@value{GDBP})
111-exec-return
111^done,frame=@{level="0 ",func="callee3",
! args=[@{name="strarg",
! value="0x11940 \"A string argument.\""@}],
file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="18"@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} command i
*** 2015,2021 ****
^running
(@value{GDBP})
*stopped,reason="breakpoint-hit",bkptno="1",
! frame=@{func="main",args=@{@},file="recursive2.c",line="4"@}
(@value{GDBP})
@end smallexample
--- 2015,2021 ----
^running
(@value{GDBP})
*stopped,reason="breakpoint-hit",bkptno="1",
! frame=@{func="main",args=[],file="recursive2.c",line="4"@}
(@value{GDBP})
@end smallexample
*************** Stepping into a function:
*** 2067,2074 ****
^running
(@value{GDBP})
*stopped,reason="end-stepping-range",
! frame=@{func="foo",args=@{@{name="a",value="10"@},
! @{name="b",value="0"@}@},file="recursive2.c",line="11"@}
(@value{GDBP})
@end smallexample
--- 2067,2074 ----
^running
(@value{GDBP})
*stopped,reason="end-stepping-range",
! frame=@{func="foo",args=[@{name="a",value="10"@},
! @{name="b",value="0"@}],file="recursive2.c",line="11"@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} command i
*** 2111,2124 ****
(@value{GDBP})
*stopped,reason="end-stepping-range",
! frame=@{func="foo",args=@{@},file="try.c",line="10"@}
(@value{GDBP})
-exec-step-instruction
^running
(@value{GDBP})
*stopped,reason="end-stepping-range",
! frame=@{addr="0x000100f4",func="foo",args=@{@},file="try.c",line="10"@}
(@value{GDBP})
@end smallexample
--- 2111,2124 ----
(@value{GDBP})
*stopped,reason="end-stepping-range",
! frame=@{func="foo",args=[],file="try.c",line="10"@}
(@value{GDBP})
-exec-step-instruction
^running
(@value{GDBP})
*stopped,reason="end-stepping-range",
! frame=@{addr="0x000100f4",func="foo",args=[],file="try.c",line="10"@}
(@value{GDBP})
@end smallexample
*************** The corresponding @value{GDBN} command i
*** 2149,2155 ****
^running
(@value{GDBP})
x = 55
! *stopped,reason="location-reached",frame=@{func="main",args=@{@},
file="recursive2.c",line="6"@}
(@value{GDBP})
@end smallexample
--- 2149,2155 ----
^running
(@value{GDBP})
x = 55
! *stopped,reason="location-reached",frame=@{func="main",args=[],
file="recursive2.c",line="6"@}
(@value{GDBP})
@end smallexample
Index: testsuite/gdb.mi/mi-console.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-console.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-console.exp
*** mi-console.exp 2001/06/23 21:47:09 1.4
--- mi-console.exp 2001/06/26 04:25:42
*************** mi_gdb_test "200-break-insert main" \
*** 57,63 ****
"break-insert operation"
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*mi-console.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
--- 57,63 ----
"break-insert operation"
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*mi-console.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
Index: testsuite/gdb.mi/mi-disassemble.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-disassemble.exp,v
retrieving revision 1.7
diff -p -r1.7 mi-disassemble.exp
*** mi-disassemble.exp 2001/06/23 21:47:09 1.7
--- mi-disassemble.exp 2001/06/26 04:25:42
*************** proc test_running_the_program {} {
*** 80,86 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
-re ".*$mi_gdb_prompt$" {fail "run to main (2)"}
--- 80,86 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
-re ".*$mi_gdb_prompt$" {fail "run to main (2)"}
Index: testsuite/gdb.mi/mi-eval.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-eval.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-eval.exp
*** mi-eval.exp 2001/06/23 21:47:09 1.4
--- mi-eval.exp 2001/06/26 04:25:42
*************** proc test_running_the_program {} {
*** 64,70 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" \
{ pass "run to callee4" }
-re ".*$mi_gdb_prompt$" {fail "run to callee4 (2)"}
timeout {fail "run to callee4 (timeout 2)"}
--- 64,70 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" \
{ pass "run to callee4" }
-re ".*$mi_gdb_prompt$" {fail "run to callee4 (2)"}
timeout {fail "run to callee4 (timeout 2)"}
*************** proc test_running_the_program {} {
*** 74,80 ****
gdb_expect {
-re "101\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "\[\r\n\]*101\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"9\"\}\r\n$mi_gdb_prompt$" \
{ pass "next in callee4" }
-re ".*$mi_gdb_prompt$" {fail "next in callee4 (2)"}
timeout {fail "next in callee4 (timeout 2)"}
--- 74,80 ----
gdb_expect {
-re "101\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "\[\r\n\]*101\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"9\"\}\r\n$mi_gdb_prompt$" \
{ pass "next in callee4" }
-re ".*$mi_gdb_prompt$" {fail "next in callee4 (2)"}
timeout {fail "next in callee4 (timeout 2)"}
Index: testsuite/gdb.mi/mi-read-memory.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-read-memory.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-read-memory.exp
*** mi-read-memory.exp 2001/06/25 21:05:11 1.5
--- mi-read-memory.exp 2001/06/26 04:25:42
*************** send_gdb "101-exec-next\n"
*** 52,58 ****
gdb_expect {
-re "101\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "\[\r\n\]*101\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*mi-read-memory.c\",line=\"20\"\}.*$mi_gdb_prompt$" \
{ pass "do initialization" }
-re ".*$mi_gdb_prompt$" {fail "do initialization (2)"}
timeout {fail "do initialization (timeout 2)"}
--- 52,58 ----
gdb_expect {
-re "101\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "\[\r\n\]*101\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*mi-read-memory.c\",line=\"20\"\}.*$mi_gdb_prompt$" \
{ pass "do initialization" }
-re ".*$mi_gdb_prompt$" {fail "do initialization (2)"}
timeout {fail "do initialization (timeout 2)"}
Index: testsuite/gdb.mi/mi-regs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-regs.exp,v
retrieving revision 1.7
diff -p -r1.7 mi-regs.exp
*** mi-regs.exp 2001/06/25 20:08:53 1.7
--- mi-regs.exp 2001/06/26 04:25:43
*************** proc test_running_the_program {} {
*** 82,88 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
-re ".*$mi_gdb_prompt$" {fail "run to main (2)"}
--- 82,88 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
-re ".*$mi_gdb_prompt$" {fail "run to main (2)"}
Index: testsuite/gdb.mi/mi-return.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-return.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-return.exp
*** mi-return.exp 2001/06/23 21:47:09 1.4
--- mi-return.exp 2001/06/26 04:25:43
*************** proc test_running_to_callee4 {} {
*** 57,63 ****
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
pass "run to callee4"
}
timeout {
--- 57,63 ----
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
pass "run to callee4"
}
timeout {
*************** proc test_return_simple {} {
*** 77,83 ****
send_gdb "111-exec-return\n"
gdb_expect {
! -re "111\\^done,frame=\{level=\"0 \",addr=\"$hex\",func=\"callee3\",args=\{.*\},file=\".*basics.c\",line=\"18\"\}\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)"
}
--- 77,83 ----
send_gdb "111-exec-return\n"
gdb_expect {
! -re "111\\^done,frame=\{level=\"0 \",addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",line=\"18\"\}\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-simplerun.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-simplerun.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-simplerun.exp
*** mi-simplerun.exp 2001/06/23 21:47:09 1.4
--- mi-simplerun.exp 2001/06/26 04:25:43
*************** proc test_running_the_program {} {
*** 104,110 ****
# The following is equivalent to a send_gdb "000-exec-run\n"
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
--- 104,110 ----
# The following is equivalent to a send_gdb "000-exec-run\n"
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
*************** proc test_controlled_execution {} {
*** 130,136 ****
# two prompts involved and this can lead to a race condition.
send_gdb "220-exec-next\n"
gdb_expect {
! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"33\"\}\r\n$mi_gdb_prompt$" {
pass "next at main"
}
timeout {
--- 130,136 ----
# two prompts involved and this can lead to a race condition.
send_gdb "220-exec-next\n"
gdb_expect {
! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"33\"\}\r\n$mi_gdb_prompt$" {
pass "next at main"
}
timeout {
*************** proc test_controlled_execution {} {
*** 143,149 ****
# NOTE: The ``\\\\\"'' is for \".
send_gdb "221-exec-step\n"
gdb_expect {
! -re "221\\^running\r\n${mi_gdb_prompt}221\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee1\",args=\{\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument\.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\},file=\".*basics.c\",line=\"27\"\}\r\n$mi_gdb_prompt$" {
pass "step at main"
}
timeout {
--- 143,149 ----
# NOTE: The ``\\\\\"'' is for \".
send_gdb "221-exec-step\n"
gdb_expect {
! -re "221\\^running\r\n${mi_gdb_prompt}221\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee1\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument\.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\\\],file=\".*basics.c\",line=\"27\"\}\r\n$mi_gdb_prompt$" {
pass "step at main"
}
timeout {
*************** proc test_controlled_execution {} {
*** 155,161 ****
# we should look for the right thing here.
send_gdb "222-exec-step 3\n"
gdb_expect 30 {
! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
pass "step to callee4"
}
timeout {
--- 155,161 ----
# we should look for the right thing here.
send_gdb "222-exec-step 3\n"
gdb_expect 30 {
! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
pass "step to callee4"
}
timeout {
*************** proc test_controlled_execution {} {
*** 168,174 ****
# NOTE: The ``.'' is part of ``gdb-result-var="$1"''
send_gdb "223-exec-finish\n"
gdb_expect 30 {
! -re "223\\^running\r\n${mi_gdb_prompt}223\\*stopped,reason=\"function-finished\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee3\",args=\{.*\},file=\".*basics.c\",line=\"18\"\},gdb-result-var=\".1\",return-value=\"0\"\r\n$mi_gdb_prompt$" {
pass "exec-finish"
}
timeout {
--- 168,174 ----
# NOTE: The ``.'' is part of ``gdb-result-var="$1"''
send_gdb "223-exec-finish\n"
gdb_expect 30 {
! -re "223\\^running\r\n${mi_gdb_prompt}223\\*stopped,reason=\"function-finished\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",line=\"18\"\},gdb-result-var=\".1\",return-value=\"0\"\r\n$mi_gdb_prompt$" {
pass "exec-finish"
}
timeout {
Index: testsuite/gdb.mi/mi-stack.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stack.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-stack.exp
*** mi-stack.exp 2001/06/23 21:47:09 1.4
--- mi-stack.exp 2001/06/26 04:25:43
*************** mi_gdb_test "200-break-insert callee4" \
*** 54,60 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
pass "run to callee4"
}
-re ".*$mi_gdb_prompt$" {fail "run to callee4 (2)"}
--- 54,60 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
pass "run to callee4"
}
-re ".*$mi_gdb_prompt$" {fail "run to callee4 (2)"}
*************** proc test_stack_locals_listing {} {
*** 174,180 ****
# 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=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
pass "next's in callee4"
}
timeout { fail "next in callee4 (timeout)" }
--- 174,180 ----
# 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=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
pass "next's in callee4"
}
timeout { fail "next in callee4 (timeout)" }
Index: testsuite/gdb.mi/mi-stepi.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stepi.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-stepi.exp
*** mi-stepi.exp 2001/06/23 21:47:09 1.4
--- mi-stepi.exp 2001/06/26 04:25:43
*************** proc test_running_to_main {} {
*** 57,63 ****
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
--- 57,63 ----
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
*************** proc test_stepi_nexti {} {
*** 72,78 ****
send_gdb "111-exec-step-instruction\n"
gdb_expect {
! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
pass "step-instruction at main"
}
timeout {
--- 72,78 ----
send_gdb "111-exec-step-instruction\n"
gdb_expect {
! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
pass "step-instruction at main"
}
timeout {
*************** proc test_stepi_nexti {} {
*** 81,87 ****
}
send_gdb "222-exec-next-instruction\n"
gdb_expect {
! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
pass "next-instruction at main"
}
timeout {
--- 81,87 ----
}
send_gdb "222-exec-next-instruction\n"
gdb_expect {
! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
pass "next-instruction at main"
}
timeout {
*************** proc test_stepi_nexti {} {
*** 90,96 ****
}
send_gdb "333-exec-next-instruction\n"
gdb_expect {
! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
pass "next-instruction at main"
}
timeout {
--- 90,96 ----
}
send_gdb "333-exec-next-instruction\n"
gdb_expect {
! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
pass "next-instruction at main"
}
timeout {
Index: testsuite/gdb.mi/mi-until.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-until.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-until.exp
*** mi-until.exp 2001/06/23 21:47:09 1.4
--- mi-until.exp 2001/06/26 04:25:43
*************** proc test_running_to_foo {} {
*** 57,63 ****
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\{\},file=\".*until.c\",line=\"10\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
--- 57,63 ----
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"10\"\}\r\n$mi_gdb_prompt$" {
pass "run to main"
}
timeout {
*************** proc test_until {} {
*** 75,81 ****
send_gdb "111-exec-until\n"
gdb_expect {
! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\{\},file=\".*until.c\",line=\"12\"\}\r\n$mi_gdb_prompt$" {
pass "until after while loop"
}
timeout {
--- 75,81 ----
send_gdb "111-exec-until\n"
gdb_expect {
! -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"12\"\}\r\n$mi_gdb_prompt$" {
pass "until after while loop"
}
timeout {
*************** proc test_until {} {
*** 85,91 ****
send_gdb "222-exec-until 15\n"
gdb_expect {
! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"location-reached\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\{\},file=\".*until.c\",line=\"15\"\}\r\n$mi_gdb_prompt$" {
pass "until line number"
}
timeout {
--- 85,91 ----
send_gdb "222-exec-until 15\n"
gdb_expect {
! -re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"location-reached\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"15\"\}\r\n$mi_gdb_prompt$" {
pass "until line number"
}
timeout {
*************** proc test_until {} {
*** 95,101 ****
send_gdb "333-exec-until until.c:17\n"
gdb_expect {
! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"location-reached\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\{\},file=\".*until.c\",line=\"17\"\}\r\n$mi_gdb_prompt$" {
pass "until line number:file"
}
timeout {
--- 95,101 ----
send_gdb "333-exec-until until.c:17\n"
gdb_expect {
! -re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"location-reached\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"17\"\}\r\n$mi_gdb_prompt$" {
pass "until line number:file"
}
timeout {
*************** proc test_until {} {
*** 107,113 ****
send_gdb "444-exec-until until.c:25\n"
gdb_expect {
! -re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=\"location-reached\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*until.c\",line=\"24\"\}\r\n$mi_gdb_prompt$" {
pass "until after current function"
}
timeout {
--- 107,113 ----
send_gdb "444-exec-until until.c:25\n"
gdb_expect {
! -re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=\"location-reached\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*until.c\",line=\"24\"\}\r\n$mi_gdb_prompt$" {
pass "until after current function"
}
timeout {
Index: testsuite/gdb.mi/mi-var-block.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-block.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-var-block.exp
*** mi-var-block.exp 2001/06/23 21:47:09 1.4
--- mi-var-block.exp 2001/06/26 04:25:43
*************** mi_gdb_test "200-break-insert do_block_t
*** 49,55 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"154\"\}\r\n$mi_gdb_prompt$" {
pass "run to do_block_tests"
}
-re ".*$mi_gdb_prompt$" {fail "run to do_block_tests (2)"}
--- 49,55 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"154\"\}\r\n$mi_gdb_prompt$" {
pass "run to do_block_tests"
}
-re ".*$mi_gdb_prompt$" {fail "run to do_block_tests (2)"}
*************** mi_gdb_test "-var-create foo * foo" \
*** 69,75 ****
# step to "foo = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"158\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout {
--- 69,75 ----
# step to "foo = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"158\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout {
*************** mi_gdb_test "-var-create foo * foo" \
*** 93,99 ****
# step to "foo2 = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"161\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout {
--- 93,99 ----
# step to "foo2 = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"161\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 110,116 ****
# step to "foo = 321;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"164\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout {
--- 110,116 ----
# step to "foo = 321;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"164\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout {
*************** mi_gdb_test "-var-create inner_foo * foo
*** 127,133 ****
# step to "foo2 = 0;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"166\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout { fail "step at do_block_tests (timeout)" }
--- 127,133 ----
# step to "foo2 = 0;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"166\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout { fail "step at do_block_tests (timeout)" }
*************** mi_gdb_test "-var-delete inner_foo" \
*** 165,171 ****
# step to "foo = 0;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"168\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout { fail "step at do_block_tests (timeout)" }
--- 165,171 ----
# step to "foo = 0;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"168\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout { fail "step at do_block_tests (timeout)" }
*************** clear_xfail *-*-*
*** 182,188 ****
# step to "cb = 21;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\{\},file=\".*var-cmd.c\",line=\"171\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout { fail "step at do_block_tests (timeout)" }
--- 182,188 ----
# step to "cb = 21;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_block_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"171\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_block_tests"
}
timeout { fail "step at do_block_tests (timeout)" }
Index: testsuite/gdb.mi/mi-var-child.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-child.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-var-child.exp
*** mi-var-child.exp 2001/06/23 21:47:09 1.5
--- mi-var-child.exp 2001/06/26 04:25:46
*************** mi_gdb_test "200-break-insert do_childre
*** 49,55 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"190\"\}\r\n$mi_gdb_prompt$" {
pass "run to do_children_tests"
}
-re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"}
--- 49,55 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"190\"\}\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 "-var-info-num-children stru
*** 567,573 ****
# Step to "struct_declarations.integer = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"192\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 567,573 ----
# Step to "struct_declarations.integer = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"192\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 774,780 ****
# Step over "struct_declarations.integer = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"193\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 774,780 ----
# Step over "struct_declarations.integer = 123;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"193\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 795,801 ****
send_gdb "-exec-step 3\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"196\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 795,801 ----
send_gdb "-exec-step 3\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"196\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 812,818 ****
# Step over "struct_declarations.int_ptr_ptr = &foo;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"197\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 812,818 ----
# Step over "struct_declarations.int_ptr_ptr = &foo;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"197\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 829,835 ****
# Step over "weird->long_array[0] = 1234;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"198\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 829,835 ----
# Step over "weird->long_array[0] = 1234;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"198\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 846,852 ****
# Step over "struct_declarations.long_array[1] = 2345;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"199\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 846,852 ----
# Step over "struct_declarations.long_array[1] = 2345;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"199\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 863,869 ****
# Step over "weird->long_array[2] = 3456;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"200\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 863,869 ----
# Step over "weird->long_array[2] = 3456;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"200\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 887,893 ****
# struct_declarations.long_array[9] = 1234;
send_gdb "-exec-step 7\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"208\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 887,893 ----
# struct_declarations.long_array[9] = 1234;
send_gdb "-exec-step 7\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"208\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 905,911 ****
# Step over "weird->func_ptr = nothing;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"211\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 905,911 ----
# Step over "weird->func_ptr = nothing;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"211\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-delete weird->int_ptr_
*** 933,939 ****
# psnp = &snp0;
send_gdb "-exec-step 43\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"254\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 933,939 ----
# psnp = &snp0;
send_gdb "-exec-step 43\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"254\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-list-children psnp->pt
*** 1211,1217 ****
# Step over "snp0.char_ptr = &b3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"255\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 1211,1217 ----
# Step over "snp0.char_ptr = &b3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"255\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 1228,1234 ****
# Step over "snp1.char_ptr = &c3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"256\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 1228,1234 ----
# Step over "snp1.char_ptr = &c3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"256\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 1247,1253 ****
# Step over "snp2.char_ptr = &a3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"257\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 1247,1253 ----
# Step over "snp2.char_ptr = &a3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"257\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 1266,1272 ****
# Step over "snp0.long_ptr = &y3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"258\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 1266,1272 ----
# Step over "snp0.long_ptr = &y3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"258\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 1284,1290 ****
# Step over "snp1.long_ptr = &x3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"259\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 1284,1290 ----
# Step over "snp1.long_ptr = &x3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"259\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
*************** clear_xfail *-*-*
*** 1309,1315 ****
# Step over "snp2.long_ptr = &z3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"260\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
--- 1309,1315 ----
# Step over "snp2.long_ptr = &z3;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"260\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_children_tests"
}
timeout {
Index: testsuite/gdb.mi/mi-var-cmd.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-cmd.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-var-cmd.exp
*** mi-var-cmd.exp 2001/06/23 21:47:09 1.4
--- mi-var-cmd.exp 2001/06/26 04:25:47
*************** mi_gdb_test "200-break-insert do_locals_
*** 77,83 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"106\"\}\r\n$mi_gdb_prompt$" {
pass "run to do_locals_tests"
}
-re ".*$mi_gdb_prompt$" {fail "run todo_locals_tests (2)"}
--- 77,83 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"106\"\}\r\n$mi_gdb_prompt$" {
pass "run to do_locals_tests"
}
-re ".*$mi_gdb_prompt$" {fail "run todo_locals_tests (2)"}
*************** mi_gdb_test "-var-update *" \
*** 182,188 ****
# Step over "linteger = 1234;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"107\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
--- 182,188 ----
# Step over "linteger = 1234;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"107\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 199,205 ****
# Step over "lpinteger = &linteger;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"108\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
--- 199,205 ----
# Step over "lpinteger = &linteger;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"108\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 216,222 ****
# Step over "lcharacter = 'a';"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"109\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
--- 216,222 ----
# Step over "lcharacter = 'a';"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"109\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 233,239 ****
# Step over "lpcharacter = &lcharacter;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"110\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
--- 233,239 ----
# Step over "lpcharacter = &lcharacter;"
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"110\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 261,267 ****
send_gdb "-exec-step 9\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"119\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
--- 261,267 ----
send_gdb "-exec-step 9\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"119\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 284,290 ****
send_gdb "-exec-step 4\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"125\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
--- 284,290 ----
send_gdb "-exec-step 4\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"125\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
*************** mi_gdb_test "-var-update *" \
*** 310,316 ****
send_gdb "-exec-step 8\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"133\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
--- 310,316 ----
send_gdb "-exec-step 8\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"133\"\}\r\n$mi_gdb_prompt$" {
pass "step at do_locals_tests"
}
timeout {
*************** mi_gdb_test "-break-insert subroutine1"
*** 434,440 ****
"break-insert subroutine1"
send_gdb "-exec-continue\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\"4321\"\},\{name=\"l\",value=\"$hex\"\}\},file=\".*var-cmd.c\",line=\"146\"\}\r\n$mi_gdb_prompt$" {
pass "continue to subroutine1"
}
timeout {
--- 434,440 ----
"break-insert subroutine1"
send_gdb "-exec-continue\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\\\[\{name=\"i\",value=\"4321\"\},\{name=\"l\",value=\"$hex\"\}\\\],file=\".*var-cmd.c\",line=\"146\"\}\r\n$mi_gdb_prompt$" {
pass "continue to subroutine1"
}
timeout {
*************** mi_gdb_test "-var-create linteger * lint
*** 460,466 ****
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\},file=\".*var-cmd.c\",line=\"147\"\}\r\n$mi_gdb_prompt$" {
pass "step at subroutine1"
}
timeout {
--- 460,466 ----
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\\\[\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\\\],file=\".*var-cmd.c\",line=\"147\"\}\r\n$mi_gdb_prompt$" {
pass "step at subroutine1"
}
timeout {
*************** clear_xfail *-*-*
*** 483,489 ****
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\},file=\".*var-cmd.c\",line=\"148\"\}\r\n$mi_gdb_prompt$" {
pass "step at subroutine1"
}
timeout { fail "step at subroutine1 (timeout)" }
--- 483,489 ----
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\\\[\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\\\],file=\".*var-cmd.c\",line=\"148\"\}\r\n$mi_gdb_prompt$" {
pass "step at subroutine1"
}
timeout { fail "step at subroutine1 (timeout)" }
*************** mi_gdb_test "-var-update *" \
*** 497,503 ****
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\},file=\".*var-cmd.c\",line=\"149\"\}\r\n$mi_gdb_prompt$" {
pass "step at subroutine1"
}
timeout { fail "step at subroutine1 (timeout)" }
--- 497,503 ----
send_gdb "-exec-step\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\\\[\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\\\],file=\".*var-cmd.c\",line=\"149\"\}\r\n$mi_gdb_prompt$" {
pass "step at subroutine1"
}
timeout { fail "step at subroutine1 (timeout)" }
*************** mi_gdb_test "-var-update *" \
*** 511,517 ****
send_gdb "-exec-next\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"136\"\}\r\n$mi_gdb_prompt$" {
pass "next out of subroutine1"
}
timeout { fail "next out of subroutine1 (timeout)" }
--- 511,517 ----
send_gdb "-exec-next\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"136\"\}\r\n$mi_gdb_prompt$" {
pass "next out of subroutine1"
}
timeout { fail "next out of subroutine1 (timeout)" }
Index: testsuite/gdb.mi/mi-var-display.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-display.exp,v
retrieving revision 1.3
diff -p -r1.3 mi-var-display.exp
*** mi-var-display.exp 2001/06/23 21:47:09 1.3
--- mi-var-display.exp 2001/06/26 04:25:47
*************** mi_gdb_test "200-break-insert 260" \
*** 49,55 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\{\},file=\".*var-cmd.c\",line=\"260\"\}\r\n$mi_gdb_prompt$" {
pass "run to do_children_tests"
}
-re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"}
--- 49,55 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"260\"\}\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
*** 330,336 ****
send_gdb "-exec-continue\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\{\},file=\".*var-cmd.c\",line=\"282\"\}\r\n$mi_gdb_prompt$" {
pass "continue to do_special_tests"
}
timeout {
--- 330,336 ----
send_gdb "-exec-continue\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"282\"\}\r\n$mi_gdb_prompt$" {
pass "continue to do_special_tests"
}
timeout {
*************** mi_gdb_test "200-break-insert incr_a" \
*** 588,594 ****
"break-insert operation"
send_gdb "-exec-continue\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"incr_a\",args=\{\{name=\"a\",value=\"2\.*\"\}\},file=\".*var-cmd.c\",line=\"85\"\}\r\n$mi_gdb_prompt$" {
pass "continue to incr_a"
}
timeout {
--- 588,594 ----
"break-insert operation"
send_gdb "-exec-continue\n"
gdb_expect {
! -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"incr_a\",args=\\\[\{name=\"a\",value=\"2\.*\"\}\\\],file=\".*var-cmd.c\",line=\"85\"\}\r\n$mi_gdb_prompt$" {
pass "continue to incr_a"
}
timeout {
Index: testsuite/gdb.mi/mi-watch.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-watch.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-watch.exp
*** mi-watch.exp 2001/06/23 21:47:09 1.5
--- mi-watch.exp 2001/06/26 04:25:47
*************** proc test_running_the_program {} {
*** 133,139 ****
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" \
{ pass "run to callee4" }
-re ".*$mi_gdb_prompt$" {fail "run to callee4 (2)"}
timeout {fail "run to callee4 (timeout 2)"}
--- 133,139 ----
mi_run_cmd
# The running part has been checked already by mi_run_cmd
gdb_expect {
! -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" \
{ pass "run to callee4" }
-re ".*$mi_gdb_prompt$" {fail "run to callee4 (2)"}
timeout {fail "run to callee4 (timeout 2)"}
*************** proc test_watchpoint_triggering {} {
*** 154,160 ****
gdb_expect {
-re "222\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "222\\*stopped,reason=\"watchpoint-trigger\",wpt=\{number=\"2\",exp=\"C\"\},value=\{old=\".*\",new=\"3\"\},thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
pass "watchpoint trigger"
}
-re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (2)"}
--- 154,160 ----
gdb_expect {
-re "222\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "222\\*stopped,reason=\"watchpoint-trigger\",wpt=\{number=\"2\",exp=\"C\"\},value=\{old=\".*\",new=\"3\"\},thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
pass "watchpoint trigger"
}
-re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (2)"}
*************** proc test_watchpoint_triggering {} {
*** 169,175 ****
gdb_expect {
-re "223\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "\[\r\n\]*223\\*stopped,reason=\"watchpoint-scope\",wpnum=\"2\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee3\",args=\{.*\},file=\".*basics.c\",line=\"18\"\}\r\n$mi_gdb_prompt$" {
pass "wp out of scope"
}
-re ".*$mi_gdb_prompt$" {fail "wp out of scope (2)"}
--- 169,175 ----
gdb_expect {
-re "223\\^running\r\n$mi_gdb_prompt" {
gdb_expect {
! -re "\[\r\n\]*223\\*stopped,reason=\"watchpoint-scope\",wpnum=\"2\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",line=\"18\"\}\r\n$mi_gdb_prompt$" {
pass "wp out of scope"
}
-re ".*$mi_gdb_prompt$" {fail "wp out of scope (2)"}
Index: testsuite/lib/mi-support.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/mi-support.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-support.exp
*** mi-support.exp 2001/06/23 21:47:09 1.6
--- mi-support.exp 2001/06/26 04:25:51
*************** proc mi_run_to_main { } {
*** 632,638 ****
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
pass "$test"
return 0
}
--- 632,638 ----
mi_run_cmd
gdb_expect {
! -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"main\",args=\(\\\[\\\]\|\{\}\),file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
pass "$test"
return 0
}
*************** proc mi_next { test } {
*** 654,660 ****
global mi_gdb_prompt
send_gdb "220-exec-next\n"
gdb_expect {
! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\{.*\},,file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
pass "$test"
return 0
}
--- 654,660 ----
global mi_gdb_prompt
send_gdb "220-exec-next\n"
gdb_expect {
! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{].*[\\\]\}\],,file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
pass "$test"
return 0
}
*************** proc mi_step { test } {
*** 676,682 ****
global mi_gdb_prompt
send_gdb "220-exec-step\n"
gdb_expect {
! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\{.*\},,file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
pass "$test"
return 0
}
--- 676,682 ----
global mi_gdb_prompt
send_gdb "220-exec-step\n"
gdb_expect {
! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{\].*\[\\\]\}\],,file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
pass "$test"
return 0
}