[PATCH v2 03/37] GDB: testsuite: x86, amd64, i386, ia64: Don't return value from top-level (sed)

[Thiago Jung Bauermann <thiago.bauermann@linaro.org>]

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.
---
 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 93e1ed36652b..bd05a4d4ae3a 100644
--- a/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
+++ b/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
@@ -18,15 +18,15 @@ require is_x86_64_m64_target
 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"]
 gdb_continue_to_breakpoint "Break on specified line" \
     ".*/\\* Break here\\.  \\*/.*"
diff --git a/gdb/testsuite/gdb.arch/amd64-byte.exp b/gdb/testsuite/gdb.arch/amd64-byte.exp
index 90668056a13e..0c908d2d8663 100644
--- a/gdb/testsuite/gdb.arch/amd64-byte.exp
+++ b/gdb/testsuite/gdb.arch/amd64-byte.exp
@@ -28,11 +28,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set byte_regs(1) al
 set byte_regs(2) bl
 set byte_regs(3) cl
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
index 3a16bfb3824f..f2c3fb1845c2 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
@@ -23,20 +23,20 @@ require support_displaced_stepping
 
 standard_testfile .S
 
 set options [list debug nopie]
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } {
-    return -1
+    return
 }
 
 # Get things started.
 
 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
 # address.
 set rip_regs { "rax" "rbx" "rcx" "rdx" "rbp" "rsi" "rdi" }
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 ce0283d462e7..603077adcd46 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-self-call.exp
@@ -23,18 +23,18 @@ set newline "\[\r\n\]*"
 
 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.
 gdb_breakpoint "test_call"
 gdb_continue_to_breakpoint "test_call"
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
index d05b6760e585..9b33c77c9a8a 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
@@ -23,18 +23,18 @@ set newline "\[\r\n\]*"
 
 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
 }
 
 ##########################################
 
 # Test call/ret.
diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp
index d7305f140011..01fb47786765 100644
--- a/gdb/testsuite/gdb.arch/amd64-dword.exp
+++ b/gdb/testsuite/gdb.arch/amd64-dword.exp
@@ -28,11 +28,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set nr_regs 14
 set dword_regs(1) eax
 set dword_regs(2) ebx
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp
index 257a7c8cf604..b67f676b7163 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp
@@ -28,15 +28,15 @@ if {[info exists COMPILE]} {
 if {[is_remote host]} {
     gdb_remote_download host $srcdir/$subdir/$srcfile2
 }
 
 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]
 
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
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 e5697c9c9ab5..8043235eec8e 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
@@ -28,15 +28,15 @@ if {[info exists COMPILE]} {
 if {[is_remote host]} {
     gdb_remote_download host $srcdir/$subdir/$srcfile2
 }
 
 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]
 
 with_test_prefix "call 1" {
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
index 5b2b65e86365..4c1d63ab5a3c 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
@@ -28,15 +28,15 @@ if {[info exists COMPILE]} {
 if {[is_remote host]} {
     remote_download host $srcdir/$subdir/$srcfile2
 }
 
 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]
 
 with_test_prefix "call 1" {
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp
index 146d92eb2670..cb789b541bc2 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp
@@ -22,15 +22,15 @@ if {[is_remote host]} {
     gdb_remote_download host $srcdir/$subdir/$srcfile2
 }
 
 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]
 
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value.exp b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
index 65c4ab142c3e..997312ee4375 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
@@ -25,15 +25,15 @@ if {[info exists COMPILE]} {
 } else {
     require is_x86_64_m64_target
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "breakhere"
 gdb_breakpoint "breakhere_locexpr"
 gdb_breakpoint "stacktest"
diff --git a/gdb/testsuite/gdb.arch/amd64-eval.exp b/gdb/testsuite/gdb.arch/amd64-eval.exp
index 34fb21e0678f..2b145375595b 100644
--- a/gdb/testsuite/gdb.arch/amd64-eval.exp
+++ b/gdb/testsuite/gdb.arch/amd64-eval.exp
@@ -21,15 +21,15 @@ require is_x86_64_m64_target
 
 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"]
 gdb_continue_to_breakpoint "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 e1ca703881dd..9e358c016427 100644
--- a/gdb/testsuite/gdb.arch/amd64-frameptr-vecreg-unwind.exp
+++ b/gdb/testsuite/gdb.arch/amd64-frameptr-vecreg-unwind.exp
@@ -24,11 +24,11 @@ require is_x86_64_m64_target
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	"${srcfile}" {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.arch/amd64-gs_base.exp b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
index db64c52d89fd..c879cd9d2bf6 100644
--- a/gdb/testsuite/gdb.arch/amd64-gs_base.exp
+++ b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
@@ -17,15 +17,15 @@ standard_testfile
 
 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"
 gdb_test "print /x \$gs_base" "= $hex" "print gs_base"
 
diff --git a/gdb/testsuite/gdb.arch/amd64-i386-address.exp b/gdb/testsuite/gdb.arch/amd64-i386-address.exp
index 710e9c0cdb46..c9e759272355 100644
--- a/gdb/testsuite/gdb.arch/amd64-i386-address.exp
+++ b/gdb/testsuite/gdb.arch/amd64-i386-address.exp
@@ -20,11 +20,11 @@
 
 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
 
 set test "trap stop"
diff --git a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
index 91c198e43a31..4c7664676d63 100644
--- a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
+++ b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
@@ -24,11 +24,11 @@ standard_testfile .S
 
 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
 # mxcsr), we expect the default values in all registers.
 #
diff --git a/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp b/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp
index 713bef8ba473..a48896d60a6c 100644
--- a/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp
+++ b/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp
@@ -30,15 +30,15 @@
 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}" \
 	 "first backtrace, with error message"
 
@@ -46,11 +46,11 @@ gdb_test "bt" "^#0 +breakpt *\\(\\) \[^\r\n\]*\r\n#1 +${::hex} in func5\[^\r\n\]
 	 "second backtrace, with error message"
 
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
     "\\^done,depth=\"4\"" \
     "check mi -stack-info-depth command, first time"
@@ -60,11 +60,11 @@ gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
     "check mi -stack-info-depth command, second time"
 
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-list-frames\"" \
     "\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"breakpt\",file=\"\[^\"\]+\",fullname=\"\[^\"\]+\",line=\"${decimal}\"(,arch=\"\[^\"\]+\")?\},frame=\{level=\"1\",addr=\"$hex\",func=\"func5\",file=\"\[^\"\]+\",fullname=\"\[^\"\]+\",line=\"${decimal}\"(,arch=\"\[^\"\]+\")?\},frame=\{level=\"2\",addr=\"$hex\",func=\"func4\",file=\"\[^\"\]+\",fullname=\"\[^\"\]+\",line=\"${decimal}\"(,arch=\"\[^\"\]+\")?\},frame=\{level=\"3\",addr=\"$hex\",func=\"func3\",file=\"\[^\"\]+\",fullname=\"\[^\"\]+\",line=\"${decimal}\"(,arch=\"\[^\"\]+\")?\}\\\]" \
     "check mi -stack-list-frames command, first time"
diff --git a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp
index 9a4f2e2663e2..d3ad91ed64fd 100644
--- a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp
+++ b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp
@@ -31,15 +31,15 @@ set opts {}
 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
 # error during initialisation, the no-filters case is simpler.
 
@@ -50,11 +50,11 @@ gdb_test "bt no-filters" "^#0 +$hex in func2 \\(\\)\r\nBacktrace stopped: Cannot
 	 "second backtrace, with error message"
 
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
     "\\^done,depth=\"1\"" \
     "check mi -stack-info-depth command, first time"
@@ -64,11 +64,11 @@ gdb_test "interpreter-exec mi \"-stack-info-depth\"" \
     "check mi -stack-info-depth command, second time"
 
 clean_restart ${::testfile}
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 gdb_test "interpreter-exec mi \"-stack-list-frames\"" \
     "\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"func2\"(,arch=\"\[^\"\]+\")?\}\\\]" \
     "check mi -stack-list-frames command, first time"
diff --git a/gdb/testsuite/gdb.arch/amd64-lam.exp b/gdb/testsuite/gdb.arch/amd64-lam.exp
index 746ab313871b..3abdb3116d88 100644
--- a/gdb/testsuite/gdb.arch/amd64-lam.exp
+++ b/gdb/testsuite/gdb.arch/amd64-lam.exp
@@ -19,15 +19,15 @@ require allow_lam_tests
 
 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"]
 gdb_continue_to_breakpoint "Breakpoint here"
 
diff --git a/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp b/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp
index 209aa240e623..a2651898b0c6 100644
--- a/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp
+++ b/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp
@@ -23,13 +23,13 @@ if {[info exists COMPILE]} {
 } else {
     require is_x86_64_m64_target
 }
 
 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 bae24da9cf76..f402350acdee 100644
--- a/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp
+++ b/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp
@@ -27,15 +27,15 @@ if {[info exists COMPILE]} {
 } else {
     require is_x86_64_m64_target
 }
 
 if {[prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "func"
 gdb_breakpoint "marker"
 
diff --git a/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp b/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp
index a50978d439eb..44ef137d8758 100644
--- a/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp
+++ b/gdb/testsuite/gdb.arch/amd64-pseudo-unwind.exp
@@ -27,11 +27,11 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
 
 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}
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp b/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp
index 4f2c6c26dab4..1d6d0cf786c5 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-expressions.exp
@@ -16,11 +16,11 @@
 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
 
 proc goto_probe { name } {
@@ -36,11 +36,11 @@ proc test_probe_value { value } {
     gdb_test "print \$_probe_argc" "= 1"
     gdb_test "print \$_probe_arg0" "= $value"
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Name and expected value for each probe.
 set probe_names_and_values {
     { "log_neg" "0" }
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp b/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp
index 4b4d0543f64d..9cd7dec166c1 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.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
 }
 
 # Helper procedure to go to probe NAME
 
 proc goto_probe { name } {
@@ -44,11 +44,11 @@ proc test_probe_value_without_reg { value } {
     gdb_test "print \$_probe_argc" "= 1"
     gdb_test "print \$_probe_arg0" "= $value"
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 foreach probe_name [list "foo" "bar" "foo_prefix" "bar_prefix"] \
     probe_val [list "42" "42" "42" "42"] \
     probe_reg_val [list "\$rsp" "\$rbp - 8" "\$rsp" "\$rbp - 8"] {
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
index 9c819e490acd..3fbdae9197de 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
@@ -27,18 +27,18 @@ 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"
 
 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 2f55fbdf82c8..e7089c20f489 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
@@ -16,11 +16,11 @@
 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 } {
     if { ![runto "-pstap $probe_name"] } {
 	return
diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp
index 5d6ae1776c66..c2cffe0793b2 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp
@@ -25,13 +25,13 @@ if {[info exists COMPILE]} {
 } else {
     require is_x86_64_m64_target
 }
 
 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 8a58dda00b1d..767602805b97 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp
@@ -25,13 +25,13 @@ 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 00ed2323a620..7ae151c690f3 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
@@ -28,15 +28,15 @@ if {[info exists COMPILE]} {
 if {[is_remote host]} {
     gdb_remote_download host $srcdir/$subdir/$srcfile2
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "g"
 gdb_continue_to_breakpoint "first time in g" ".* v = 2;"
 
diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp
index 63a3e00411a9..f1c6396d5108 100644
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp
@@ -16,13 +16,13 @@
 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 e26d6efb201c..459330563f87 100644
--- a/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
+++ b/gdb/testsuite/gdb.arch/amd64-watchpoint-downgrade.exp
@@ -29,18 +29,18 @@ require target_can_use_run_cmd is_x86_64_m64_target
 # control the use of s/w vs h/w watchpoints, this test isn't about
 # those, so skip the test in these cases.
 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.
 gdb_test "watch global_var" \
     "Hardware watchpoint $decimal: global_var"
diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp
index 8b06288f1a58..616f52cfdbb8 100644
--- a/gdb/testsuite/gdb.arch/amd64-word.exp
+++ b/gdb/testsuite/gdb.arch/amd64-word.exp
@@ -28,11 +28,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set nr_regs 14
 set word_regs(1) ax
 set word_regs(2) bx
diff --git a/gdb/testsuite/gdb.arch/core-file-pid0.exp b/gdb/testsuite/gdb.arch/core-file-pid0.exp
index 8f4f88bcdb6a..3f389a705480 100644
--- a/gdb/testsuite/gdb.arch/core-file-pid0.exp
+++ b/gdb/testsuite/gdb.arch/core-file-pid0.exp
@@ -26,26 +26,26 @@ standard_testfile
 if {[istarget "x86_64-*-linux*"]} {
     set cf_name ${testfile}.x86-64.core.bz2
     set cf_size 8757248
 } else {
     unsupported "no pre-generated core file for this target"
-    return -1
+    return
 }
 
 # Decompress the core file.
 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.
 set corefile [gdb_remote_download host $corefile]
 
diff --git a/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp b/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp
index 46f81f28c2d4..a53e14bf33d0 100644
--- a/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp
+++ b/gdb/testsuite/gdb.arch/i386-attach-see-vdso.exp
@@ -26,11 +26,11 @@ if {![istarget "i386-*-*"]} {
     lappend options "additional_flags=-m32"
 }
 
 # 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.
 clean_restart
 
diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp
index 9d65bfcc3294..1a786ee8a514 100644
--- a/gdb/testsuite/gdb.arch/i386-avx.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx.exp
@@ -43,11 +43,11 @@ 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"]" \
 	 "Breakpoint .* at .*i386-avx.c.*" \
 	 "set first breakpoint in main"
diff --git a/gdb/testsuite/gdb.arch/i386-avx512.exp b/gdb/testsuite/gdb.arch/i386-avx512.exp
index f1a0d59ccd89..c79563366dc8 100644
--- a/gdb/testsuite/gdb.arch/i386-avx512.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx512.exp
@@ -26,15 +26,15 @@ standard_testfile
 
 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
 
 set test "probe AVX512 support"
diff --git a/gdb/testsuite/gdb.arch/i386-biarch-core.exp b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
index 95b1a3e29cb0..a9102559e5b5 100644
--- a/gdb/testsuite/gdb.arch/i386-biarch-core.exp
+++ b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
@@ -38,17 +38,17 @@ set corebz2file ${srcdir}/${subdir}/${testfile}.core.bz2
 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]
 
 # First check if this particular GDB supports i386, otherwise we should not
diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index d2fcf0a311f9..ef4d0370de89 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -27,11 +27,11 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 # Don't use "debug", so that we don't have line information for the assembly
 # fragments.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 
 clean_restart $::testfile
 
diff --git a/gdb/testsuite/gdb.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp
index 9082638dcaa6..9a4e28585ef5 100644
--- a/gdb/testsuite/gdb.arch/i386-byte.exp
+++ b/gdb/testsuite/gdb.arch/i386-byte.exp
@@ -29,11 +29,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set byte_regs(1) al
 set byte_regs(2) bl
 set byte_regs(3) cl
diff --git a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp
index 11a9f0331928..a340182c1d88 100644
--- a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp
+++ b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp
@@ -20,13 +20,13 @@ require is_x86_like_target
 
 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 8c7061ecd78e..6a9290fe609a 100644
--- a/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
+++ b/gdb/testsuite/gdb.arch/i386-disp-step-self-call.exp
@@ -23,18 +23,18 @@ set newline "\[\r\n\]*"
 
 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.
 gdb_breakpoint "test_call"
 gdb_continue_to_breakpoint "test_call"
diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp
index b593651ad45c..f265d3fe3d03 100644
--- a/gdb/testsuite/gdb.arch/i386-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp
@@ -25,18 +25,18 @@ standard_testfile .S
 set opts {}
 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
 }
 
 ##########################################
 
 # Test call/ret.
diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index 058eefdb0051..d0c9209f62c3 100644
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -22,15 +22,15 @@
 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"
 
 # Test that we handle watchpoints in all of DR0-DR3.
diff --git a/gdb/testsuite/gdb.arch/i386-float.exp b/gdb/testsuite/gdb.arch/i386-float.exp
index 23db5f843c2c..a121093728a1 100644
--- a/gdb/testsuite/gdb.arch/i386-float.exp
+++ b/gdb/testsuite/gdb.arch/i386-float.exp
@@ -24,15 +24,15 @@ standard_testfile .S
 
 # some targets have leading underscores on assembly symbols.
 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" {
     gdb_test "stepi" ".*fldt.*"
     gdb_test "info float" "R7: Empty   0x00000000000000000000\r\n.*"
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index c7e019829e75..458a902fb974 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -33,11 +33,11 @@ set binfile [standard_output_file ${testfile}]
 # some targets have leading underscores on assembly symbols.
 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.
 
 clean_restart $::testfile
@@ -65,11 +65,11 @@ gdb_test_multiple "backtrace" "" {
 	set gate_n $expect_out(1,string)
 	pass $gdb_test_name
     }
 }
 if { $gate_n == "" } {
-    return -1
+    return
 }
 
 # Check we see the inserted `DW_CFA_GNU_negative_offset_extended' CFI.
 # We see there the original CFI-stored filename `gate.c'.
 
diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
index f365597e052e..58ab263688a1 100644
--- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp
+++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
@@ -25,11 +25,11 @@ standard_testfile .S
 # some targets have leading underscores on assembly symbols.
 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}
 
 gdb_test "break -q main" "" "first permanent break"
diff --git a/gdb/testsuite/gdb.arch/i386-pkru.exp b/gdb/testsuite/gdb.arch/i386-pkru.exp
index 94cf2101e18b..b9b0b99b0de3 100644
--- a/gdb/testsuite/gdb.arch/i386-pkru.exp
+++ b/gdb/testsuite/gdb.arch/i386-pkru.exp
@@ -29,15 +29,15 @@ if { [istarget *-*-linux*] } {
 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
 set test "probe PKRU support"
 gdb_test_multiple "print have_pkru()" $test {
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 03a32ba9c3f9..bb2cbdbcc6d1 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -32,11 +32,11 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 # Don't use "debug", so that we don't have line information for the assembly
 # fragments.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list $additional_flags]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 
 # The code used by the tests here encodes some breakpoints by using
 # inline assembler.  This will generate a SIGTRAP which will be caught
@@ -58,11 +58,11 @@ clean_restart $::testfile
 #
 # Run to `main' where we begin our tests.
 #
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 # Testcase for standard prologue.
 
 gdb_test "continue" "Program received signal SIGTRAP.*" "continue to standard"
diff --git a/gdb/testsuite/gdb.arch/i386-signal.exp b/gdb/testsuite/gdb.arch/i386-signal.exp
index 9e7976b5a275..35096076d6f4 100644
--- a/gdb/testsuite/gdb.arch/i386-signal.exp
+++ b/gdb/testsuite/gdb.arch/i386-signal.exp
@@ -25,11 +25,11 @@ lappend opts nopie
 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
 
 runto func
diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
index ccc1d56e6dbc..7991dc9cfc8a 100644
--- a/gdb/testsuite/gdb.arch/i386-size-overlap.exp
+++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
@@ -25,11 +25,11 @@ standard_testfile
 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
 
 # We use gdb_run_cmd so this stands a chance to work for remote
diff --git a/gdb/testsuite/gdb.arch/i386-size.exp b/gdb/testsuite/gdb.arch/i386-size.exp
index 0b2b2a3c3bda..723a96a3673f 100644
--- a/gdb/testsuite/gdb.arch/i386-size.exp
+++ b/gdb/testsuite/gdb.arch/i386-size.exp
@@ -30,11 +30,11 @@ set binfile [standard_output_file ${testfile}]
 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
 
 # We use gdb_run_cmd so this stands a chance to work for remote
diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
index 60b83b525fd5..8732279fc28a 100644
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
@@ -27,17 +27,17 @@ if {[info exists COMPILE]} {
     lappend opts debug optimize=-O2 additional_flags=-msse
 }
 
 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 ""
 foreach i {0 1 2 3 4} {
     set test "print (int) test_g$i ($args)"
diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
index 8722a059ef17..54a66880a9f8 100644
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse.exp
@@ -41,11 +41,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 send_gdb "print have_sse ()\r"
 gdb_expect {
     -re ".. = 1\r\n$gdb_prompt " {
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 21beeb400054..63b3ef17adb2 100644
--- a/gdb/testsuite/gdb.arch/i386-stap-eval-lang-ada.exp
+++ b/gdb/testsuite/gdb.arch/i386-stap-eval-lang-ada.exp
@@ -17,16 +17,16 @@ standard_testfile ".S"
 
 # We can only test this if the target is i686 or x86_64 with -m32
 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" \
     "printing \$_probe_arg0"
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
index 8f522308fe46..7d816aa2ec5c 100644
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ b/gdb/testsuite/gdb.arch/i386-unwind.exp
@@ -28,11 +28,11 @@ standard_testfile
 # some targets have leading underscores on assembly symbols.
 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
 
 # Testcase for backtrace/1435.
diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp
index 312daf81aed0..21e601223b0b 100644
--- a/gdb/testsuite/gdb.arch/i386-word.exp
+++ b/gdb/testsuite/gdb.arch/i386-word.exp
@@ -29,11 +29,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set word_regs(1) ax
 set word_regs(2) bx
 set word_regs(3) cx
diff --git a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
index e206c07cefef..7c746c12e294 100644
--- a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
@@ -18,19 +18,19 @@ require {istarget "ia64-*-*"}
 set testfile ia64-breakpoint-shadow
 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
 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
 # running the nonstop mode).  We would not be able to test the shadow.
 gdb_test "set breakpoint always-inserted on"
@@ -53,11 +53,11 @@ gdb_test_multiple "b bundle" $test {
 	set bpt2address $expect_out(1,string)
     }
 }
 
 if {![info exists bpt2address]} {
-    return -1
+    return
 }
 
 gdb_test "b *($bpt2address + 1)" "Breakpoint \[0-9\] at .*" "slot 1 breakpoint placed"
 gdb_test "b *($bpt2address + 2)" "Can't insert breakpoint for non-existing slot X" "slot 2 (slot X) breakpoint refusal"
 
diff --git a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
index cebea7c3b620..08d4849bae20 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
@@ -21,15 +21,15 @@
 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
 set line1 [gdb_get_line_number "first breakpoint here"]
 gdb_breakpoint $line1
diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
index 4b2e3e547e88..6adff2155313 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
@@ -19,15 +19,15 @@ require allow_avx512fp16_tests
 
 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"
 
 set line1 [gdb_get_line_number "BP1"]
diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
index 2d3ab6814c35..e99ec13f7d0e 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
@@ -18,15 +18,15 @@
 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.
 set line1 [gdb_get_line_number "first breakpoint here"]
 gdb_breakpoint $line1