*** mi1-basics.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-basics.exp	Wed Jun 27 13:27:07 2001
***************
*** 30,36 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 30,36 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-break.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-break.exp	Wed Jun 27 13:27:07 2001
***************
*** 29,35 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 29,35 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-console.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-console.exp	Sat Aug 18 21:23:43 2001
***************
*** 1,4 ****
! # Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,4 ----
! # Copyright 1999, 2000, 2001 Cygnus Solutions.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 33,39 ****
  # remote target.
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 33,39 ----
  # remote target.
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-disassemble.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-disassemble.exp	Sat Aug 18 21:23:43 2001
***************
*** 25,31 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 25,31 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-eval.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-eval.exp	Sat Aug 18 21:23:43 2001
***************
*** 27,33 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 27,33 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-hack-cli.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-hack-cli.exp	Sat Oct 27 20:29:50 2001
***************
*** 21,27 ****
  # Some basic checks for the CLI.
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 21,27 ----
  # Some basic checks for the CLI.
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-read-memory.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-read-memory.exp	Sat Aug 18 21:23:43 2001
***************
*** 30,36 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 30,36 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-regs.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-regs.exp	Tue Feb  5 18:58:45 2002
***************
*** 27,33 ****
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 27,33 ----
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-return.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-return.exp	Sat Aug 18 21:23:43 2001
***************
*** 27,33 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 27,33 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-simplerun.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-simplerun.exp	Sun Nov 11 15:11:03 2001
***************
*** 29,35 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 29,35 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
***************
*** 140,146 ****
  
      # FIXME: A string argument is not printed right; should be fixed and
      #        we should look for the right thing here.
!     mi_execute_to "exec-step 3" "end-stepping-range" "callee4" "" \
  	"basics.c" "8" "" "step to callee4"
  
      # FIXME: A string argument is not printed right; should be fixed and
--- 140,146 ----
  
      # FIXME: A string argument is not printed right; should be fixed and
      #        we should look for the right thing here.
!     mi_run_to "exec-step 3" "end-stepping-range" "callee4" "" \
  	"basics.c" "8" "" "step to callee4"
  
      # FIXME: A string argument is not printed right; should be fixed and
*** mi1-stack.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-stack.exp	Sat Aug 18 21:23:43 2001
***************
*** 27,33 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 27,33 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-stepi.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-stepi.exp	Sat Aug 18 21:23:43 2001
***************
*** 27,33 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 27,33 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-until.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-until.exp	Sat Aug 18 21:23:43 2001
***************
*** 27,33 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 27,33 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-var-block.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-var-block.exp	Sat Aug 18 21:23:43 2001
***************
*** 1,4 ****
! #   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
  #
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,4 ----
! #   Copyright (C) 1999 2000 s Solutions
  #
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 24,30 ****
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 24,30 ----
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-var-child.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-var-child.exp	Thu May  9 14:29:33 2002
***************
*** 1,5 ****
! #   Copyright (C) 1999, 2000, 2002 Free Software Foundation
! 
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2 of the License, or
--- 1,5 ----
! #   Copyright (C) 1999 2000 Cygnus Solutions
! #
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2 of the License, or
***************
*** 24,30 ****
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 24,30 ----
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
***************
*** 42,48 ****
  mi_gdb_reinitialize_dir $srcdir/$subdir
  mi_gdb_load ${binfile}
  
! mi_runto do_children_tests
  
  #####        #####
  #                #
--- 42,60 ----
  mi_gdb_reinitialize_dir $srcdir/$subdir
  mi_gdb_load ${binfile}
  
! mi_gdb_test "200-break-insert do_children_tests" \
! 	"200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_children_tests\",file=\".*var-cmd.c\",line=\"190\",times=\"0\"\}" \
! 	"break-insert operation"
! 
! 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)"}
!     timeout {fail "run to do_children_tests (timeout 2)"}
! }
  
  #####        #####
  #                #
***************
*** 555,562 ****
  
  
  # Step to "struct_declarations.integer = 123;"
! set line 192
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step to line $line"
  
  # Test: c_variable-4.81
  # Desc: create local variable "weird"
--- 567,582 ----
  
  
  # 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
! 
  
  # Test: c_variable-4.81
  # Desc: create local variable "weird"
***************
*** 754,761 ****
  	"update all vars. None changed"
  
  # Step over "struct_declarations.integer = 123;"
! set line 193
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.2
  # Desc: check that integer changed
--- 774,788 ----
  	"update all vars. None changed"
  
  # 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.2
  # Desc: check that integer changed
***************
*** 767,774 ****
  #    weird->char_ptr = "hello";
  #    bar = 2121;
  #    foo = &bar;
! set line 196
! mi_execute_to "exec-step 3" "end-stepping-range" do_children_tests {} {.*var-cmd.c} $line {} "step $line"
  
  # Test: c_variable-5.3
  # Desc: check that char_ptr changed
--- 794,809 ----
  #    weird->char_ptr = "hello";
  #    bar = 2121;
  #    foo = &bar;
! 
! 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.3
  # Desc: check that char_ptr changed
