[gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 3

Fix fallout in gdb.base from erroring out on clean_restart
<absolute filename>.

Tested on x86_64-linux.

6 files changed, 16 insertions, 9 deletions

diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 04d8c55..038c3ea 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -78,7 +78,8 @@ gdb_test_multiple $test $test {
 }
 
 set interp_system [section_get [standard_output_file $binfile_test] .interp]
-clean_restart $interp_system
+clean_restart
+gdb_load $interp_system
 set dl_main_found 0
 gdb_test_multiple "info addr dl_main" "" {
     -re -wrap "Symbol \"dl_main\" is a function at address $hex\\." {
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
index 27bd042..cd49df1 100644
--- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
@@ -41,7 +41,8 @@ if { [gdb_compile $objfile $exec1 executable {debug text_segment=0x1000000}] !=
 # First check whether the address of "main" in exec1 is readable in
 # exec2.  If it is, then skip the test as unsupported.
 
-clean_restart ${exec1}
+clean_restart
+gdb_load $exec1
 if {![runto_main]} {
     return -1
 }
@@ -55,7 +56,8 @@ gdb_test_multiple "p/x &main" $test {
     }
 }
 
-clean_restart ${exec2}
+clean_restart
+gdb_load $exec2
 if {![runto_main]} {
     return -1
 }
@@ -84,7 +86,8 @@ proc test { always_inserted } {
     global exec1
     global gdb_prompt
 
-    clean_restart ${exec1}
+    clean_restart
+    gdb_load $exec1
 
     gdb_test_no_output "set breakpoint always-inserted $always_inserted"
 
diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp
index 4462ab4..cd844ca 100644
--- a/gdb/testsuite/gdb.base/jit-reader.exp
+++ b/gdb/testsuite/gdb.base/jit-reader.exp
@@ -102,7 +102,8 @@ proc jit_reader_test {} {
 
     set any "\[^\r\n\]*"
 
-    clean_restart $jit_host_bin
+    clean_restart
+    gdb_load $jit_host_bin
     gdb_load_shlib $jit_reader_bin
 
     if {$test_verbose > 0} {
diff --git a/gdb/testsuite/gdb.base/large-frame.exp b/gdb/testsuite/gdb.base/large-frame.exp
index 0418b5b..f0d7af6 100644
--- a/gdb/testsuite/gdb.base/large-frame.exp
+++ b/gdb/testsuite/gdb.base/large-frame.exp
@@ -28,12 +28,12 @@ if { [is_remote host] } {
 # the test.
 
 proc run_test { opt_level } {
-    global srcfile srcfile2 binfile hex
+    global srcfile srcfile2 hex
 
     standard_testfile large-frame-1.c large-frame-2.c
 
     if {[prepare_for_testing_full "failed to prepare" \
-	     [list ${binfile}-${opt_level} debug \
+	     [list $::testfile-$opt_level debug \
 		  $srcfile [list debug] \
 		  $srcfile2 [list nodebug optimize=-$opt_level]]]} {
 	return
diff --git a/gdb/testsuite/gdb.base/msym-bp-shl.exp b/gdb/testsuite/gdb.base/msym-bp-shl.exp
index b154ce6..41dc818 100644
--- a/gdb/testsuite/gdb.base/msym-bp-shl.exp
+++ b/gdb/testsuite/gdb.base/msym-bp-shl.exp
@@ -55,7 +55,8 @@ proc test {debug} {
 	return
     }
 
-    clean_restart $bin
+    clean_restart
+    gdb_load $bin
     gdb_load_shlib $lib
 
     # Should find two locations: the static foo in the
diff --git a/gdb/testsuite/gdb.base/reset-catchpoint-cond.exp b/gdb/testsuite/gdb.base/reset-catchpoint-cond.exp
index 062dc63..852576a 100644
--- a/gdb/testsuite/gdb.base/reset-catchpoint-cond.exp
+++ b/gdb/testsuite/gdb.base/reset-catchpoint-cond.exp
@@ -75,7 +75,8 @@ proc run_test { mode } {
 	return
     }
 
-    clean_restart $exec_name
+    clean_restart
+    gdb_load $exec_name
     gdb_load_shlib $::libfile
 
     if {![runto_main]} {