[gdb/testsuite] Fix clean_restart <absolute filename> in gdb.arch/i386*.exp

Fix clean_restart <absolute filename> in gdb.arch/i386*.exp.

Tested on x86_64-linux, with target board unix/-m32 and gcc 15.

The only unsupported test-case is gdb.arch/i386-avx512.exp, which isn't
changed by this commit.

diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp
index 8f07a3d4bea10b59b6862b0a7ffb742f77f24fd5..ba41a8c2071b4fb4a62fde8473e4cdd50106cde8 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-avx.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx.exp
@@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
     return
 }
 
-clean_restart ${binfile}
+clean_restart ${::testfile}
 
 if {![runto_main]} {
     return 0
@@ -93,7 +93,7 @@ with_test_prefix "force-disable xml descriptions" {
 
        save_vars { GDBFLAGS } {
            append GDBFLAGS " -ex \"set remote target-features-packet off\""
-           clean_restart ${binfile}
+           clean_restart ${::testfile}
        }
 
        if {![runto_main]} {

diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index 1d3713f65f10ac09c54bf5d2081d73fe5caa02d1..6eb9ee61deb5ed77b882791806cf3560431fb565 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 }
 
 
-clean_restart $binfile
+clean_restart $::testfile
 
 #
 # Run to `main' where we begin our tests.

diff --git a/gdb/testsuite/gdb.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp
index dcbcb40d7872f6fac8bd297ec2fee8d9bbad6703..1eff9774ae421b883e0eff9ead1118ae350156bc 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-byte.exp
+++ b/gdb/testsuite/gdb.arch/i386-byte.exp
@@ -28,7 +28,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
     return
 }
 
-clean_restart ${binfile}
+clean_restart ${::testfile}
 
 if {![runto_main]} {
     return 0

diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index 4fe260887f76398028c9f02c68e7c4445814161f..11b477378d4e1a611c84a9c48a470fb451d742ed 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -23,7 +23,7 @@ require {is_any_target "i?86-*-*" "x86_64-*-*"}
 
 standard_testfile
 
-if [prepare_for_testing "failed to prepare" ${binfile} ${srcfile} {debug $additional_flags}] {
+if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug $additional_flags}] {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index b51f034540968ff3c8b62c5688a5da140aa2f0cb..c446faec77782e1e8010ccad3613175307d74ca5 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -40,7 +40,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfilec} ${srcdir}/${subdir}/${srcfile
 
 # Get things started.
 
-clean_restart $binfile
+clean_restart $::testfile
 
 # We should stop in abort(3).
 

diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
index b979d6ebca80d539a5e30871d832c2603097a837..1118cb45ce4eab46168bc2d01ee182659cc99080 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp
+++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
     return -1
 }
 
-clean_restart ${binfile}
+clean_restart ${::testfile}
 
 gdb_test "break -q main" "" "first permanent break"
 gdb_test "break -q main" "" "second permanent break"

diff --git a/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp b/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp
index 06285ce8521da5c774130abf0217006457fa4bf8..b289b8482774cabe411356402c83fe3547f8a7b7 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue-skip-cf-protection.exp
@@ -58,7 +58,7 @@ with_test_prefix "skip-cf-protection" {
        return
     }
 
-    clean_restart ${binfile}
+    clean_restart ${::testfile}
 
     test_run
 }

diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 72246f45751708b8e014af87efa5351af7286886..bfab6d1c167c94ad3ef3525f92284c314ce35134 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -53,7 +53,7 @@ proc skip_breakpoint { msg } {
 }
 
 
-clean_restart $binfile
+clean_restart $::testfile
 
 #
 # Run to `main' where we begin our tests.

diff --git a/gdb/testsuite/gdb.arch/i386-signal.exp b/gdb/testsuite/gdb.arch/i386-signal.exp
index 30f212b64013631bad9cefa5ddf858200e8ebd1d..80d1827b95b1112b043c66c9b1f6878f936daee2 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-signal.exp
+++ b/gdb/testsuite/gdb.arch/i386-signal.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $::testfile
 
 runto func
 gdb_test "backtrace 10" \

diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
index ca8383d21ef92576c6a9c2d715c2a5d46a2b6fa4..db8867325e2b4e4d71ea75f2f430a6de795aecab 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-size-overlap.exp
+++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $::testfile
 
 # We use gdb_run_cmd so this stands a chance to work for remote
 # targets too.

diff --git a/gdb/testsuite/gdb.arch/i386-size.exp b/gdb/testsuite/gdb.arch/i386-size.exp
index b08182f7e94ee8c398a46a60bd9dd117c276b817..997e6290f67b8299f60fccc5f452cdac3907fd99 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-size.exp
+++ b/gdb/testsuite/gdb.arch/i386-size.exp
@@ -35,7 +35,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $::testfile
 
 # We use gdb_run_cmd so this stands a chance to work for remote
 # targets too.

diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
index f0aa5ec53392578faff12aba73d7093ad8d52619..154f5ea53cdac4f23df6c4e38563029e7693453e 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse.exp
@@ -40,7 +40,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
     return
 }
 
-clean_restart ${binfile}
+clean_restart ${::testfile}
 
 if {![runto_main]} {
     return 0

diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
index 99acfe9dd691c746914cb4a2334121e54b5853d5..76f0a78d3268d89129cb0efe4b1d96f178a84d6f 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ b/gdb/testsuite/gdb.arch/i386-unwind.exp
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
     return -1
 }
 
-clean_restart $binfile
+clean_restart $::testfile
 
 # Testcase for backtrace/1435.
 

diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp
index 0da49c0f543ea7a223cb03c2435064e47d1fb4a7..ed02d279a82c2f402fd38426227e9a27f2703e68 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-word.exp
+++ b/gdb/testsuite/gdb.arch/i386-word.exp
@@ -28,7 +28,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
     return
 }
 
-clean_restart ${binfile}
+clean_restart ${::testfile}
 
 if {![runto_main]} {
     return 0