[binutils-gdb] GDB: testsuite: x86, amd64, i386, ia64: Don't return value from top-level (sed)

Thiago Bauermann via Gdb-cvs <[email protected]>
Newsgroups gmane.comp.gdb.cvs
Message-ID <[email protected]>
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c010e1cba4f7e17fbc96784af020a60cd083492d

commit c010e1cba4f7e17fbc96784af020a60cd083492d
Author: Thiago Jung Bauermann <[email protected]>
Date:   Wed Apr 29 20:03:54 2026 -0300

    GDB: testsuite: x86, amd64, i386, ia64: Don't return value from top-level (sed)
    
    This patch is purely the result of running:
    
    $ sed -i 's/^    return -1/    return/' \
          amd64-*.exp* i386-*.exp* x86*.exp* ia64*.exp* core-file-pid0.exp
    
    and
    
    $ sed -i 's/^    return 0/    return/' \
          amd64-*.exp* i386-*.exp* x86*.exp* ia64*.exp* core-file-pid0.exp
    
    inside gdb/testsuite/gdb.arch.
    
    Approved-By: Tom Tromey <[email protected]>

Diff:
---
 gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp        | 4 ++--
 gdb/testsuite/gdb.arch/amd64-byte.exp                     | 2 +-
 gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp            | 4 ++--
 gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp      | 4 ++--
 gdb/testsuite/gdb.arch/amd64-disp-step.exp                | 4 ++--
 gdb/testsuite/gdb.arch/amd64-dword.exp                    | 2 +-
 gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp       | 4 ++--
 gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp | 4 ++--
 gdb/testsuite/gdb.arch/amd64-entry-value-param.exp        | 4 ++--
 gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp     | 4 ++--
 gdb/testsuite/gdb.arch/amd64-entry-value.exp              | 4 ++--
 gdb/testsuite/gdb.arch/amd64-eval.exp                     | 4 ++--
 gdb/testsuite/gdb.arch/amd64-frameptr-vecreg-unwind.exp   | 2 +-
 gdb/testsuite/gdb.arch/amd64-gs_base.exp                  | 4 ++--
 gdb/testsuite/gdb.arch/amd64-i386-address.exp             | 2 +-
 gdb/testsuite/gdb.arch/amd64-init-x87-values.exp          | 2 +-
 gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp     | 8 ++++----
 gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp        | 8 ++++----
 gdb/testsuite/gdb.arch/amd64-lam.exp                      | 4 ++--
 gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp          | 4 ++--
 gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp             | 4 ++--
 gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp            | 2 +-
 gdb/testsuite/gdb.arch/amd64-stap-expressions.exp         | 4 ++--
 gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp     | 4 ++--
 gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp    | 4 ++--
 gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp        | 2 +-
 gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp             | 4 ++--
 gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp           | 4 ++--
 gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp             | 4 ++--
 gdb/testsuite/gdb.arch/amd64-tailcall-self.exp            | 4 ++--
 gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp     | 4 ++--
 gdb/testsuite/gdb.arch/amd64-word.exp                     | 2 +-
 gdb/testsuite/gdb.arch/core-file-pid0.exp                 | 6 +++---
 gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp           | 2 +-
 gdb/testsuite/gdb.arch/i386-avx.exp                       | 2 +-
 gdb/testsuite/gdb.arch/i386-avx512.exp                    | 4 ++--
 gdb/testsuite/gdb.arch/i386-biarch-core.exp               | 4 ++--
 gdb/testsuite/gdb.arch/i386-bp_permanent.exp              | 2 +-
 gdb/testsuite/gdb.arch/i386-byte.exp                      | 2 +-
 gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp            | 4 ++--
 gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp       | 4 ++--
 gdb/testsuite/gdb.arch/i386-disp-step.exp                 | 4 ++--
 gdb/testsuite/gdb.arch/i386-dr3-watch.exp                 | 4 ++--
 gdb/testsuite/gdb.arch/i386-float.exp                     | 4 ++--
 gdb/testsuite/gdb.arch/i386-gnu-cfi.exp                   | 4 ++--
 gdb/testsuite/gdb.arch/i386-permbkpt.exp                  | 2 +-
 gdb/testsuite/gdb.arch/i386-pkru.exp                      | 4 ++--
 gdb/testsuite/gdb.arch/i386-prologue.exp                  | 4 ++--
 gdb/testsuite/gdb.arch/i386-signal.exp                    | 2 +-
 gdb/testsuite/gdb.arch/i386-size-overlap.exp              | 2 +-
 gdb/testsuite/gdb.arch/i386-size.exp                      | 2 +-
 gdb/testsuite/gdb.arch/i386-sse-stack-align.exp           | 4 ++--
 gdb/testsuite/gdb.arch/i386-sse.exp                       | 2 +-
 gdb/testsuite/gdb.arch/i386-stap-eval-lang-ada.exp        | 4 ++--
 gdb/testsuite/gdb.arch/i386-unwind.exp                    | 2 +-
 gdb/testsuite/gdb.arch/i386-word.exp                      | 2 +-
 gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp         | 6 +++---
 gdb/testsuite/gdb.arch/x86-avx512bf16.exp                 | 4 ++--
 gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp             | 4 ++--
 gdb/testsuite/gdb.arch/x86-avx512fp16.exp                 | 4 ++--
 60 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp b/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
