[gdb/testsuite] Fix clean_restart <absolute filename> in gdb.server

Fix clean_restart <absolute filename> in the test-cases in gdb.server.

Tested on x86_64-linux.

diff --git a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp b/gdb/testsuite/gdb.server/bkpt-other-inferior.exp
index 893bd7208af0a8205fe76dc83becadaad74ae487..453be1455b6f956d6325539d97a3fab00480c027 100644 (file)
--- a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp
+++ b/gdb/testsuite/gdb.server/bkpt-other-inferior.exp
@@ -23,7 +23,7 @@ standard_testfile server.c
 
 require allow_gdbserver_tests
 
-if { [prepare_for_testing "failed to prepare" ${binfile} "${srcfile}" \
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
          {debug pthreads}] } {
     return
 }

diff --git a/gdb/testsuite/gdb.server/connect-stopped-target.exp b/gdb/testsuite/gdb.server/connect-stopped-target.exp
index 021f063913db7ba27c2df5add87bf1d77b4bbd2d..603782c9888320e72230e85ff6adcdae893d9d16 100644 (file)
--- a/gdb/testsuite/gdb.server/connect-stopped-target.exp
+++ b/gdb/testsuite/gdb.server/connect-stopped-target.exp
@@ -34,7 +34,7 @@ proc do_test {nonstop} {
     global gdb_prompt
     global hex
 
-    clean_restart $binfile
+    clean_restart $::testfile
 
     # Make sure we're disconnected, in case we're testing with an
     # extended-remote board, therefore already connected.

diff --git a/gdb/testsuite/gdb.server/connect-without-multi-process.exp b/gdb/testsuite/gdb.server/connect-without-multi-process.exp
index 1a7246c99693ab002d78f826bfded1fab106ebaf..f47e57e584a27482ba3bac7b1e6b01927a0f69d2 100644 (file)
--- a/gdb/testsuite/gdb.server/connect-without-multi-process.exp
+++ b/gdb/testsuite/gdb.server/connect-without-multi-process.exp
@@ -38,7 +38,7 @@ proc do_test {multiprocess} {
            set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
        }
 
-       clean_restart $binfile
+       clean_restart $::testfile
     }
 
     # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/exit-multiple-threads.exp b/gdb/testsuite/gdb.server/exit-multiple-threads.exp
index 73e4c32c3b2ad6d12e49e27555ef758e416c819e..aae7842bb616c5e4f0f0051d15a0421e9060ed43 100644 (file)
--- a/gdb/testsuite/gdb.server/exit-multiple-threads.exp
+++ b/gdb/testsuite/gdb.server/exit-multiple-threads.exp
@@ -45,7 +45,8 @@ proc prepare_for_test { executable target_executable disable_multi_process } {
            set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
        }
 
-       clean_restart ${executable}
+       clean_restart
+       gdb_load $executable
     }
 
     # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp
index bda3ae9b6c32d42f439f9713d4f998c0774615be..6af2ede928b5f0e23474560989e66cbdf30b46f7 100644 (file)
--- a/gdb/testsuite/gdb.server/ext-attach.exp
+++ b/gdb/testsuite/gdb.server/ext-attach.exp
@@ -45,7 +45,7 @@ proc run_test { target_async target_non_stop to_disable } {
            set ::GDBFLAGS "$::GDBFLAGS -ex \"set sysroot\""
        }
 
-       clean_restart $::binfile
+       clean_restart $::testfile
     }
 
     # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp
index 2286454f34a154c12c64f5e9465c4223866b71bc..f4ff546c393220536b50bf895a831ae6ad2592ff 100644 (file)
--- a/gdb/testsuite/gdb.server/ext-run.exp
+++ b/gdb/testsuite/gdb.server/ext-run.exp
@@ -37,7 +37,7 @@ save_vars { GDBFLAGS } {
        set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
-    clean_restart $binfile
+    clean_restart $::testfile
 }
 
 # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp
