[gdb/testsuite] Fix mi_clean_restart <absolute filename> in gdb.mi

Fix mi_clean_restart <absolute filename> in the test-cases in gdb.mi.

Tested on x86_64-linux.

Also tested test-case gdb.mi/mi-dprintf.exp with target boards
native-gdbserver and native-extended-gdbserver.

Since test-case gdb.mi/mi-regs.exp requires istarget "sparc-*-*", I didn't
test the trivial change in that test-case.

diff --git a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
index 3fd9b81460fdcd2acfa3fbdd3634bafe1e8dfe28..05656817b99b71f374e904d8d155166e00844f98 100644 (file)
--- a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
+++ b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
@@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $objsfile object {}] != ""
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 
@@ -54,7 +54,7 @@ if [mi_runto func_nofb_marker] {
 }
 
 # GDB could have crashed.
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/gdb2549.exp b/gdb/testsuite/gdb.mi/gdb2549.exp
index 796c1faafb963f06cc009eed95602b3d3b9606c0..5aabc3b1f697cef2b868f7f26747e5fbd2d448c0 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb2549.exp
+++ b/gdb/testsuite/gdb.mi/gdb2549.exp
@@ -94,7 +94,7 @@ proc register_tests { } {
     register_test 666 t $binary
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 register_tests_no_exec
 

diff --git a/gdb/testsuite/gdb.mi/gdb669.exp b/gdb/testsuite/gdb.mi/gdb669.exp
index 086d3c1a344aee30ca099c6f09eb8859a2ad533c..da1db6403461be4978944e28f17d09f1281a1af2 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb669.exp
+++ b/gdb/testsuite/gdb.mi/gdb669.exp
@@ -30,7 +30,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 check_mi_and_console_threads "at main"
 

diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
index 587481c414a7383d94c31254200cda76284baf68..9ef6fb7a6c33e5b6e4c40238b7322fbac1f2c61e 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ b/gdb/testsuite/gdb.mi/gdb701.exp
@@ -35,7 +35,7 @@ if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
 # If it doesn't, Bad Things Happen(TM).
 
 # Run to main
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 
 # Step over "foo = 0"

diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index f894eea7d9a39c4428091569d45f91da79cb60b2..64f218a2feb3a3d7ed6741501f94ce77f2e2c1f6 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -28,7 +28,7 @@ if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""
   return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 mi_runto_main
 

diff --git a/gdb/testsuite/gdb.mi/interrupt-thread-group.exp b/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
index 869fb1cb287161ead05ab1b084197c3d2df689fc..5f9e49eceda4dd73ae8a33c1161f5936466f3a89 100644 (file)
--- a/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
+++ b/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
@@ -30,7 +30,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\" -ex \"set mi-async\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_detect_async

diff --git a/gdb/testsuite/gdb.mi/mi-add-inferior.exp b/gdb/testsuite/gdb.mi/mi-add-inferior.exp
index d110e6840e1940484861b5e87100a4b311828dd5..8c4926fcf15e068831aefaa6965a6ce220dd8d70 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-add-inferior.exp
+++ b/gdb/testsuite/gdb.mi/mi-add-inferior.exp
@@ -26,7 +26,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
     return -1
 }
 
-mi_clean_restart ${binfile}
+mi_clean_restart ${::testfile}
 
 # Start execution to establish a connection.
 mi_runto_main