***************
*** 777,784 ****
  	"update all vars struct_declarations.char_ptr"
  
  # Step over "struct_declarations.int_ptr_ptr = &foo;"
! set line 197
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.4
  # Desc: check that int_ptr_ptr and children changed
--- 812,826 ----
  	"update all vars struct_declarations.char_ptr"
  
  # 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.4
  # Desc: check that int_ptr_ptr and children changed
***************
*** 787,794 ****
  	"update all vars int_ptr_ptr and children changed"
  
  # Step over "weird->long_array[0] = 1234;"
! set line 198
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.5
  # Desc: check that long_array[0] changed
--- 829,843 ----
  	"update all vars int_ptr_ptr and children changed"
  
  # 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.5
  # Desc: check that long_array[0] changed
***************
*** 797,804 ****
  	"update all vars struct_declarations.long_array.0 changed"
  
  # Step over "struct_declarations.long_array[1] = 2345;"
! set line 199
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.6
  # Desc: check that long_array[1] changed
--- 846,860 ----
  	"update all vars struct_declarations.long_array.0 changed"
  
  # 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.6
  # Desc: check that long_array[1] changed
***************
*** 807,814 ****
  	"update all vars struct_declarations.long_array.1 changed"
  
  # Step over "weird->long_array[2] = 3456;"
! set line 200
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.7
  # Desc: check that long_array[2] changed
--- 863,877 ----
  	"update all vars struct_declarations.long_array.1 changed"
  
  # 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.7
  # Desc: check that long_array[2] changed
***************
*** 824,831 ****
  #    struct_declarations.long_array[7] = 8901;
  #    weird->long_array[8] = 9012;
  #    struct_declarations.long_array[9] = 1234;
! set line 208
! mi_execute_to "exec-step 7" "end-stepping-range" do_children_tests {} {.*var-cmd.c} $line {} "step $line"
  
  # Test: c_variable-5.8
  # Desc: check that long_array[3-9] changed
--- 887,901 ----
  #    struct_declarations.long_array[7] = 8901;
  #    weird->long_array[8] = 9012;
  #    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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.8
  # Desc: check that long_array[3-9] changed
***************
*** 835,842 ****
  
  
  # Step over "weird->func_ptr = nothing;"
! set line 211
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.9
  # Desc: check that func_ptr changed
--- 905,919 ----
  
  
  # 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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.9
  # Desc: check that func_ptr changed
***************
*** 856,863 ****
  # Step over all lines:
  # ...
  #   psnp = &snp0;
! set line 254
! mi_execute_to "exec-step 43" "end-stepping-range" do_children_tests {} {.*var-cmd.c} $line {} "step $line"
  
  # Test: c_variable-5.10
  # Desc: create psnp->char_ptr
--- 933,947 ----
  # Step over all lines:
  # ...
  #   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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.10
  # Desc: create psnp->char_ptr
***************
*** 1127,1134 ****
  	"get children of psnp->ptrs.0.next.next.ptrs"
  
  #  Step over "snp0.char_ptr = &b3;"
! set line 255
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.47
  # Desc: check that psnp->char_ptr (and [0].char_ptr) changed
--- 1211,1225 ----
  	"get children of psnp->ptrs.0.next.next.ptrs"
  
  #  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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.47
  # Desc: check that psnp->char_ptr (and [0].char_ptr) changed
***************
*** 1137,1144 ****
  	"update all vars psnp->char_ptr (and 0.char_ptr) changed"
  
  #  Step over "snp1.char_ptr = &c3;"
! set line 256
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.48
  # Desc: check that psnp->next->char_ptr (and [1].char_ptr) changed
--- 1228,1243 ----
  	"update all vars psnp->char_ptr (and 0.char_ptr) changed"
  
  #  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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
! 
  
  # Test: c_variable-5.48
  # Desc: check that psnp->next->char_ptr (and [1].char_ptr) changed
***************
*** 1148,1155 ****
  
  
  #  Step over "snp2.char_ptr = &a3;"
! set line 257
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.49
  # Desc: check that psnp->next->next->char_ptr (and [2].char_ptr) changed
--- 1247,1262 ----
  
  
  #  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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
! 
  
  # Test: c_variable-5.49
  # Desc: check that psnp->next->next->char_ptr (and [2].char_ptr) changed
***************
*** 1159,1166 ****
  
  
  #  Step over "snp0.long_ptr = &y3;"
! set line 258
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.50
  # Desc: check that psnp->long_ptr (and [0].long_ptr) changed
--- 1266,1280 ----
  
  
  #  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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
  
  # Test: c_variable-5.50
  # Desc: check that psnp->long_ptr (and [0].long_ptr) changed
***************
*** 1170,1177 ****
  
  
  #  Step over "snp1.long_ptr = &x3;"
! set line 259
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.51
  # Desc: check that psnp->next->long_ptr (and [1].long_ptr) changed
--- 1284,1299 ----
  
  
  #  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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
! 
  
  # Test: c_variable-5.51
  # Desc: check that psnp->next->long_ptr (and [1].long_ptr) changed
***************
*** 1187,1194 ****
  #
  
  #  Step over "snp2.long_ptr = &z3;"
