From: Tom de Vries <tdevries@suse.de>
Date: Wed, 3 Sep 2025 14:21:18 +0000 (+0200)
Subject: [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.guile
X-Git-Tag: gdb-17-branchpoint~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09458c89ba1894f37db4f6b28611aff65ff2d834;p=thirdparty%2Fbinutils-gdb.git

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

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

Tested on x86_64-linux.
---

diff --git a/gdb/testsuite/gdb.guile/scm-pretty-print.exp b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
index 09717a971c6..b95c0cb5878 100644
--- a/gdb/testsuite/gdb.guile/scm-pretty-print.exp
+++ b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
@@ -33,7 +33,8 @@ proc run_lang_tests {exefile lang} {
 	set nl "\[\r\n\]+"
 
 	# Start with a fresh gdb.
-	clean_restart $exefile
+	clean_restart
+	gdb_load $exefile
 
 	if ![gdb_guile_runto_main] {
 	    return
@@ -114,7 +115,7 @@ run_lang_tests "${binfile}-cxx" "c++"
 
 # Run various other tests.
 
-clean_restart $binfile
+clean_restart $::testfile
 
 if ![gdb_guile_runto_main] {
     return
diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp
index b6ebffd0582..96bd56089ba 100644
--- a/gdb/testsuite/gdb.guile/scm-symbol.exp
+++ b/gdb/testsuite/gdb.guile/scm-symbol.exp
@@ -141,7 +141,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "
     return -1
 }
 
-clean_restart ${binfile}-cxx
+clean_restart ${::testfile}-cxx
 
 if ![gdb_guile_runto_main] {
     return
diff --git a/gdb/testsuite/gdb.guile/scm-type.exp b/gdb/testsuite/gdb.guile/scm-type.exp
index 1167dd13fe4..640dd5b2c04 100644
--- a/gdb/testsuite/gdb.guile/scm-type.exp
+++ b/gdb/testsuite/gdb.guile/scm-type.exp
@@ -38,7 +38,8 @@ proc build_inferior {exefile lang} {
 proc restart_gdb {exefile} {
     global srcdir subdir
 
-    clean_restart $exefile
+    clean_restart
+    gdb_load $exefile
 
     if { ![allow_guile_tests] } {
 	return 0
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index 1567b1375ee..d723aebc786 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -309,7 +309,8 @@ proc test_value_after_death {} {
 
 proc test_subscript_regression {exefile lang} {
     # Start with a fresh gdb.
-    clean_restart ${exefile}
+    clean_restart
+    gdb_load ${exefile}
 
     if ![gdb_guile_runto_main ] {
 	return
@@ -427,7 +428,7 @@ if { [build_inferior "${binfile}" "c"] < 0 } {
 }
 
 # Start with a fresh gdb.
-clean_restart ${binfile}
+clean_restart ${::testfile}
 
 gdb_install_guile_utils
 gdb_install_guile_module