diff --git a/gdb/testsuite/gdb.mi/mi-async-run.exp b/gdb/testsuite/gdb.mi/mi-async-run.exp
index 83528037336637c37a13eec37745c8d51f411a75..3df8769dfa0febecd3358d56ff2a0ae17cf3e02c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-async-run.exp
+++ b/gdb/testsuite/gdb.mi/mi-async-run.exp
@@ -35,7 +35,7 @@ proc test_async_run {} {
 
        set GDBFLAGS [concat $GDBFLAGS " -ex \"set mi-async on\""]
 
-       if {[mi_clean_restart $binfile]} {
+       if {[mi_clean_restart $::testfile]} {
            return
        }
 

diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-async.exp
index 09db7f91050a01edd289f9f8970f400a51d06058..1c4e06cd3a45862edaf754dcc5acf52ae80cb8b0 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-async.exp
+++ b/gdb/testsuite/gdb.mi/mi-async.exp
@@ -42,7 +42,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 save_vars { GDBFLAGS } {
     set GDBFLAGS [concat $GDBFLAGS " -ex \"set mi-async on\""]
 
-    if {[mi_clean_restart $binfile]} {
+    if {[mi_clean_restart $::testfile]} {
        return
     }
 }

diff --git a/gdb/testsuite/gdb.mi/mi-break-qualified.exp b/gdb/testsuite/gdb.mi/mi-break-qualified.exp
index b5e5e78aa1532794b7d01fe81c13c0345787172f..9adc2d90460d3af97e3377780a08646337f4602b 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-break-qualified.exp
+++ b/gdb/testsuite/gdb.mi/mi-break-qualified.exp
@@ -93,7 +93,7 @@ proc test_break_qualified {} {
            "delete temp breakpoints"
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp
index bb982c377fca76311bb391bd79dbd05f1a0be3b0..2a212c37496eccb9a95d4ba3ca06a0b30cdb16c3 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -398,7 +398,7 @@ proc test_break {mi_mode} {
     } else {
        set start_ops ""
     }
-    if [mi_clean_restart $binfile $start_ops ] {
+    if [mi_clean_restart $::testfile $start_ops ] {
        return
     }
 

diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
index 9cb91de7c7f453e68568b76567e6a220c8fdf3c5..46561e48b79b9b1c124b4d8f96f586c677a91667 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
@@ -48,7 +48,7 @@ proc test_insert_delete_modify { } {
     global lib_sl1 lib_sl2
     global binfile
 
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 
     mi_load_shlibs $lib_sl1 $lib_sl2
 
@@ -184,7 +184,7 @@ proc test_pending_resolved { } {
        global lib_sl1 lib_sl2
        global mi_gdb_prompt
 
-       if {[mi_clean_restart $binfile]} {
+       if {[mi_clean_restart $::testfile]} {
            return
        }
        mi_load_shlibs $lib_sl1 $lib_sl2
@@ -279,7 +279,7 @@ proc test_auto_disable { } {
     global lib_sl1 lib_sl2
     global binfile
 
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 
     mi_load_shlibs $lib_sl1 $lib_sl2
 

diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp
index cbf9f57c79ad3ffeefabfc83ef40e74e04541fab..7995846771806b22b5aa70693fb608f8761f90fb 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp
@@ -56,7 +56,7 @@ proc do_test { mi_version use_fix_flag expect_fixed_output } {
            global MIFLAGS decimal binfile
            set MIFLAGS "-i=mi${mi_version}"
 
-           mi_clean_restart $binfile
+           mi_clean_restart $::testfile
 
            mi_runto_main
 

diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp
index af514e8aa399b998d1957b19d2fb754fbbd51333..ce30d4404b6f2c74a484eaafd0f931a46c854add 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp
@@ -51,7 +51,7 @@ proc do_test { mi_version use_fix_flag expect_fixed_output } {
            save_vars { ::MIFLAGS } {
                set ::MIFLAGS "-i=mi${mi_version}"
 
-               mi_clean_restart $::binfile
+               mi_clean_restart $::testfile
            }
 
            if $use_fix_flag {

diff --git a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp
index 9053b1815168ddd7b2ae7abad619013462daac10..ec023e666aa7afd06ba8ac31bc2f3bd296a74d8c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp
+++ b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp
@@ -27,7 +27,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 if {[mi_runto_main] < 0} {
     return -1
 }
@@ -46,7 +46,7 @@ proc restart_for_test {} {
     global srcdir subdir binfile srcfile
     global main_lineno
 
-    if {[mi_clean_restart $binfile]} {
+    if {[mi_clean_restart $::testfile]} {
        return
     }
 

diff --git a/gdb/testsuite/gdb.mi/mi-catch-load.exp b/gdb/testsuite/gdb.mi/mi-catch-load.exp
index a9a5fdcda684a65d30a8f4f4c05187da7c61bd3d..3c36cc908c7039cef03bfb27f46e8e1a6dc54a00 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-catch-load.exp
+++ b/gdb/testsuite/gdb.mi/mi-catch-load.exp
@@ -36,7 +36,7 @@ gdb_download_shlib $binfile2
 
 # test -catch-load
 with_test_prefix "catch-load" {
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
     mi_locate_shlib $binfile2
     mi_runto_main
 
@@ -63,7 +63,7 @@ with_test_prefix "catch-load" {
 
 # test -catch-unload
 with_test_prefix "catch-unload" {
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
     mi_locate_shlib $binfile2
     mi_runto_main
 

diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index a3ff7ebe9c66902ee5974aa25f0c263fd2c9d08f..b59a5ed3f9865214e9a2dc6f15150c1a9ba371fe 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 mi_gdb_test "-interpreter-exec" \
   {\^error,msg="-interpreter-exec: Usage: -interpreter-exec interp command"} \

diff --git a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
index 5587b762751307f759c91c57cfadfd2f740182e8..24d12c1192bb8844174e97a7513fa05cabeff779 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
@@ -31,7 +31,7 @@ proc test_command_param_changed { } {
     global binfile
 
     with_test_prefix "cmd param" {
-       mi_clean_restart $binfile
+       mi_clean_restart $::testfile
        mi_runto_main
 
        if { $scheduler_locking_supported } {

diff --git a/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp b/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp
index 806ed4c8e48d932faf8789c3e8e84075b5e31ed6..324de5ab5e8d4b31413ba168654651e2f77d2c05 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp
+++ b/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp
@@ -29,7 +29,7 @@ set main_break_line [gdb_get_line_number "main break line"]
 
 set any "\[^\r\n\]*"
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_create_breakpoint "$srcfile:$main_break_line" "set breakpoint in main"
 mi_run_cmd
 mi_expect_stop "breakpoint-hit" "main" "" $srcfile $main_break_line \

diff --git a/gdb/testsuite/gdb.mi/mi-complete.exp b/gdb/testsuite/gdb.mi/mi-complete.exp
index 22acda3d3737e0c2934da8bb7a7487b06b82882d..ad29b3f80b26662705c70be2c3c017d522d7dbe0 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-complete.exp
+++ b/gdb/testsuite/gdb.mi/mi-complete.exp
@@ -26,7 +26,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debu
      return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 # Don't run to main to avoid increasing the search scope to include
 # debug info of shared libraries like glibc, libgcc, etc.

diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp b/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp
index 02d02b2ab17c182f45f948a43639369fdc95a9ce..7708a6d15ab95bbd07a564bd38acb32883ee3550 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp
+++ b/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp
@@ -59,7 +59,7 @@ proc test { variant } {
            return -1
        }
 
-       if {[mi_clean_restart $binfile]} {
+       if {[mi_clean_restart $::testfile]} {
            return
        }
 

diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp b/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp
index 43b1e2f44f265421e5ded99708d91161cb306a8a..5bd899325407941a0b45c40629af7888e814cbdb 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp
+++ b/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp
@@ -35,7 +35,7 @@ if [build_executable ${testfile}.exp ${binfile} ${srcfile}] {
 
 proc run_test { unwind_on_signal } {
 
-    if {[mi_clean_restart $::binfile]} {
+    if {[mi_clean_restart $::testfile]} {
        return
     }
 

diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp b/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp
index 0a89a8a99bcc65ee0c1ff12c3db7faf48c8078f3..b4960a858da7de7d15f67f7d619f229ee5a35d52 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp
+++ b/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp
@@ -38,7 +38,7 @@ if [build_executable ${testfile}.exp ${binfile} ${srcfile} {debug c++}] {
 
 proc run_test { unwind_on_exception } {
 
-    if {[mi_clean_restart $::binfile]} {
+    if {[mi_clean_restart $::testfile]} {
        return
     }
 

diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index efb1ea971979c25abca84c82c41cce41a9f5c754..861ef42659790032886dd98f9397dfcc23ede2cd 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -53,7 +53,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-detach.exp b/gdb/testsuite/gdb.mi/mi-detach.exp
index ff983c1252bfb4d7fe6214f0df474035e31f79d2..b485a9bc53563118b6424f12dd64b3bd8176eed9 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-detach.exp
+++ b/gdb/testsuite/gdb.mi/mi-detach.exp
@@ -25,7 +25,7 @@ if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
      return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 
 mi_gdb_test "-target-detach" "=thread-exited,id=\"1\".*=thread-group-exited,id=\"i1\".*" "detach"

diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
index 15ead3326709a4dfd337711908dd103695176f07..90f79e384de7441eb7305a47dd079e29c7cb8952 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp
@@ -345,7 +345,7 @@ proc test_disassembly_opcode_format {} {
        "data-disassemble checking the opcodes bytes format"
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 test_disassembly_only
 test_disassembly_with_opcodes

diff --git a/gdb/testsuite/gdb.mi/mi-dlmopen.exp b/gdb/testsuite/gdb.mi/mi-dlmopen.exp
index 936027fba471e18ba260dc9c8226ba034c8ecb43..0e1d0bcd6183126d159797aded43b627bf643431 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-dlmopen.exp
+++ b/gdb/testsuite/gdb.mi/mi-dlmopen.exp
@@ -132,7 +132,7 @@ proc get_dyld_info {} {
 # number of unload events for the libraries created for this test, and
 # additionally, check for dynamic linker unload events.
 proc check_solib_unload_events {} {
-    mi_clean_restart $::binfile
+    mi_clean_restart $::testfile
 
     if {[mi_runto_main] == -1} {
        return

diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-modified.exp b/gdb/testsuite/gdb.mi/mi-dprintf-modified.exp
index c3e1bdf9180efd7de67919452afd00442aa2eec7..0584a860bf894010e905c5478f1a33ddf85f21d8 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-dprintf-modified.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf-modified.exp
@@ -52,7 +52,7 @@ if { [build_executable "build exec" $binfile $srcfile $opts] == -1} {
 set bp_line [gdb_get_line_number "Break here" $srcfile]
 
 # Start the inferior.
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 
 # Place a breakpoint at the dlopen() line.

diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
index 2df9ad46996b566265c419b3b7631a08cc79f7de..3685e420a18777b127baf03354471e6eac1cb0ab 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
@@ -39,7 +39,7 @@ if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""}
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.exp b/gdb/testsuite/gdb.mi/mi-dprintf.exp
index 5d448e42b9703737da95543bd3821f1e9fa798b6..9d0b95a24cff79b15ac63d59101c8814f53841dd 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-dprintf.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp
@@ -31,7 +31,7 @@ if {[build_executable $testfile.exp $testfile $srcfile $flags] == -1} {
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set dp_location1 [gdb_get_line_number "set dprintf 1 here"]
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 
 set i 0

diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp
index 27c27f59fd352814989c57094028482c21171d5c..2b2189582df3373235b9ae058475968933162910 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi-eval.exp
@@ -32,7 +32,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.exp b/gdb/testsuite/gdb.mi/mi-exit-code.exp
index 344d5656e1544d9c94d3a3bd6bc28325510e05b7..af2c6bd92c8b6e91db22f52d210859f3e3340a0a 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-exit-code.exp
+++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp
@@ -36,7 +36,7 @@ proc test_list_thread_groups { } {
        "122\\^done,groups=\\\[\{id=\"i1\",type=\"process\"\}\]" \
        "-list-thread-groups before run shows no exit-code"
 
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 
     with_test_prefix "first run" {
        mi_runto_main

diff --git a/gdb/testsuite/gdb.mi/mi-fill-memory.exp b/gdb/testsuite/gdb.mi/mi-fill-memory.exp
index 0afc258dccdfd6508bdab91431d81e24fe8e8c17..ab7e03a87b062fae2cc67aa0b0105ce8c7eac1e5 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-fill-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi-fill-memory.exp
@@ -27,7 +27,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}.c" "${binfile}" executable {d
      return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 mi_next_to "main" "" "mi-read-memory.c" "20" "next at main"
 

diff --git a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
index 88867023496e89b973c787a5afedf46612926d2f..48391bc18c10f4842fd8193ddf811e0aefb1b466 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
+++ b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
@@ -28,7 +28,7 @@ if {[build_executable "failed to prepare" ${testfile} \
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 mi_runto_main
 

diff --git a/gdb/testsuite/gdb.mi/mi-frame-regs.exp b/gdb/testsuite/gdb.mi/mi-frame-regs.exp
index f31e4a18620287f1f1b214bd53bc048e999686f5..990abd5bd60fdfc5b9877b169c44d7bda6a7cb54 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-frame-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi-frame-regs.exp
@@ -62,7 +62,7 @@ proc_with_prefix do_floating_varobj_test {} {
     global hex
     global expect_out
 
-    if {[mi_clean_restart $binfile]} {
+    if {[mi_clean_restart $::testfile]} {
        fail "couldn't start gdb"
        return
     }
@@ -113,7 +113,7 @@ proc_with_prefix do_fixed_varobj_test {} {
     global srcfile binfile
     global hex
 
-    if {[mi_clean_restart $binfile] != 0} {
+    if {[mi_clean_restart $::testfile] != 0} {
        fail "couldn't start gdb"
        return
     }

diff --git a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
index 130b5bff2646a38d9333c4d85b1efef0bdc8fc46..6c1dbec15feedf7fa543b90569826fab3d94a2ae 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
+++ b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
@@ -58,7 +58,7 @@ if { [gdb_compile "$srcfileabs" "${binfile}" executable {debug}] != "" } {
 
 file delete -- $srcfileabs
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-info-os.exp b/gdb/testsuite/gdb.mi/mi-info-os.exp
index 5d8d3ffa4653735692a194245f2589a60abbcb0a..c70dac6c6d6cf3d5532c4ae953b4adf46d0c675e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-info-os.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-os.exp
@@ -32,7 +32,7 @@ if [build_executable "Failed to build $testfile" $testfile $srcfile \
     return -1;
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-info-sources.exp b/gdb/testsuite/gdb.mi/mi-info-sources.exp
index f44fc29e86e767afcbd121df2c9b939ab1f86557..80ca5967fe1b1e83958d5b7b98e3ab0a74dfc8e7 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-info-sources.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-sources.exp
@@ -26,7 +26,7 @@ if {[build_executable $testfile.exp $testfile \
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 set readnow_p [mi_readnow]
 

diff --git a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
index 0ab2de27267db97310c94e5a37d5e2ec4fa821d9..3092b6922de1a0018da0bd02f4095253cfc5b02f 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
+++ b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
@@ -25,7 +25,7 @@ if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""
   return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
index 3314d5f45dd314d3a290780fad168d30a71337c6..7eeb25909f026ddc27e83262c221830bcd3623d1 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
+++ b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
@@ -29,7 +29,7 @@ if {[build_executable "failed to prepare" $exefile $srcfile {debug c++}]} {
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 # Turn off the pending breakpoint queries.
 mi_gdb_test "-interpreter-exec console \"set breakpoint pending off\"" \

diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp
index de76e02fd35b13b2a48b577661270ac5cb8f9a4a..82355913fafd66db976235f94170f1af556f8e1e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-logging.exp
+++ b/gdb/testsuite/gdb.mi/mi-logging.exp
@@ -24,7 +24,7 @@ if [build_executable $testfile.exp $testfile $srcfile $opts] {
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-memory-changed.exp b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
index bc2b6c38085231e0f0c2f98db7086d4fd74049b0..6d02c33494493df09d8d0df53963b241ea5a46b6 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-memory-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
@@ -22,7 +22,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 
 load_lib mi-support.exp
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
index 599e460f79c892d5f5228003067cfbc0f26a93bf..4729033347ac559d634257cdf6c081c7a12c74e6 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
+++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
@@ -30,7 +30,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_gdb_test "-gdb-set mi-async 1" ".*"

diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp
index b8efef7c261571f9f230eba1ada4988d8071d60d..1ba37a3333135f4f98ba2a919b9e2c3bbebf68ec 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nonstop.exp
+++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp
@@ -41,7 +41,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_gdb_test "-gdb-set mi-async 1" ".*"

diff --git a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
index 20d9e45bc725925f441341e3000c33619056da91..20936f187095f61e07611b593044127f8b726123 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
+++ b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
@@ -43,7 +43,7 @@ if {[gdb_compile "$srcdir/$subdir/$srcfile" \
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_gdb_test "-gdb-set mi-async 1" ".*"

diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
index 983c0fea03c7e52d638fbfbd5fa1a30e5508e54f..8c8aef8cd5a5cf2318d3faa38db373fffb2413c1 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
@@ -30,7 +30,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_gdb_test "-gdb-set mi-async 1" ".*"

diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
index da43a9327a1f94bcd6d119801657c1ca4a694b17..2307c2e34b9802b89123b013d777252de5526f31 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
@@ -30,7 +30,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_gdb_test "-gdb-set mi-async 1" ".*"

diff --git a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
index fd8aa54a72f2f1a26e8292b63dbf659652a08b4d..1f9d1ae2a062df39bb35c04cf12b9042f551ead8 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
@@ -35,7 +35,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_gdb_test "-gdb-set mi-async 1" ".*"

diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 49839cb0282d100bdf8e7a9e2b1762e2ba3bb6a0..eb0719cb07ef8c81ffd898c9c7ef092621a307f9 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -45,7 +45,7 @@ if { [gdb_compile_pthreads $srcdir/$subdir/$srcfile $binfile executable $exec_op
 }
 
 # Start with a fresh gdb.
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 mi_load_shlibs $lib_sl1

diff --git a/gdb/testsuite/gdb.mi/mi-pthreads.exp b/gdb/testsuite/gdb.mi/mi-pthreads.exp
index 93f03446375af7c2587721c9dd5a0ddc0831fcf4..117b2de69f3d326b5545ee3f35e971d5e649b5f7 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-pthreads.exp
+++ b/gdb/testsuite/gdb.mi/mi-pthreads.exp
@@ -63,7 +63,7 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
index 419375775b0acaf405aa0c4e8142451a69c64628..5175899203d955d8de1c8bcb91061072d726fd4d 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
+++ b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
@@ -31,7 +31,7 @@ if {[build_executable $testfile.exp $testfile $srcfile] == -1} {
 set remote_python_file [gdb_remote_download host \
                            ${srcdir}/${subdir}/${testfile}.py]
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 
 # Delete all breakpoints, watchpoints, tracepoints, and catchpoints.

diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.exp b/gdb/testsuite/gdb.mi/mi-read-memory.exp
index 8de8728e9c9d1ed8f70f7b0ae9401990a6bb1003..4469123b275fbd02d43168e26bb4d10a8ebb3302 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi-read-memory.exp
@@ -25,7 +25,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 
 mi_next_to "main" "" "mi-read-memory.c" "20" "next at main"

diff --git a/gdb/testsuite/gdb.mi/mi-record-changed.exp b/gdb/testsuite/gdb.mi/mi-record-changed.exp
index e37540b38e3d8b31a79a2568fa5a20b350bc3235..986efd921c13e4aad3626381331c061e40413e09 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-record-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-record-changed.exp
@@ -24,7 +24,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 
 load_lib mi-support.exp
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 mi_runto_main
 

diff --git a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp
index c7e0564cc7cd4ca26a9ec6ee9aec87ee55175402..ef102ceee03fc82f92ddf3dfbf15e9d356c5f1c7 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp
+++ b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp
index 0bb305b1baa82c8ed1c6ab98f16becedce806663..aae00a62047b04a818875de1ae9ccbabffd5659f 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi-regs.exp
@@ -108,7 +108,7 @@ require {istarget "sparc-*-*"}
 
 mi_clean_restart
 sparc_register_tests_no_exec
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 sparc_register_tests
 

diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
index ba296d5c44dffab3c03ab3be2a9554b807b2d2ec..998a1ffbe27804820acf268e0fb03e986a421f0e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -31,7 +31,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-reverse.exp b/gdb/testsuite/gdb.mi/mi-reverse.exp
index d03924078e2db94eaec38768aa4f97ea99a9bced..aa252553739539a7ec349afd72e47d081e8afe32 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-reverse.exp
+++ b/gdb/testsuite/gdb.mi/mi-reverse.exp
@@ -39,7 +39,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 
 if [supports_process_record] {

diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index e390f14a00c871c191193046bb5db492e210756c..5ee7881783a54f39113ba669e8543c159024f0e2 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -34,7 +34,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp
index c66d4b080ad454ddadb37d05e25583a759ff3730..8ddca8dd0e14bbf846d41b2db621c2f7168c9d0a 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-solib.exp
+++ b/gdb/testsuite/gdb.mi/mi-solib.exp
@@ -34,7 +34,7 @@ if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
   return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
index a91b76e7b040651c0ac2eabfb2c16b51815d86ab..89f58c8d83b75fa44d6b12980b490dc0fb5066f7 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi-stack.exp
@@ -32,7 +32,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-start.exp b/gdb/testsuite/gdb.mi/mi-start.exp
index 745e5c967bf2462a6ecce9e7b77e2d19d3ffaf66..d384230bf06c21eea9aefedeabbece337fdd894a 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-start.exp
+++ b/gdb/testsuite/gdb.mi/mi-start.exp
@@ -28,7 +28,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp
index 8ba639942082f716bef52161b52475eeec79dd36..7f53c8b465e395844769ab4269a666f80ce9b7e6 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepi.exp
@@ -63,7 +63,7 @@ proc test_stepi_nexti {} {
     }
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 mi_runto_main
 test_stepi_nexti
 

diff --git a/gdb/testsuite/gdb.mi/mi-stepn.exp b/gdb/testsuite/gdb.mi/mi-stepn.exp
index 489564a04721fd42c44c82ffcf43026b3981c6e4..f11e9c0882cdf6eed5b92bb4d9e9ebddfe46044a 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-stepn.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepn.exp
@@ -26,7 +26,7 @@ if [build_executable ${testfile}.exp ${testfile} ${srcfile} $opts] {
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-sym-info.exp b/gdb/testsuite/gdb.mi/mi-sym-info.exp
index ef8dd864e274595227d8a012f61f8c52e6566743..6b0bf2d6096d4384eb15c12601e90d3a3823872e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-sym-info.exp
+++ b/gdb/testsuite/gdb.mi/mi-sym-info.exp
@@ -33,7 +33,7 @@ if {[build_executable "failed to prepare" ${testfile} \
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 # Don't run to main to avoid increasing the search scope to include
 # debug info of shared libraries like libc, libgcc, etc.

diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
index 633f317bedc90cd0fd7ca0f98ac4e3b8efb6f41c..b3ec3777e1e2e311c2491f6aa8b06e12b98aebdb 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 mi_runto_main
 

diff --git a/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp b/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp
index 2a734c8090d6e8159fa60dda3d2169009aa4291b..976b68d13f4466170167258250b59717c01a10f3 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp
+++ b/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp
@@ -47,7 +47,7 @@ foreach_mi_ui_mode mode {
     save_vars { GDBFLAGS } {
        append GDBFLAGS " -ex \"maint set target-non-stop on\""
        append GDBFLAGS " -ex \"set mi-async on\""
-       mi_clean_restart $binfile $start_ops
+       mi_clean_restart $::testfile $start_ops
     }
 
     mi_runto_main

diff --git a/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp b/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
index 86d050a570bd863fe909e0e261d4171f756e3429..81ff27413418d07c287cdc525519b4d209bdca11 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
+++ b/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
@@ -90,7 +90,7 @@ foreach_mi_ui_mode mode {
        set start_ops ""
     }
 
-    if {[mi_clean_restart $binfile $start_ops]} {
+    if {[mi_clean_restart $::testfile $start_ops]} {
        break
     }
 

diff --git a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp
index ff74e7be45e9d91c483f4fa6e17f4f33623bff7d..8aab3b8389057e05937b2588b78e8c8296bffaad 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp
+++ b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp
@@ -33,7 +33,7 @@ proc test_continue_interrupt { } {
   global binfile
   global async
 
-  if {[mi_clean_restart $binfile]} {
+  if {[mi_clean_restart $::testfile]} {
       return
   }
 

diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
index ee50c4f3a4e37e26bc86df3109bdc32bf4e57c59..e8f24bc7dfe904b8e9c90b56c2b71438523df5b1 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ b/gdb/testsuite/gdb.mi/mi-until.exp
@@ -31,7 +31,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
index bdba639cff5f15771e8b5525904daa35631f199e..3914c3a8dc9c4fcb2652e2c264383566a6814305 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-block.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
index c424490032ad07ea278a6f4d69ca214651242fcf..4856e3d401f84d6c836bde4306db03080f71c1e2 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
@@ -28,7 +28,7 @@ if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index 89ce9ddc4e3c2d741729aa0ebc19b598ca0e0926..4a3ba076db7d22cd3c1ed2b1e8b6d9a698c309bb 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 8c8c30692153d04621fef5fae5417784b885c6c9..9e7b14c041d83d75625fe67fbe6f9aeb20a984e2 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-cp.exp b/gdb/testsuite/gdb.mi/mi-var-cp.exp
index c1d70f135eb87738646b56b1510e678921ba4db9..eee10078ebd2016ef7e4847e5e2cdaf41361edec 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-cp.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cp.exp
@@ -25,7 +25,7 @@ if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""
   return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
index ad6ce5ccf5e0dbe182def219ccf3601aea6829e9..517449cbe44cef6f5c984d1c0d648b38264ef3bc 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
@@ -23,7 +23,7 @@ if [build_executable $testfile.exp $testfile $srcfile $opts] {
     return -1
 }
 
-mi_clean_restart $binfile
+mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index 553536852f6d1ec69647505b83cd0f604bf60289..3ae593bf4eda1fc80878ed5d6122b07d84f3db17 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
index c1c52f2a8771380394022eb260d960d2307c03a5..800c22f2c43f7df7c0f05b412af0992bfbf745f6 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
@@ -44,7 +44,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {d
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp
index 0f20c50f238be4fd89ae79987452c6a8970b64f2..597e2e0369dc524cfcd68ad0e200eb523843c695 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp
@@ -26,7 +26,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
index fcf84049b6b8107ac43533c1f69aa6ce8e0c8a77..c2768b6b7cf38ac481fef27729244165bd7f714e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
@@ -25,7 +25,7 @@ if [build_executable $testfile.exp $testfile $srcfile $opts] {
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-vla-c99.exp b/gdb/testsuite/gdb.mi/mi-vla-c99.exp
index ec12e6fdbd1ad74c3770444e46bd37672811c7d5..5f23d059d888df0959397ef1db30d74a649ac324 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-vla-c99.exp
+++ b/gdb/testsuite/gdb.mi/mi-vla-c99.exp
@@ -29,7 +29,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" \
      return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
index 50770894938b6ed44f79729a91414be758982b21..81e2d8963ae50932e819a38f0854b956d7d48246 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
+++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
@@ -34,7 +34,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 # the type names can be printed differently.
 set real [fortran_real4]
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
index f9237c0f78c2d2a99368ed2fdb49154d1cd0dcd3..36d741038aa09fd7133672090202df21e94e4ccc 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
@@ -38,7 +38,7 @@ if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
-    mi_clean_restart $binfile
+    mi_clean_restart $::testfile
 }
 
 mi_gdb_test "-gdb-set mi-async 1" ".*"

diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp
index e318a2b3e471a782d5fd372a777358f5be41c84c..43f23786aa20aefc1d41b6c65b5d21c2e63dd870 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch.exp
@@ -155,7 +155,7 @@ proc test_watchpoint_all {mi_mode type} {
     } else {
        set start_ops ""
     }
-    if [mi_clean_restart ${binfile} $start_ops] {
+    if [mi_clean_restart ${::testfile} $start_ops] {
        return
     }
 

diff --git a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
index c7e21e9f4c842d1c41f2866e3c6c690d711e704c..0d51dc5b8677466aab96c8a29827e0cf27390e87 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
@@ -31,7 +31,7 @@ if [build_executable ${testfile}.exp ${binfile} ${srcfile} $opts] {
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi2-cli-display.exp b/gdb/testsuite/gdb.mi/mi2-cli-display.exp
index 656c93e4827a40c8753ce6434899fce07ffb4c86..993b87cb3762920abf038edb7b8dd89c1ece76b4 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-cli-display.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli-display.exp
@@ -25,7 +25,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp
index 9bd9054870841e932cf9346bb107ee5a013de917..3618d5a756c1c96e58baf499c1ae743fbd37ead6 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if {[mi_clean_restart $binfile]} {
+if {[mi_clean_restart $::testfile]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
index cb83329c5a96c7b60c683f02eb5afdd84c125557..7112248f6f2d397542e82f13f958d17d7460a00a 100644 (file)
--- a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
+++ b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
@@ -102,7 +102,7 @@ proc do_test {sync_command} {
 }
 
 foreach_with_prefix sync-command {"run" "continue"} {
-    if {[mi_clean_restart $binfile "separate-mi-tty"] != 0} {
+    if {[mi_clean_restart $::testfile "separate-mi-tty"] != 0} {
        fail "could not start gdb"
        break
     }

diff --git a/gdb/testsuite/gdb.mi/pr11022.exp b/gdb/testsuite/gdb.mi/pr11022.exp
index ad8e3b2dd4870f714014c632d06bc71d518f933b..1e01bf623f949bb5c9eb9de1bb364ea268904ed8 100644 (file)
--- a/gdb/testsuite/gdb.mi/pr11022.exp
+++ b/gdb/testsuite/gdb.mi/pr11022.exp
@@ -29,7 +29,7 @@ proc test_memory_changed_observer { mi_command } {
     with_test_prefix "${mi_command}" {
        global srcfile binfile
 
-       mi_clean_restart $binfile
+       mi_clean_restart $::testfile
        mi_runto_main
 
        set line_number [gdb_get_line_number "break here"]

diff --git a/gdb/testsuite/gdb.mi/print-simple-values.exp b/gdb/testsuite/gdb.mi/print-simple-values.exp
index 1c56d6819669556b5f3f91433ff4de0e2a82cbf6..23488e35e9e7331a85221bb75700d84e791ea33e 100644 (file)
--- a/gdb/testsuite/gdb.mi/print-simple-values.exp
+++ b/gdb/testsuite/gdb.mi/print-simple-values.exp
@@ -34,7 +34,7 @@ if [build_executable "failed to prepare" $testfile $srcfile $opts] {
     return -1
 }
 
-if [mi_clean_restart $binfile] {
+if [mi_clean_restart $::testfile] {
     return
 }
 

diff --git a/gdb/testsuite/gdb.mi/run-with-two-mi-uis.exp b/gdb/testsuite/gdb.mi/run-with-two-mi-uis.exp
index df370c98b2dd225245e5dd1bf6d745b5a0e1b6fe..c9e352df40ac83b1b224885e19a1a93b762f913b 100644 (file)
--- a/gdb/testsuite/gdb.mi/run-with-two-mi-uis.exp
+++ b/gdb/testsuite/gdb.mi/run-with-two-mi-uis.exp
@@ -29,7 +29,7 @@ if {[build_executable $testfile.exp $testfile ${srcfile} "debug"] == -1} {
 # UI_TO_RUN is the UI that should issue the run command.
 
 proc do_test { ui_to_run } {
-    if {[mi_clean_restart $::binfile "separate-mi-tty"] != 0} {
+    if {[mi_clean_restart $::testfile "separate-mi-tty"] != 0} {
        fail "could not start gdb"
        return
     }

diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index f85e108ab194d0c249e3015448c9dd0d61967bb5..a0bf11f2f2214991e0d063285d25cf3bddd4f320 100644 (file)
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -1329,7 +1329,7 @@ foreach_with_prefix mode { "all-stop" "non-stop" } {
            set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop 1\""]
        }
 
-       if { [mi_clean_restart $binfile "separate-mi-tty"] != 0 } {
+       if { [mi_clean_restart $::testfile "separate-mi-tty"] != 0 } {
            break
        }
     }