! set line 260
! mi_step_to do_children_tests {} {.*var-cmd.c} $line "step $line"
  
  # Test: c_variable-5.52
  # Desc: check that psnp->next->next->long_ptr (and [2].long_ptr) changed
--- 1309,1324 ----
  #
  
  #  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 {
! 	fail "step at do_children_tests (timeout)"
!     }
! }
! 
  
  # Test: c_variable-5.52
  # Desc: check that psnp->next->next->long_ptr (and [2].long_ptr) changed
*** mi1-var-cmd.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-var-cmd.exp	Tue Mar  5 14:48:17 2002
***************
*** 1,4 ****
! #   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
  #
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,4 ----
! #   Copyright (C) 1999, 2000, 2002 Cygnus Solutions
  #
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 24,30 ****
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 24,30 ----
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
***************
*** 227,233 ****
  #  lsimple.unsigned_integer = 255;
  #  lsimple.character = 'a';
  
! mi_execute_to "exec-step 9" "end-stepping-range" "do_locals_tests" "" \
  	"var-cmd.c" "119" "" "step at do_locals_tests (5)"
  
  # Test: c_variable-2.6
--- 227,233 ----
  #  lsimple.unsigned_integer = 255;
  #  lsimple.character = 'a';
  
! mi_run_to "exec-step 9" "end-stepping-range" "do_locals_tests" "" \
  	"var-cmd.c" "119" "" "step at do_locals_tests (5)"
  
  # Test: c_variable-2.6
***************
*** 243,249 ****
  #  lpsimple = &lsimple;
  #  func = nothing;
  
! mi_execute_to "exec-step 4" "end-stepping-range" "do_locals_tests" "" \
  	"var-cmd.c" "125" "" "step at do_locals_tests (6)"
  
  # Test: c_variable-2.7
--- 243,249 ----
  #  lpsimple = &lsimple;
  #  func = nothing;
  
! mi_run_to "exec-step 4" "end-stepping-range" "do_locals_tests" "" \
  	"var-cmd.c" "125" "" "step at do_locals_tests (6)"
  
  # Test: c_variable-2.7
***************
*** 262,268 ****
  #  lsimple.unsigned_integer = 4321;
  #  lsimple.character = 'b';
  
! mi_execute_to "exec-step 8" "end-stepping-range" "do_locals_tests" "" \
  	"var-cmd.c" "133" "" "step at do_locals_tests (7)"
  
  # Test: c_variable-2.8
--- 262,268 ----
  #  lsimple.unsigned_integer = 4321;
  #  lsimple.character = 'b';
  
! mi_run_to "exec-step 8" "end-stepping-range" "do_locals_tests" "" \
  	"var-cmd.c" "133" "" "step at do_locals_tests (7)"
  
  # Test: c_variable-2.8
***************
*** 518,552 ****
  mi_gdb_test "-var-delete l" \
  	"\\^done,ndeleted=\"1\"" \
  	"delete var l"
- 
- # Test whether we can follow the name of a variable through multiple
- # stack frames.
- mi_gdb_test "-break-insert do_special_tests" \
-   {\^done,bkpt=.*} \
-   "set breakpoint at do_special_tests"
- 
- mi_continue_to {.*} do_special_tests {.*} {.*var-cmd.c} {.*} {stop in do_special_tests}
- 
- mi_gdb_test "-var-create selected_a @ a" \
-   {\^done,name="selected_a",numchild="0",type="int"} \
-   "create selected_a"
- 
- mi_gdb_test "-break-insert incr_a" \
-   {\^done,bkpt=.*} \
-   "set breakpoint at incr_a"
- 
- mi_continue_to {.*} incr_a {.*} {.*var-cmd.c} {.*} {stop in incr_a}
- 
- mi_gdb_test "-var-update selected_a" \
-   {\^done,changelist=\{name="selected_a",in_scope="true",new_type="char",new_num_children="0"\}} \
-   "update selected_a in incr_a"
- 
- mi_next "step a line in incr_a"
- mi_next "return from incr_a to do_special_tests"
- 
- mi_gdb_test "-var-update selected_a" \
-   {\^done,changelist=\{name="selected_a",in_scope="true",new_type="int",new_num_children="0"\}} \
-   "update selected_a in do_special_tests"
  
  mi_gdb_exit
  return 0
--- 518,523 ----
*** mi1-var-display.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-var-display.exp	Wed Dec 19 17:57:46 2001
***************
*** 1,4 ****
! #   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
  #
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,4 ----
! #   Copyright (C) 1999 2000 Cygnus Solutions
  #
  # This Program Is Free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 24,30 ****
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 24,30 ----
  
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {
*** mi1-watch.exp	Tue Oct  1 12:01:37 2002
--- /home/scratch/53/gdb/src/gdb/testsuite/gdb.mi/mi-watch.exp	Sat Aug 18 21:23:43 2001
***************
*** 29,35 ****
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi1"
  
  gdb_exit
  if [mi_gdb_start] {
--- 29,35 ----
  #
  
  load_lib mi-support.exp
! set MIFLAGS "-i=mi"
  
  gdb_exit
  if [mi_gdb_start] {