index df722a1722acd1029828dcc7c20f7cf4e0cfd687..b3c8c72f02fb40f5dec26a5a476d40011d58f8ad 100644 (file)
--- a/gdb/testsuite/gdb.server/extended-remote-restart.exp
+++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp
@@ -58,7 +58,7 @@ proc test_reload { do_kill_p follow_child_p } {
     global decimal
     global binfile
 
-    clean_restart ${binfile}
+    clean_restart ${::testfile}
 
     if {![runto_main]} {
        return 0

diff --git a/gdb/testsuite/gdb.server/monitor-exit-quit.exp b/gdb/testsuite/gdb.server/monitor-exit-quit.exp
index ce63560d1708e6f44ef3b09d1f7ff534f20e9049..f308c0fedda3126c9a1322df5214df73175894fb 100644 (file)
--- a/gdb/testsuite/gdb.server/monitor-exit-quit.exp
+++ b/gdb/testsuite/gdb.server/monitor-exit-quit.exp
@@ -34,7 +34,7 @@ save_vars { GDBFLAGS } {
        set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
-    clean_restart $binfile
+    clean_restart $::testfile
 }
 
 # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/server-kill.exp b/gdb/testsuite/gdb.server/server-kill.exp
index 0a759ae45948c6f19553ecc1f0052a23ac130b4b..a9fcabb08ce89c595edc071856d6c0da9b090935 100644 (file)
--- a/gdb/testsuite/gdb.server/server-kill.exp
+++ b/gdb/testsuite/gdb.server/server-kill.exp
@@ -43,7 +43,7 @@ proc prepare {} {
            set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
        }
 
-       clean_restart $binfile
+       clean_restart $::testfile
     }
 
     # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/server-pipe.exp b/gdb/testsuite/gdb.server/server-pipe.exp
index d786946f8ed6ad235553c9bb005b435dff4883bd..20ca0b0e1dc22cf5a65907b5583f7e4451d50076 100644 (file)
--- a/gdb/testsuite/gdb.server/server-pipe.exp
+++ b/gdb/testsuite/gdb.server/server-pipe.exp
@@ -50,7 +50,7 @@ if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
 # the contents of the gdb.TargetConnection.details string.
 proc do_test { target } {
     global timeout
-    clean_restart ${::binfile}
+    clean_restart ${::testfile}
 
     # Make sure we're disconnected, in case we're testing with an
     # extended-remote board, therefore already connected.

diff --git a/gdb/testsuite/gdb.server/server-run.exp b/gdb/testsuite/gdb.server/server-run.exp
index 6c9db98f6964e64206937600b47e76f9ead1d45d..53b32785dedfe41fab1e237a1ffd1022fa3c51f0 100644 (file)
--- a/gdb/testsuite/gdb.server/server-run.exp
+++ b/gdb/testsuite/gdb.server/server-run.exp
@@ -34,7 +34,7 @@ save_vars { GDBFLAGS } {
        set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
-    clean_restart $binfile
+    clean_restart $::testfile
 }
 
 # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp
index 42608c45bb362b828eb288f5febe1170d1bd7801..9ae00922d670b497d48a1329907e95d79c898df7 100644 (file)
--- a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp
+++ b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp
@@ -54,7 +54,7 @@ proc run_test { target_non_stop disable_feature } {
            set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
        }
 
-       clean_restart ${binfile}
+       clean_restart ${::testfile}
     }
 
     # Make sure we're disconnected, in case we're testing with an

diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp b/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
index 38402e81e666a8f8fca017aba6007a1fcfd0c0e0..b111dd942a745007f55176d3a25972d99643d8c3 100644 (file)
--- a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
+++ b/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
@@ -42,7 +42,7 @@ proc run_test { disable_feature target_nonstop } {
            set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
        }
 
-       clean_restart ${binfile}
+       clean_restart ${::testfile}
     }
 
     # Make sure we're disconnected, in case we're testing with an