index 93e1ed36652..bd05a4d4ae3 100644
--- a/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
+++ b/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
@@ -20,11 +20,11 @@ standard_testfile .S
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  { debug }] } {
     untested "could not compile"
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.arch/amd64-byte.exp b/gdb/testsuite/gdb.arch/amd64-byte.exp
index 90668056a13..0c908d2d866 100644
--- a/gdb/testsuite/gdb.arch/amd64-byte.exp
+++ b/gdb/testsuite/gdb.arch/amd64-byte.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set byte_regs(1) al
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
index 3a16bfb3824..f2c3fb1845c 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
@@ -25,7 +25,7 @@ standard_testfile .S
 
 set options [list debug nopie]
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } {
-    return -1
+    return
 }
 
 # Get things started.
@@ -34,7 +34,7 @@ gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 # GDB picks a spare register from this list to hold the RIP-relative
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
index ce0283d462e..603077adcd4 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
@@ -25,14 +25,14 @@ set opts {debug nopie}
 standard_testfile .S -alarm.c
 
 if { [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" $opts] } {
-    return -1
+    return
 }
 
 gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 # Proceed to the test function.
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
index d05b6760e58..9b33c77c9a8 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
@@ -25,14 +25,14 @@ set opts {debug nopie}
 standard_testfile .S -signal.c
 
 if { [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" $opts] } {
-    return -1
+    return
 }
 
 gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 ##########################################
diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp
index d7305f14001..01fb4778676 100644
--- a/gdb/testsuite/gdb.arch/amd64-dword.exp
+++ b/gdb/testsuite/gdb.arch/amd64-dword.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set nr_regs 14
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp
index 257a7c8cf60..b67f676b716 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp
@@ -30,11 +30,11 @@ if {[is_remote host]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here" $srcfile2]
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
index e5697c9c9ab..8043235eec8 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
@@ -30,11 +30,11 @@ if {[is_remote host]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here" $srcfile2]
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
index 5b2b65e8636..4c1d63ab5a3 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
@@ -30,11 +30,11 @@ if {[is_remote host]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here" $srcfile2]
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp
index 146d92eb267..cb789b541bc 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp
@@ -24,11 +24,11 @@ if {[is_remote host]} {
 
 if { [prepare_for_testing_full "failed to prepare" \
 	  [list $testfile "c++" $srcfile {}]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here" $srcfile2]
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value.exp b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
index 65c4ab142c3..997312ee437 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
@@ -27,11 +27,11 @@ if {[info exists COMPILE]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "breakhere"
diff --git a/gdb/testsuite/gdb.arch/amd64-eval.exp b/gdb/testsuite/gdb.arch/amd64-eval.exp
index 34fb21e0678..2b145375595 100644
--- a/gdb/testsuite/gdb.arch/amd64-eval.exp
+++ b/gdb/testsuite/gdb.arch/amd64-eval.exp
@@ -23,11 +23,11 @@ standard_testfile .cc
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  { debug c++ additional_flags=-std=c++11 }] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
diff --git a/gdb/testsuite/gdb.arch/amd64-frameptr-vecreg-unwind.exp b/gdb/testsuite/gdb.arch/amd64-frameptr-vecreg-unwind.exp
index e1ca703881d..9e358c01642 100644
--- a/gdb/testsuite/gdb.arch/amd64-frameptr-vecreg-unwind.exp
+++ b/gdb/testsuite/gdb.arch/amd64-frameptr-vecreg-unwind.exp
@@ -26,7 +26,7 @@ standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	"${srcfile}" {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.arch/amd64-gs_base.exp b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
index db64c52d89f..c879cd9d2bf 100644
--- a/gdb/testsuite/gdb.arch/amd64-gs_base.exp
+++ b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
@@ -19,11 +19,11 @@ require is_amd64_regs_target
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
      [list debug nowarnings]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "print /x \$fs_base" "= $hex" "print fs_base"
diff --git a/gdb/testsuite/gdb.arch/amd64-i386-address.exp b/gdb/testsuite/gdb.arch/amd64-i386-address.exp
index 710e9c0cdb4..c9e75927235 100644
--- a/gdb/testsuite/gdb.arch/amd64-i386-address.exp
+++ b/gdb/testsuite/gdb.arch/amd64-i386-address.exp
@@ -22,7 +22,7 @@ require {is_any_target "x86_64-*-*" "i?86-*-*"} is_lp64_target
 require {!istarget "*-*-openbsd*"}
 
 if {[prepare_for_testing "failed to prepare" amd64-i386-address amd64-i386-address.S [list debug "additional_flags=-m32 -nostdlib"]]} {
-    return -1
+    return
 }
 
 gdb_run_cmd
diff --git a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
index 91c198e43a3..4c7664676d6 100644
--- a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
+++ b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
@@ -26,7 +26,7 @@ set options [list debug \
 		 additional_flags=-static \
 		 ldflags=-nostartfiles]
 if { [build_executable "failed to prepare" ${testfile} ${srcfile} $options] } {
-    return -1
+    return
 }
 
 # Start the test file, and check the x87 control registers (and
diff --git a/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp b/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp
index 713bef8ba47..a48896d60a6 100644
--- a/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp
+++ b/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp
@@ -32,11 +32,11 @@ standard_testfile .S
 require is_x86_64_m64_target
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {nopie}] } {
-    return -1
+    return
 }
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "bt" "^#0 +breakpt *\\(\\) \[^\r\n\]*\r\n#1 +${::hex} in func5\[^\r\n\]*\r\n#2 +${::hex} in func4\[^\r\n\]*\r\n#3 +${::hex} in func3\[^\r\n\]*\r\nBacktrace stopped: Cannot access memory at address ${::hex}" \
@@ -48,7 +48,7 @@ gdb_test "bt" "^#0 +breakpt *\\(\\) \[^\r\n\]*\r\n#1 +${::hex} in func5\[^\r\n\]
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
@@ -62,7 +62,7 @@ gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-list-frames\"" \
diff --git a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp
index 9a4f2e2663e..d3ad91ed64f 100644
--- a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp
+++ b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp
@@ -33,11 +33,11 @@ standard_testfile .c
 require is_x86_64_m64_target
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 # Use 'bt no-filters' here as the python filters will raise their own
@@ -52,7 +52,7 @@ gdb_test "bt no-filters" "^#0 +$hex in func2 \\(\\)\r\nBacktrace stopped: Cannot
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
@@ -66,7 +66,7 @@ gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-list-frames\"" \
diff --git a/gdb/testsuite/gdb.arch/amd64-lam.exp b/gdb/testsuite/gdb.arch/amd64-lam.exp
index 746ab313871..3abdb3116d8 100644
--- a/gdb/testsuite/gdb.arch/amd64-lam.exp
+++ b/gdb/testsuite/gdb.arch/amd64-lam.exp
@@ -21,11 +21,11 @@ standard_testfile amd64-lam.c
 
 # Test LAM 57.
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Breakpoint here"]
diff --git a/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp b/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp
index 209aa240e62..a2651898b0c 100644
--- a/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp
+++ b/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp
@@ -25,11 +25,11 @@ if {[info exists COMPILE]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "print v" { = {i = 0, xxx = {<optimized out> <repeats 256 times>}}}
diff --git a/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp b/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp
index bae24da9cf7..f402350acde 100644
--- a/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp
+++ b/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp
@@ -29,11 +29,11 @@ if {[info exists COMPILE]} {
 }
 
 if {[prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "func"
diff --git a/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp b/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp
index a50978d439e..44ef137d875 100644
--- a/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp
+++ b/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp
@@ -29,7 +29,7 @@ standard_testfile amd64-pseudo-unwind.c amd64-pseudo-unwind-asm.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	"${srcfile} ${srcfile2}" {debug}] } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp b/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp
index 4f2c6c26dab..1d6d0cf786c 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp
@@ -18,7 +18,7 @@ standard_testfile ".S"
 require is_x86_64_m64_target
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 # Helper procedure to go to probe NAME
@@ -38,7 +38,7 @@ proc test_probe_value { value } {
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Name and expected value for each probe.
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp b/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp
index 4b4d0543f64..9cd7dec166c 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp
@@ -20,7 +20,7 @@ standard_testfile ".S"
 require is_x86_64_m64_target
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 # Helper procedure to go to probe NAME
@@ -46,7 +46,7 @@ proc test_probe_value_without_reg { value } {
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 foreach probe_name [list "foo" "bar" "foo_prefix" "bar_prefix"] \
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
index 9c819e490ac..3fbdae9197d 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
@@ -29,7 +29,7 @@ proc test_probe { probe_name } {
 standard_testfile amd64-stap-triplet.S
 
 if { [prepare_for_testing "failed to prepare" $testfile-triplet $srcfile] } {
-    return -1
+    return
 }
 
 test_probe "triplet"
@@ -38,7 +38,7 @@ standard_testfile amd64-stap-three-arg-disp.S
 
 if { [prepare_for_testing "failed to prepare" $testfile-three-arg-displ \
 	  $srcfile] } {
-    return -1
+    return
 }
 
 test_probe "three_arg"
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
index 2f55fbdf82c..e7089c20f48 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
@@ -18,7 +18,7 @@ require is_x86_64_m64_target
 standard_testfile amd64-stap-wrong-subexp.S
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 proc goto_probe { probe_name } {
diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp
index 5d6ae1776c6..c2cffe0793b 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp
@@ -27,11 +27,11 @@ if {[info exists COMPILE]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} "${srcfile} ${srcfile2}" $opts] } {
-    return -1
+    return
 }
 
 if {![runto g]} {
-    return -1
+    return
 }
 
 gdb_test "bt" "\r\n#0 +g \\(x=x@entry=2\\) at \[^\r\n\]*\r\n#1 +${::hex} in f \\(x=x@entry=1\\) at \[^\r\n\]*\r\n#2 +${::hex} in main .*"
diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp
index 8a58dda00b1..767602805b9 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp
@@ -27,11 +27,11 @@ if {[info exists COMPILE]} {
 lappend opts nopie
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto noret]} {
-    return -1
+    return
 }
 
 gdb_test "bt" "#0 +noret \\(x=1\\) at \[^\r\n\]*\r\n#1 +${::hex} in mayret \\(x=x@entry=1\\) at \[^\r\n\]*\r\n#2 +${::hex} in tailcall \\(x=x@entry=1\\) at \[^\r\n\]*\r\n#3 +${::hex} in main \\(\\) at .*"
diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
index 00ed2323a62..7ae151c690f 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
@@ -30,11 +30,11 @@ if {[is_remote host]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "g"
diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp
index 63a3e00411a..f1c6396d510 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp
@@ -18,11 +18,11 @@ standard_testfile .S
 require is_x86_64_m64_target
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {}] } {
-    return -1
+    return
 }
 
 if {![runto b]} {
-    return -1
+    return
 }
 
 gdb_test "bt" "#0 +b \\(\\) at \[^\r\n\]*\r\n#1 +${::hex} in a \\(q=<optimized out>\\) at \[^\r\n\]*\r\n#2 +${::hex} in main \\(\[^\r\n\]*\\) at .*"
diff --git a/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp b/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
index e26d6efb201..459330563f8 100644
--- a/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
+++ b/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
@@ -31,14 +31,14 @@ require target_can_use_run_cmd is_x86_64_m64_target
 if {[target_info gdb_protocol] == "remote"
     || [target_info gdb_protocol] == "extended-remote"} {
     unsupported "using [target_info gdb_protocol] protocol"
-    return -1
+    return
 }
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  { debug }] } {
-    return -1
+    return
 }
 
 # Insert the watchpoint, it should default to a h/w watchpoint.
diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp
index 8b06288f1a5..616f52cfdbb 100644
--- a/gdb/testsuite/gdb.arch/amd64-word.exp
+++ b/gdb/testsuite/gdb.arch/amd64-word.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set nr_regs 14
diff --git a/gdb/testsuite/gdb.arch/core-file-pid0.exp b/gdb/testsuite/gdb.arch/core-file-pid0.exp
index 8f4f88bcdb6..3f389a70548 100644
--- a/gdb/testsuite/gdb.arch/core-file-pid0.exp
+++ b/gdb/testsuite/gdb.arch/core-file-pid0.exp
@@ -28,7 +28,7 @@ if {[istarget "x86_64-*-linux*"]} {
     set cf_size 8757248
 } else {
     unsupported "no pre-generated core file for this target"
-    return -1
+    return
 }
 
 # Decompress the core file.
@@ -36,14 +36,14 @@ set corebz2file ${srcdir}/${subdir}/${cf_name}
 set corefile [decompress_bz2 $corebz2file]
 if { $corefile eq "" } {
     untested "failed to bunzip2 the core file"
-    return -1
+    return
 }
 
 # Check the size of the decompressed core file.  Just for sanity.
 file stat ${corefile} corestat
 if { $corestat(size) != ${cf_size} } {
     untested "uncompressed core file is the wrong size"
-    return -1
+    return
 }
 
 # Copy over the corefile if we are remote testing.
diff --git a/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp b/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp
index 46f81f28c2d..a53e14bf33d 100644
--- a/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp
+++ b/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp
@@ -28,7 +28,7 @@ if {![istarget "i386-*-*"]} {
 
 # The kernel VDSO is used for the syscalls returns only on i386 (not x86_64).
 if { [build_executable "failed to prepare" $testfile $srcfile $options] } {
-    return -1
+    return
 }
 
 # Don't tell GDB which executable we're debugging.
diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp
index 9d65bfcc329..1a786ee8a51 100644
--- a/gdb/testsuite/gdb.arch/i386-avx.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx.exp
@@ -45,7 +45,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 gdb_test "break [gdb_get_line_number "first breakpoint here"]" \
diff --git a/gdb/testsuite/gdb.arch/i386-avx512.exp b/gdb/testsuite/gdb.arch/i386-avx512.exp
index f1a0d59ccd8..c79563366dc 100644
--- a/gdb/testsuite/gdb.arch/i386-avx512.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx512.exp
@@ -28,11 +28,11 @@ set comp_flags "-mavx512f -I${srcdir}/../nat"
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
      [list debug nowarnings additional_flags=${comp_flags}]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set supports_avx512 0
diff --git a/gdb/testsuite/gdb.arch/i386-biarch-core.exp b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
index 95b1a3e29cb..a9102559e5b 100644
--- a/gdb/testsuite/gdb.arch/i386-biarch-core.exp
+++ b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
@@ -40,13 +40,13 @@ set address 0x400078
 set corefile [decompress_bz2 $corebz2file]
 if { $corefile == "" } {
     untested "failed bzip2"
-    return -1
+    return
 }
 
 file stat ${corefile} corestat
 if {$corestat(size) != 102400} {
     untested "bzip2 produces invalid result"
-    return -1
+    return
 }
 
 set corefile [gdb_remote_download host $corefile]
diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index d2fcf0a311f..ef4d0370de8 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -29,7 +29,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 # fragments.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp
index 9082638dcaa..9a4e28585ef 100644
--- a/gdb/testsuite/gdb.arch/i386-byte.exp
+++ b/gdb/testsuite/gdb.arch/i386-byte.exp
@@ -31,7 +31,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set byte_regs(1) al
diff --git a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp
index 11a9f033192..a340182c1d8 100644
--- a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp
+++ b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp
@@ -22,11 +22,11 @@ set testfile "i386-cfi-notcurrent"
 set srcfile ${testfile}.S
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto f]} {
-    return -1
+    return
 }
 
 gdb_test "backtrace" "#0 \[^\r\n\]* f \[^\r\n\]*\r\n#1 \[^\r\n\]* g \[^\r\n\]*\r\n#2 \[^\r\n\]* main \[^\r\n\]*"
diff --git a/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp b/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
index 8c7061ecd78..6a9290fe609 100644
--- a/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
+++ b/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
@@ -25,14 +25,14 @@ set opts {debug nopie}
 standard_testfile .S -alarm.c
 
 if { [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" $opts] } {
-    return -1
+    return
 }
 
 gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 # Proceed to the test function.
diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp
index b593651ad45..f265d3fe3d0 100644
--- a/gdb/testsuite/gdb.arch/i386-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp
@@ -27,14 +27,14 @@ lappend opts debug
 lappend opts nopie
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] } {
-    return -1
+    return
 }
 
 gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 ##########################################
diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index 058eefdb005..d0c9209f62c 100644
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -24,11 +24,11 @@ require {is_any_target "i?86-*-*" "x86_64-*-*"}
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug $additional_flags}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set breakpoint always-inserted on"
diff --git a/gdb/testsuite/gdb.arch/i386-float.exp b/gdb/testsuite/gdb.arch/i386-float.exp
index 23db5f843c2..a121093728a 100644
--- a/gdb/testsuite/gdb.arch/i386-float.exp
+++ b/gdb/testsuite/gdb.arch/i386-float.exp
@@ -26,11 +26,11 @@ standard_testfile .S
 set additional_flags [gdb_target_symbol_prefix_flags_asm]
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile [list debug nopie $additional_flags]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 with_test_prefix "zero" {
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index c7e019829e7..458a902fb97 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -35,7 +35,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfilec} ${srcdir}/${subdir}/${srcfileasm}" "${binfile}" executable [list debug $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Get things started.
@@ -67,7 +67,7 @@ gdb_test_multiple "backtrace" "" {
     }
 }
 if { $gate_n == "" } {
-    return -1
+    return
 }
 
 # Check we see the inserted `DW_CFA_GNU_negative_offset_extended' CFI.
diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
index f365597e052..58ab263688a 100644
--- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp
+++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
@@ -27,7 +27,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm]
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
diff --git a/gdb/testsuite/gdb.arch/i386-pkru.exp b/gdb/testsuite/gdb.arch/i386-pkru.exp
index 94cf2101e18..b9b0b99b0de 100644
--- a/gdb/testsuite/gdb.arch/i386-pkru.exp
+++ b/gdb/testsuite/gdb.arch/i386-pkru.exp
@@ -31,11 +31,11 @@ set comp_flags "-I${srcdir}/../nat/"
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
      [list debug additional_flags=${comp_flags}]] } {
     untested "failed to compile x86 PKEYS test."
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set supports_pkru 0
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 03a32ba9c3f..bb2cbdbcc6d 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -34,7 +34,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 # fragments.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 
@@ -60,7 +60,7 @@ clean_restart $::testfile
 #
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 # Testcase for standard prologue.
diff --git a/gdb/testsuite/gdb.arch/i386-signal.exp b/gdb/testsuite/gdb.arch/i386-signal.exp
index 9e7976b5a27..35096076d6f 100644
--- a/gdb/testsuite/gdb.arch/i386-signal.exp
+++ b/gdb/testsuite/gdb.arch/i386-signal.exp
@@ -27,7 +27,7 @@ lappend opts additional_flags=-DIS_AMD64_REGS_TARGET=[is_amd64_regs_target]
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	  executable $opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
index ccc1d56e6db..7991dc9cfc8 100644
--- a/gdb/testsuite/gdb.arch/i386-size-overlap.exp
+++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
@@ -27,7 +27,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	  executable [list debug $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.arch/i386-size.exp b/gdb/testsuite/gdb.arch/i386-size.exp
index 0b2b2a3c3bd..723a96a3673 100644
--- a/gdb/testsuite/gdb.arch/i386-size.exp
+++ b/gdb/testsuite/gdb.arch/i386-size.exp
@@ -32,7 +32,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	  executable [list debug $additional_flags]] != "" } {
     untested "i386-size"
-    return -1
+    return
 }
 
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
index 60b83b525fd..8732279fc28 100644
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
@@ -29,13 +29,13 @@ if {[info exists COMPILE]} {
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
     unsupported "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set args ""
diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
index 8722a059ef1..54a66880a9f 100644
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse.exp
@@ -43,7 +43,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 send_gdb "print have_sse ()\r"
diff --git a/gdb/testsuite/gdb.arch/i386-stap-eval-lang-ada.exp b/gdb/testsuite/gdb.arch/i386-stap-eval-lang-ada.exp
index 21beeb40005..63b3ef17adb 100644
--- a/gdb/testsuite/gdb.arch/i386-stap-eval-lang-ada.exp
+++ b/gdb/testsuite/gdb.arch/i386-stap-eval-lang-ada.exp
@@ -19,13 +19,13 @@ standard_testfile ".S"
 require is_x86_like_target
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
 
 if { ![runto "-pstap bar"] } {
-    return -1
+    return
 }
 
 gdb_test "print \$_probe_arg0" " = 40" \
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
index 8f522308fe4..7d816aa2ec5 100644
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ b/gdb/testsuite/gdb.arch/i386-unwind.exp
@@ -30,7 +30,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp
index 312daf81aed..21e601223b0 100644
--- a/gdb/testsuite/gdb.arch/i386-word.exp
+++ b/gdb/testsuite/gdb.arch/i386-word.exp
@@ -31,7 +31,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set word_regs(1) ax
diff --git a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
index e206c07cefe..7c746c12e29 100644
--- a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
@@ -20,7 +20,7 @@ set srcfile ${testfile}.S
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
@@ -28,7 +28,7 @@ gdb_load $binfile
 
 # We need to start the inferior to place the breakpoints in the memory at all.
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # The default "auto" mode removes all the breakpoints when we stop (and not
@@ -55,7 +55,7 @@ gdb_test_multiple "b bundle" $test {
 }
 
 if {![info exists bpt2address]} {
-    return -1
+    return
 }
 
 gdb_test "b *($bpt2address + 1)" "Breakpoint \[0-9\] at .*" "slot 1 breakpoint placed"
diff --git a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
index cebea7c3b62..08d4849bae2 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
@@ -23,11 +23,11 @@ require allow_avx512bf16_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Test xmm
diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
index 4b2e3e547e8..6adff215531 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
@@ -21,11 +21,11 @@ standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
      {debug additional_flags="-mavx512fp16"}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_test "p square(2.2)" "= 4\\.8359"
diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
index 2d3ab6814c3..e99ec13f7d0 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
@@ -20,11 +20,11 @@ require allow_avx512fp16_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Test xmm.
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.