This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[patch] Allow pre-threaded MI targets


Hello,

Some remote targets come ``pre-threaded''.  MI, on the other hand, was 
assuming that the target was never threaded and would fail when a 
thread-id of 1 was reported.

This patch fixes this.

	Andrew
Index: gdb.mi/ChangeLog
2001-08-09  Andrew Cagney  <ac131313@redhat.com>

	* mi0-var-block.exp, mi0-stack.exp, mi0-simplerun.exp,
	mi0-regs.exp, mi0-watch.exp, mi0-stepi.exp, mi0-until.exp,
	mi0-return.exp, mi0-read-memory.exp, mi0-eval.exp,
	mi0-disassemble.exp, mi0-console.exp, mi-watch.exp,
	mi-var-display.exp, mi-var-cmd.exp, mi-var-child.exp,
	mi-until.exp, mi-var-block.exp, mi-stepi.exp, mi-stack.exp,
	mi-simplerun.exp, mi-return.exp, mi-regs.exp, mi-read-memory.exp,
	mi-disassemble.exp, mi-eval.exp, mi-console.exp: Replace pattern
	matching thread=0 with one to also match thread=1.
	Fix PR gdb/190.

Index: gdb.mi/mi-console.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-console.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-console.exp
*** mi-console.exp	2001/08/19 00:37:28	1.6
--- mi-console.exp	2001/08/19 01:15:07
*************** 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"
      }
      -re ".*$mi_gdb_prompt$" {
--- 57,63 ----
  	"break-insert operation"
  mi_run_cmd
  gdb_expect {
!     -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*mi-console.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
      }
      -re ".*$mi_gdb_prompt$" {
Index: gdb.mi/mi-disassemble.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-disassemble.exp,v
retrieving revision 1.9
diff -p -r1.9 mi-disassemble.exp
*** mi-disassemble.exp	2001/06/27 17:27:07	1.9
--- mi-disassemble.exp	2001/08/19 01:15:07
*************** 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=\"\[01\]\",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: gdb.mi/mi-eval.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-eval.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-eval.exp
*** mi-eval.exp	2001/06/26 04:48:48	1.5
--- mi-eval.exp	2001/08/19 01:15:07
*************** 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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi-read-memory.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-read-memory.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-read-memory.exp
*** mi-read-memory.exp	2001/06/26 04:48:48	1.6
--- mi-read-memory.exp	2001/08/19 01:15:07
*************** 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=\"\[01\]\",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: gdb.mi/mi-regs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-regs.exp,v
retrieving revision 1.8
diff -p -r1.8 mi-regs.exp
*** mi-regs.exp	2001/06/26 04:48:48	1.8
--- mi-regs.exp	2001/08/19 01:15:08
*************** 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=\"\[01\]\",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: gdb.mi/mi-return.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-return.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-return.exp
*** mi-return.exp	2001/08/19 00:37:28	1.6
--- mi-return.exp	2001/08/19 01:15:08
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 57,63 ----
      mi_run_cmd
  
      gdb_expect {
! 	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to callee4"
  	}
  	-re ".*$mi_gdb_prompt$" {
Index: gdb.mi/mi-simplerun.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-simplerun.exp,v
retrieving revision 1.7
diff -p -r1.7 mi-simplerun.exp
*** mi-simplerun.exp	2001/08/19 00:37:28	1.7
--- mi-simplerun.exp	2001/08/19 01:15:08
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 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=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
  	}
  	-re ".*$mi_gdb_prompt$" {
*************** proc test_controlled_execution {} {
*** 133,139 ****
      # 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 {
--- 133,139 ----
      # 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=\"\[01\]\",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 {} {
*** 146,152 ****
      # 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 {
--- 146,152 ----
      # 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=\"\[01\]\",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 {} {
*** 158,164 ****
      #        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 {
--- 158,164 ----
      #        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=\"\[01\]\",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 {} {
*** 171,177 ****
      # 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 {
--- 171,177 ----
      # 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=\"\[01\]\",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: gdb.mi/mi-stack.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stack.exp,v
retrieving revision 1.7
diff -p -r1.7 mi-stack.exp
*** mi-stack.exp	2001/06/26 18:50:51	1.7
--- mi-stack.exp	2001/08/19 01:15:08
*************** 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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi-stepi.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stepi.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-stepi.exp
*** mi-stepi.exp	2001/08/19 00:37:28	1.6
--- mi-stepi.exp	2001/08/19 01:15:09
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 57,63 ----
      mi_run_cmd
  
      gdb_expect {
! 	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
  	}
  	-re ".*$mi_gdb_prompt$" {
*************** proc test_stepi_nexti {} {
*** 75,81 ****
  
      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 {
--- 75,81 ----
  
      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=\"\[01\]\",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 {} {
*** 84,90 ****
      }
      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 {
--- 84,90 ----
      }
      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=\"\[01\]\",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 {} {
*** 93,99 ****
      }
      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 {
--- 93,99 ----
      }
      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=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
  	    pass "next-instruction at main"
  	}
  	timeout {
Index: gdb.mi/mi-until.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-until.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-until.exp
*** mi-until.exp	2001/08/19 00:37:28	1.6
--- mi-until.exp	2001/08/19 01:15:13
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 57,63 ----
      mi_run_cmd
  
      gdb_expect {
! 	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"10\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
  	}
  	-re ".*$mi_gdb_prompt$" {
*************** proc test_until {} {
*** 78,84 ****
  
      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 {
--- 78,84 ----
  
      send_gdb "111-exec-until\n"
      gdb_expect {
! 	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",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 {} {
*** 88,94 ****
  
      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 {
--- 88,94 ----
  
      send_gdb "222-exec-until 15\n"
      gdb_expect {
! 	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"15\"\}\r\n$mi_gdb_prompt$" {
  	    pass "until line number"
  	}
  	timeout {
*************** proc test_until {} {
*** 98,104 ****
  
      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 {
--- 98,104 ----
  
      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=\"\[01\]\",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 {} {
*** 110,116 ****
  
      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 {
--- 110,116 ----
  
      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=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*until.c\",line=\"24\"\}\r\n$mi_gdb_prompt$" {
  	    pass "until after current function"
  	}
  	timeout {
Index: gdb.mi/mi-var-block.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-block.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-var-block.exp
*** mi-var-block.exp	2001/06/26 04:48:48	1.5
--- mi-var-block.exp	2001/08/19 01:15:13
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi-var-child.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-child.exp,v
retrieving revision 1.6
diff -p -r1.6 mi-var-child.exp
*** mi-var-child.exp	2001/06/26 04:48:48	1.6
--- mi-var-child.exp	2001/08/19 01:15:14
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi-var-cmd.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-cmd.exp,v
retrieving revision 1.5
diff -p -r1.5 mi-var-cmd.exp
*** mi-var-cmd.exp	2001/06/26 04:48:48	1.5
--- mi-var-cmd.exp	2001/08/19 01:15:14
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi-var-display.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-display.exp,v
retrieving revision 1.4
diff -p -r1.4 mi-var-display.exp
*** mi-var-display.exp	2001/06/26 04:48:48	1.4
--- mi-var-display.exp	2001/08/19 01:15:14
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi-watch.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-watch.exp,v
retrieving revision 1.7
diff -p -r1.7 mi-watch.exp
*** mi-watch.exp	2001/06/27 17:27:07	1.7
--- mi-watch.exp	2001/08/19 01:15:14
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi0-console.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-console.exp,v
retrieving revision 1.4
diff -p -r1.4 mi0-console.exp
*** mi0-console.exp	2001/08/19 00:37:28	1.4
--- mi0-console.exp	2001/08/19 01:15:14
*************** 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"
      }
      -re ".*$mi_gdb_prompt$" {
--- 57,63 ----
  	"break-insert operation"
  mi_run_cmd
  gdb_expect {
!     -re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*mi-console.c\",line=\"13\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
      }
      -re ".*$mi_gdb_prompt$" {
Index: gdb.mi/mi0-disassemble.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-disassemble.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-disassemble.exp
*** mi0-disassemble.exp	2001/06/23 21:47:09	1.3
--- mi0-disassemble.exp	2001/08/19 01:15:14
*************** 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=\"\[01\]\",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: gdb.mi/mi0-eval.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-eval.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-eval.exp
*** mi0-eval.exp	2001/06/23 21:47:09	1.3
--- mi0-eval.exp	2001/08/19 01:15:14
*************** 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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi0-read-memory.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-read-memory.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-read-memory.exp
*** mi0-read-memory.exp	2001/06/23 21:47:09	1.3
--- mi0-read-memory.exp	2001/08/19 01:15:15
*************** 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=\"\[01\]\",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: gdb.mi/mi0-regs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-regs.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-regs.exp
*** mi0-regs.exp	2001/06/23 21:47:09	1.3
--- mi0-regs.exp	2001/08/19 01:15:15
*************** 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=\"\[01\]\",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: gdb.mi/mi0-return.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-return.exp,v
retrieving revision 1.4
diff -p -r1.4 mi0-return.exp
*** mi0-return.exp	2001/08/19 00:37:28	1.4
--- mi0-return.exp	2001/08/19 01:15:15
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 57,63 ----
      mi_run_cmd
  
      gdb_expect {
! 	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\{\},file=\".*basics.c\",line=\"8\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to callee4"
  	}
  	-re ".*$mi_gdb_prompt$" {
Index: gdb.mi/mi0-simplerun.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-simplerun.exp,v
retrieving revision 1.4
diff -p -r1.4 mi0-simplerun.exp
*** mi0-simplerun.exp	2001/08/19 00:37:28	1.4
--- mi0-simplerun.exp	2001/08/19 01:15:16
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 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=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
  	}
  	-re ".*$mi_gdb_prompt$" {
*************** proc test_controlled_execution {} {
*** 133,139 ****
      # 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 {
--- 133,139 ----
      # 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=\"\[01\]\",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 {} {
*** 146,152 ****
      # 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 {
--- 146,152 ----
      # 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=\"\[01\]\",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 {} {
*** 158,164 ****
      #        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 {
--- 158,164 ----
      #        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=\"\[01\]\",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 {} {
*** 171,177 ****
      # 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 {
--- 171,177 ----
      # 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=\"\[01\]\",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: gdb.mi/mi0-stack.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-stack.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-stack.exp
*** mi0-stack.exp	2001/06/23 21:47:09	1.3
--- mi0-stack.exp	2001/08/19 01:15:16
*************** 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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi0-stepi.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-stepi.exp,v
retrieving revision 1.4
diff -p -r1.4 mi0-stepi.exp
*** mi0-stepi.exp	2001/08/19 00:37:28	1.4
--- mi0-stepi.exp	2001/08/19 01:15:16
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 57,63 ----
      mi_run_cmd
  
      gdb_expect {
! 	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"32\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
  	}
  	-re ".*$mi_gdb_prompt$" {
*************** proc test_stepi_nexti {} {
*** 75,81 ****
  
      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 {
--- 75,81 ----
  
      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=\"\[01\]\",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 {} {
*** 84,90 ****
      }
      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 {
--- 84,90 ----
      }
      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=\"\[01\]\",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 {} {
*** 93,99 ****
      }
      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 {
--- 93,99 ----
      }
      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=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*basics.c\",line=\"3.\"\}\r\n$mi_gdb_prompt$" {
  	    pass "next-instruction at main"
  	}
  	timeout {
Index: gdb.mi/mi0-until.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-until.exp,v
retrieving revision 1.4
diff -p -r1.4 mi0-until.exp
*** mi0-until.exp	2001/08/19 00:37:28	1.4
--- mi0-until.exp	2001/08/19 01:15:16
*************** 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"
  	}
  	-re ".*$mi_gdb_prompt$" {
--- 57,63 ----
      mi_run_cmd
  
      gdb_expect {
! 	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\{\},file=\".*until.c\",line=\"10\"\}\r\n$mi_gdb_prompt$" {
  	    pass "run to main"
  	}
  	-re ".*$mi_gdb_prompt$" {
*************** proc test_until {} {
*** 78,84 ****
  
      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 {
--- 78,84 ----
  
      send_gdb "111-exec-until\n"
      gdb_expect {
! 	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",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 {} {
*** 88,94 ****
  
      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 {
--- 88,94 ----
  
      send_gdb "222-exec-until 15\n"
      gdb_expect {
! 	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\{\},file=\".*until.c\",line=\"15\"\}\r\n$mi_gdb_prompt$" {
  	    pass "until line number"
  	}
  	timeout {
*************** proc test_until {} {
*** 98,104 ****
  
      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 {
--- 98,104 ----
  
      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=\"\[01\]\",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 {} {
*** 110,116 ****
  
      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 {
--- 110,116 ----
  
      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=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\{\},file=\".*until.c\",line=\"24\"\}\r\n$mi_gdb_prompt$" {
  	    pass "until after current function"
  	}
  	timeout {
Index: gdb.mi/mi0-var-block.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-var-block.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-var-block.exp
*** mi0-var-block.exp	2001/06/23 21:47:09	1.3
--- mi0-var-block.exp	2001/08/19 01:15:16
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi0-var-child.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-var-child.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-var-child.exp
*** mi0-var-child.exp	2001/06/23 21:47:09	1.3
--- mi0-var-child.exp	2001/08/19 01:15:18
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi0-var-cmd.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-var-cmd.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-var-cmd.exp
*** mi0-var-cmd.exp	2001/06/23 21:47:09	1.3
--- mi0-var-cmd.exp	2001/08/19 01:15:19
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi0-var-display.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-var-display.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-var-display.exp
*** mi0-var-display.exp	2001/06/23 21:47:09	1.3
--- mi0-var-display.exp	2001/08/19 01:15:20
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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: gdb.mi/mi0-watch.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi0-watch.exp,v
retrieving revision 1.3
diff -p -r1.3 mi0-watch.exp
*** mi0-watch.exp	2001/06/23 21:47:09	1.3
--- mi0-watch.exp	2001/08/19 01:15:21
*************** 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=\"\[01\]\",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=\"\[01\]\",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=\"\[01\]\",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 Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]