[binutils-gdb] [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.rocm

Tom de Vries vries@sourceware.org
Tue Sep 2 15:39:20 GMT 2025


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=82e897f532dd7f8d2dceb04ad00649630508c94c

commit 82e897f532dd7f8d2dceb04ad00649630508c94c
Author: Tom de Vries <tdevries@suse.de>
Date:   Tue Sep 2 17:39:11 2025 +0200

    [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.rocm
    
    Fix clean_restart <absolute filename> in the test-cases in gdb.rocm.
    
    Since these test-cases are unsupported for me, do the simple substitution:
    ...
    clean_restart $binfile
    ->
    clean_restart
    gdb_load $binfile
    ...

Diff:
---
 gdb/testsuite/gdb.rocm/code-object-load-while-breakpoint-hit.exp | 3 ++-
 gdb/testsuite/gdb.rocm/displaced-stepping.exp                    | 3 ++-
 gdb/testsuite/gdb.rocm/fork-exec-gpu-to-non-gpu.exp              | 3 ++-
 gdb/testsuite/gdb.rocm/fork-exec-non-gpu-to-gpu.exp              | 3 ++-
 gdb/testsuite/gdb.rocm/multi-inferior-gpu.exp                    | 3 ++-
 gdb/testsuite/gdb.rocm/precise-memory-exec.exp                   | 3 ++-
 gdb/testsuite/gdb.rocm/precise-memory-warning-sigsegv.exp        | 3 ++-
 gdb/testsuite/gdb.rocm/precise-memory.exp                        | 3 ++-
 gdb/testsuite/gdb.rocm/simple.exp                                | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/gdb/testsuite/gdb.rocm/code-object-load-while-breakpoint-hit.exp b/gdb/testsuite/gdb.rocm/code-object-load-while-breakpoint-hit.exp
index 3fe6a952c1d..e994884c8c9 100644
--- a/gdb/testsuite/gdb.rocm/code-object-load-while-breakpoint-hit.exp
+++ b/gdb/testsuite/gdb.rocm/code-object-load-while-breakpoint-hit.exp
@@ -53,7 +53,8 @@ if { [gdb_compile $srcdir/$subdir/$srcfile \
 
 proc do_test { } {
     with_rocm_gpu_lock {
-	clean_restart $::binfile
+	clean_restart
+	gdb_load $::binfile
 	gdb_test_no_output "set args $::hipmodule_path" "set args"
 
 	if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.rocm/displaced-stepping.exp b/gdb/testsuite/gdb.rocm/displaced-stepping.exp
index cd50fecf5b5..9e8abd4c475 100644
--- a/gdb/testsuite/gdb.rocm/displaced-stepping.exp
+++ b/gdb/testsuite/gdb.rocm/displaced-stepping.exp
@@ -28,7 +28,8 @@ if {[build_executable "failed to prepare" $testfile $srcfile {hip}]} {
 }
 
 proc do_test {} {
-    clean_restart $::binfile
+    clean_restart
+    gdb_load $::binfile
 
     with_rocm_gpu_lock {
 	if ![runto_main] {
diff --git a/gdb/testsuite/gdb.rocm/fork-exec-gpu-to-non-gpu.exp b/gdb/testsuite/gdb.rocm/fork-exec-gpu-to-non-gpu.exp
index 22d4b75caa0..dfd109231f5 100644
--- a/gdb/testsuite/gdb.rocm/fork-exec-gpu-to-non-gpu.exp
+++ b/gdb/testsuite/gdb.rocm/fork-exec-gpu-to-non-gpu.exp
@@ -54,7 +54,8 @@ proc do_test { detach-on-fork follow-fork-mode fork_func } {
     }
 
     with_rocm_gpu_lock {
-	clean_restart ${::binfile}-execer-${fork_func}
+	clean_restart
+	gdb_load ${::binfile}-execer-${fork_func}
 
 	gdb_test_no_output "set detach-on-fork ${detach-on-fork}"
 	gdb_test_no_output "set follow-fork-mode ${follow-fork-mode}"
diff --git a/gdb/testsuite/gdb.rocm/fork-exec-non-gpu-to-gpu.exp b/gdb/testsuite/gdb.rocm/fork-exec-non-gpu-to-gpu.exp
index 13860993bde..b14e2c77502 100644
--- a/gdb/testsuite/gdb.rocm/fork-exec-non-gpu-to-gpu.exp
+++ b/gdb/testsuite/gdb.rocm/fork-exec-non-gpu-to-gpu.exp
@@ -53,7 +53,8 @@ proc do_test { detach-on-fork follow-fork-mode fork_func } {
     }
 
     with_rocm_gpu_lock {
-	clean_restart ${::binfile}-execer-${fork_func}
+	clean_restart
+	gdb_load ${::binfile}-execer-${fork_func}
 
 	gdb_test_no_output "set detach-on-fork ${detach-on-fork}"
 	gdb_test_no_output "set follow-fork-mode ${follow-fork-mode}"
diff --git a/gdb/testsuite/gdb.rocm/multi-inferior-gpu.exp b/gdb/testsuite/gdb.rocm/multi-inferior-gpu.exp
index 4f554320a52..0ed11e82a32 100644
--- a/gdb/testsuite/gdb.rocm/multi-inferior-gpu.exp
+++ b/gdb/testsuite/gdb.rocm/multi-inferior-gpu.exp
@@ -28,7 +28,8 @@ if {[build_executable "failed to prepare" $testfile $srcfile {debug hip}]} {
 }
 
 proc do_test {} {
-    clean_restart $::binfile
+    clean_restart
+    gdb_load $::binfile
     gdb_test_no_output "set non-stop on"
     gdb_test_no_output "set detach-on-fork off"
     gdb_test_no_output "set follow-fork parent"
diff --git a/gdb/testsuite/gdb.rocm/precise-memory-exec.exp b/gdb/testsuite/gdb.rocm/precise-memory-exec.exp
index 506488ca506..76be07816f8 100644
--- a/gdb/testsuite/gdb.rocm/precise-memory-exec.exp
+++ b/gdb/testsuite/gdb.rocm/precise-memory-exec.exp
@@ -29,7 +29,8 @@ if {[build_executable "failed to prepare $testfile" $testfile $srcfile {debug}]}
 }
 
 proc do_test { follow-exec-mode } {
-    clean_restart $::binfile
+    clean_restart
+    gdb_load $::binfile
 
     with_rocm_gpu_lock {
 	if ![runto_main] {
diff --git a/gdb/testsuite/gdb.rocm/precise-memory-warning-sigsegv.exp b/gdb/testsuite/gdb.rocm/precise-memory-warning-sigsegv.exp
index f8557195a07..da0a95a37f5 100644
--- a/gdb/testsuite/gdb.rocm/precise-memory-warning-sigsegv.exp
+++ b/gdb/testsuite/gdb.rocm/precise-memory-warning-sigsegv.exp
@@ -29,7 +29,8 @@ if {[build_executable "failed to prepare" $testfile $srcfile {debug hip}]} {
 }
 
 proc do_test { } {
-    clean_restart $::binfile
+    clean_restart
+    gdb_load $::binfile
 
     with_rocm_gpu_lock {
 	if ![runto_main] {
diff --git a/gdb/testsuite/gdb.rocm/precise-memory.exp b/gdb/testsuite/gdb.rocm/precise-memory.exp
index 6711d8069a7..8f005596739 100644
--- a/gdb/testsuite/gdb.rocm/precise-memory.exp
+++ b/gdb/testsuite/gdb.rocm/precise-memory.exp
@@ -28,7 +28,8 @@ if {[build_executable "failed to prepare" $testfile $srcfile {debug hip}]} {
 }
 
 proc do_test { } {
-    clean_restart $::binfile
+    clean_restart
+    gdb_load $::binfile
 
     with_rocm_gpu_lock {
 	if ![runto_main] {
diff --git a/gdb/testsuite/gdb.rocm/simple.exp b/gdb/testsuite/gdb.rocm/simple.exp
index bc90a0afb03..8f6ff3e4337 100644
--- a/gdb/testsuite/gdb.rocm/simple.exp
+++ b/gdb/testsuite/gdb.rocm/simple.exp
@@ -27,7 +27,8 @@ if {[build_executable "failed to prepare" $testfile $srcfile {debug hip}]} {
 }
 
 proc do_test {} {
-    clean_restart $::binfile
+    clean_restart
+    gdb_load $::binfile
 
     with_rocm_gpu_lock {
 	if ![runto_main] {


More information about the Gdb-cvs mailing list