From: Tom de Vries <tdevries@suse.de>
Date: Mon, 3 Aug 2026 12:13:56 +0000 (+0200)
Subject: [gdb/testsuite] Don't return -1 from top-level
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;p=thirdparty%2Fbinutils-gdb.git

[gdb/testsuite] Don't return -1 from top-level

Replace:
...
if {<cond>} {
   return -1
}
...
with:
...
if {<cond>} {
   return
}
...

See also commit 51f8decb2fc ("GDB: testsuite: TUI: Don't return -1 from
top-level (sed)").

Generated by a script written by Claude Code.

Tested on x86_64-linux and aarch64-linux.

Approved-By: Andrew Burgess <aburgess@redhat.com>
---

diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index f550f95573e..e32a2c6c5cc 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -162,7 +162,7 @@ switch -glob -- [istarget] {
 
 if { "${asm-arch}" == "" } {
     untested "skipping tests due to no asm architecture"
-    return -1
+    return
 }
 
 # On NetBSD/ELF we need a special NetBSD-identifying note section.
@@ -188,7 +188,7 @@ if {[board_info $dest exists multilib_flags]} {
 	set multilib_flags [board_info $dest multilib_flags]
 	if { "${multilib_flags}" != "" } {
 	   untested "failed to compile"
-	   return -1
+	   return
 	   return
 	 }
 }
@@ -245,11 +245,11 @@ set asm2obj [standard_output_file asmrc2.o]
 
 if {[target_assemble ${srcdir}/${subdir}/${srcfile} $asm1obj "${asm-flags} ${debug-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 if {[target_assemble ${srcdir}/${subdir}/${srcfile2} $asm2obj "${asm-flags} ${debug-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 # We deliberately don't use gdb_compile here to link together the
@@ -260,7 +260,7 @@ if {[target_assemble ${srcdir}/${subdir}/${srcfile2} $asm2obj "${asm-flags} ${de
 # *-*-*bsd* and *-*-solaris2*.
 if {[target_link [list $asm1obj $asm2obj] "${binfile}" ${link-flags}] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 # Restore the target board linker script for HC11/HC12.
diff --git a/gdb/testsuite/gdb.base/rbreak.exp b/gdb/testsuite/gdb.base/rbreak.exp
index 16c7e83cd49..16d191b2417 100644
--- a/gdb/testsuite/gdb.base/rbreak.exp
+++ b/gdb/testsuite/gdb.base/rbreak.exp
@@ -19,7 +19,7 @@ standard_testfile .c -2.c
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile $srcfile2]] } {
-    return -1
+    return
 }
 
 # Regression test for PR34112.  Check that "rbreak $srcfile:foo" doesn't set
diff --git a/gdb/testsuite/gdb.base/stap-probe.exp b/gdb/testsuite/gdb.base/stap-probe.exp
index 00f91a5723a..ce4f9a2d8cd 100644
--- a/gdb/testsuite/gdb.base/stap-probe.exp
+++ b/gdb/testsuite/gdb.base/stap-probe.exp
@@ -331,7 +331,7 @@ proc stap_test_no_debuginfo {exec_name {args ""}} {
 with_test_prefix "without semaphore, not optimized" {
     if {[stap_test "stap-probe-nosem-noopt"] == -1} {
 	untested "stap probe test failed"
-	  return -1
+	  return
     }
 
     foreach_with_prefix pie { "nopie" "pie" } {
diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.btrace/buffer-size.exp
index 1684cafa61f..63bc44dde39 100644
--- a/gdb/testsuite/gdb.btrace/buffer-size.exp
+++ b/gdb/testsuite/gdb.btrace/buffer-size.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set record btrace bts buffer-size 1"
diff --git a/gdb/testsuite/gdb.btrace/data.exp b/gdb/testsuite/gdb.btrace/data.exp
index 2aa02687611..2af688b95f0 100644
--- a/gdb/testsuite/gdb.btrace/data.exp
+++ b/gdb/testsuite/gdb.btrace/data.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # trace the test code
diff --git a/gdb/testsuite/gdb.btrace/delta.exp b/gdb/testsuite/gdb.btrace/delta.exp
index eef6f2debc6..cfcad1d5b04 100644
--- a/gdb/testsuite/gdb.btrace/delta.exp
+++ b/gdb/testsuite/gdb.btrace/delta.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # proceed to some sequential code
diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
index cc91c0d3c46..e197438f213 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -25,16 +25,16 @@ set binfile_lib [standard_output_file $basename_lib.so]
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] != "" } {
     untested "failed to prepare shlib"
-    return -1
+    return
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  [list additional_flags=-DDSO_NAME=\"$binfile_lib\" libs=-ldl]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Trace the test function
diff --git a/gdb/testsuite/gdb.btrace/enable-new-thread.exp b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
index 6e93c59e1d7..72d8be5d47c 100644
--- a/gdb/testsuite/gdb.btrace/enable-new-thread.exp
+++ b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Record the main thread.  Recording will automatically be enabled for the
diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gdb.btrace/enable-running.exp
index 591e42be7db..2a42b6ab62e 100644
--- a/gdb/testsuite/gdb.btrace/enable-running.exp
+++ b/gdb/testsuite/gdb.btrace/enable-running.exp
@@ -20,7 +20,7 @@ require allow_btrace_tests
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
     untested "failed to prepare"
-    return -1
+    return
 }
 
 # We need to enable non-stop mode for the remote case.
@@ -30,7 +30,7 @@ save_vars { GDBFLAGS } {
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set bp_1 [gdb_get_line_number "bp.1" $srcfile]
diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index dd7b6753eff..33ddd6fc931 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -36,11 +36,11 @@ gdb_test "info record" "No recording is currently active\\." "info record withou
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile {} {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # enable btrace
@@ -79,19 +79,19 @@ load_lib gdbserver-support.exp
 require allow_gdbserver_tests
 clean_restart $testfile
 if {![runto_main]} {
-    return -1
+    return
 }
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # make sure record-btrace can be enabled after re-run
 clean_restart $testfile
 if {![runto_main]} {
-    return -1
+    return
 }
 gdb_test_no_output "record btrace" "enable after restart"
 if {![runto_main]} {
-    return -1
+    return
 }
 gdb_test_no_output "record btrace" "enable after re-run"
diff --git a/gdb/testsuite/gdb.btrace/event-tracing-gap.exp b/gdb/testsuite/gdb.btrace/event-tracing-gap.exp
index b21ab93033a..b821126bda2 100644
--- a/gdb/testsuite/gdb.btrace/event-tracing-gap.exp
+++ b/gdb/testsuite/gdb.btrace/event-tracing-gap.exp
@@ -22,11 +22,11 @@ require allow_btrace_pt_event_trace_tests
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set record btrace pt event-tracing on"
diff --git a/gdb/testsuite/gdb.btrace/event-tracing.exp b/gdb/testsuite/gdb.btrace/event-tracing.exp
index f41ebdb116e..df4086e0724 100644
--- a/gdb/testsuite/gdb.btrace/event-tracing.exp
+++ b/gdb/testsuite/gdb.btrace/event-tracing.exp
@@ -22,11 +22,11 @@ require allow_btrace_pt_event_trace_tests
 standard_testfile null-deref.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set record btrace pt event-tracing on"
diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp
index 2ad6bbcdbe7..cf92dfa4a3e 100644
--- a/gdb/testsuite/gdb.btrace/exception.exp
+++ b/gdb/testsuite/gdb.btrace/exception.exp
@@ -24,11 +24,11 @@ require allow_btrace_tests
 standard_testfile exception.cc
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {nopie c++ debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # we want to see the full trace for this test
diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp
index a8706a9e608..15098e32016 100644
--- a/gdb/testsuite/gdb.btrace/function_call_history.exp
+++ b/gdb/testsuite/gdb.btrace/function_call_history.exp
@@ -23,11 +23,11 @@ require allow_btrace_tests
 # PIE on 32-bit.
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile {} {nopie debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # start btrace
@@ -227,7 +227,7 @@ gdb_test "record function-call-history /c 21, +11" [multi_line \
 
 # make sure we can handle incomplete trace with respect to indentation
 if {![runto_main]} {
-    return -1
+    return
 }
 # navigate to the fib in line 24 above
 gdb_breakpoint fib
diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/gcore.exp
index 6a8730c53a7..d1766f5a5b9 100644
--- a/gdb/testsuite/gdb.btrace/gcore.exp
+++ b/gdb/testsuite/gdb.btrace/gcore.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # trace the call to the test function
diff --git a/gdb/testsuite/gdb.btrace/instruction_history.exp b/gdb/testsuite/gdb.btrace/instruction_history.exp
index f61f5786cb2..fc8bf8f0f4b 100644
--- a/gdb/testsuite/gdb.btrace/instruction_history.exp
+++ b/gdb/testsuite/gdb.btrace/instruction_history.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile .c .S
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # set bp before loop and continue
diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gdb.btrace/multi-inferior.exp
index 50a3df416d4..ff338c21a35 100644
--- a/gdb/testsuite/gdb.btrace/multi-inferior.exp
+++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp
@@ -31,14 +31,14 @@ require !use_gdb_stub
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile {} {debug}]} {
-    return -1
+    return
 }
 
 set host_binfile [gdb_remote_download host $binfile]
 
 with_test_prefix "inferior 1" {
     if {![runto_main]} {
-	return -1
+	return
     }
 }
 
@@ -48,7 +48,7 @@ with_test_prefix "inferior 2" {
     gdb_test "inferior 2" "Switching to inferior 2.*"
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "record btrace"
diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
index 2b851c415f8..ee43cfcf209 100644
--- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp
+++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
@@ -22,12 +22,12 @@ require allow_btrace_tests
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
     untested "failed to prepare"
-    return -1
+    return
 }
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # set up breakpoints
diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp
index b2c53caa164..50587954165 100644
--- a/gdb/testsuite/gdb.btrace/nohist.exp
+++ b/gdb/testsuite/gdb.btrace/nohist.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 proc check_not_replaying {} {
diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
index 7f9050753cc..c27eab81450 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -20,7 +20,7 @@ require allow_btrace_tests
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
     untested "failed to prepare"
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
@@ -29,7 +29,7 @@ save_vars { GDBFLAGS } {
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # set up breakpoints
diff --git a/gdb/testsuite/gdb.btrace/ptwrite.exp b/gdb/testsuite/gdb.btrace/ptwrite.exp
index b440bd12e7c..344683ca0b8 100644
--- a/gdb/testsuite/gdb.btrace/ptwrite.exp
+++ b/gdb/testsuite/gdb.btrace/ptwrite.exp
@@ -33,16 +33,16 @@ if {[info exists COMPILE]} {
     }
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
     untested "failed to run to main"
-    return -1
+    return
 }
 
 ### 1. Default testrun
diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp
index 0acb0a794ed..0a00c6aff40 100644
--- a/gdb/testsuite/gdb.btrace/reconnect.exp
+++ b/gdb/testsuite/gdb.btrace/reconnect.exp
@@ -24,7 +24,7 @@ require allow_gdbserver_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 set target_binfile [gdb_remote_download target $binfile]
diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/gdb.btrace/record_goto-step.exp
index 155d0dfc3e7..f699fd9c823 100644
--- a/gdb/testsuite/gdb.btrace/record_goto-step.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set bp [gdb_get_line_number "fun4.3" $srcfile]
diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp
index 1c8898bdf68..f66d0789439 100644
--- a/gdb/testsuite/gdb.btrace/record_goto.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto.exp
@@ -40,15 +40,15 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # When GDB prints the file for a stop location, it may print the full path
diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
index e72107df4c3..95454353298 100644
--- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
+++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
@@ -26,11 +26,11 @@ require allow_btrace_tests
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug ldflags=-Wl,-z,lazy}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # trace the code for the call to test
diff --git a/gdb/testsuite/gdb.btrace/segv.exp b/gdb/testsuite/gdb.btrace/segv.exp
index 499d641c7e5..e21aecea9d8 100644
--- a/gdb/testsuite/gdb.btrace/segv.exp
+++ b/gdb/testsuite/gdb.btrace/segv.exp
@@ -21,10 +21,10 @@ require allow_btrace_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # trace the test code
diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/step.exp
index ba7aefd8112..4ba763db018 100644
--- a/gdb/testsuite/gdb.btrace/step.exp
+++ b/gdb/testsuite/gdb.btrace/step.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
 
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Trace the call to the test function.
diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp
index 86035f9cdc5..2f0162d6aa4 100644
--- a/gdb/testsuite/gdb.btrace/stepi.exp
+++ b/gdb/testsuite/gdb.btrace/stepi.exp
@@ -38,15 +38,15 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.btrace/tailcall-only.exp b/gdb/testsuite/gdb.btrace/tailcall-only.exp
index f26055fb2fd..5e69f111109 100644
--- a/gdb/testsuite/gdb.btrace/tailcall-only.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp
@@ -42,15 +42,15 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # we want to see the full trace for this test
diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp
index 4a940c1d9e7..b52024c3f82 100644
--- a/gdb/testsuite/gdb.btrace/tailcall.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall.exp
@@ -39,14 +39,14 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # When GDB prints the file for a stop location, it may print the full path
diff --git a/gdb/testsuite/gdb.btrace/tsx.exp b/gdb/testsuite/gdb.btrace/tsx.exp
index 4aaf2301994..84980bafb81 100644
--- a/gdb/testsuite/gdb.btrace/tsx.exp
+++ b/gdb/testsuite/gdb.btrace/tsx.exp
@@ -19,11 +19,11 @@ require allow_btrace_pt_tests allow_tsx_tests
 
 standard_testfile .c x86-tsx.S
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # record the test
diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite/gdb.btrace/unknown_functions.exp
index c6037c153ae..a3c891d1a35 100644
--- a/gdb/testsuite/gdb.btrace/unknown_functions.exp
+++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp
@@ -27,11 +27,11 @@ standard_testfile
 # Also discard local symbols.
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {ldflags=-Wl,-x nopie}]} {
-    return -1
+    return
 }
 
 if {![runto test]} {
-    return -1
+    return
 }
 
 # we want to see the full trace for this test
diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp
index cd5d4aad8f9..d21290b38a9 100644
--- a/gdb/testsuite/gdb.btrace/vdso.exp
+++ b/gdb/testsuite/gdb.btrace/vdso.exp
@@ -24,11 +24,11 @@ require allow_btrace_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # capture the disassembly of gettimeofday while live debugging
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp b/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
index 06c66ff2603..29646000e51 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 # Reminder, "var" is an integer; all these types get converted to `int'.
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
index c38819e2932..23b03b4d7f6 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
@@ -27,15 +27,15 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++ additional_flags=-std=c++11}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp b/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
index 9ae68235a7c..2bf0a5dec68 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-member.exp b/gdb/testsuite/gdb.compile/compile-cplus-member.exp
index 649ac46e24f..a499fcb2ba6 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-member.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-member.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-method.exp b/gdb/testsuite/gdb.compile/compile-cplus-method.exp
index 8760aab0e6b..a14e71b4ba3 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-method.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-method.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp b/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
index ac5913718a1..bc3d71a2478 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp b/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
index 941a17a3688..c63f008ac0c 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-print.exp b/gdb/testsuite/gdb.compile/compile-cplus-print.exp
index 9e809aa957a..9ad61184691 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-print.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-print.exp
@@ -32,17 +32,17 @@ set srcfilesoptions [list ${srcfile} ${options}]
 
 if { [build_executable_from_specs $testfile.exp $testfile $options \
 	  {*}$srcfilesoptions] } {
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language c++" \
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp b/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
index 117b353a87d..2f19abcf9e7 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
 
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus.exp b/gdb/testsuite/gdb.compile/compile-cplus.exp
index 443a2e89a92..80967915301 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus.exp
@@ -42,7 +42,7 @@ lappend srcfilesoptions $srcfile4 $srcfile4options
 
 if { [build_executable_from_specs $testfile.exp $testfile $options \
 	  {*}$srcfilesoptions] } {
-    return -1
+    return
 }
 
 clean_restart ${testfile}
@@ -55,14 +55,14 @@ gdb_test_no_output "set language c++" \
     "Set language to C++"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
 
 if {[skip_compile_feature_untested "var = 0"]} {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.compile/compile-ifunc.exp b/gdb/testsuite/gdb.compile/compile-ifunc.exp
index 024c37e42a2..e1cc7aee211 100644
--- a/gdb/testsuite/gdb.compile/compile-ifunc.exp
+++ b/gdb/testsuite/gdb.compile/compile-ifunc.exp
@@ -32,11 +32,11 @@ with_test_prefix "nodebug" {
 
     if { [prepare_for_testing "failed to prepare" "$testfile-nodebug" \
 	      $srcfile $flags] } {
-	return -1
+	return
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     # This binary has no debug information, so force the language to C in case
@@ -46,7 +46,7 @@ with_test_prefix "nodebug" {
     gdb_test_no_output "set language c" ""
 
     if {[skip_compile_feature_untested]} {
-	return -1
+	return
     }
 
     gdb_test "compile code resultvar = gnu_ifunc (10);" \
@@ -62,11 +62,11 @@ with_test_prefix "debug" {
 
     if { [prepare_for_testing "failed to prepare" "$testfile-debug" \
 	      $srcfile "debug $flags"] } {
-	return -1
+	return
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
     # gnu_ifunc (10): error: too many arguments to function 'gnu_ifunc'
     gdb_test "compile code resultvar = gnu_ifunc_alias (10);" \
diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.compile/compile-ops.exp
index 7ea2bb17f6a..c5c921f8b04 100644
--- a/gdb/testsuite/gdb.compile/compile-ops.exp
+++ b/gdb/testsuite/gdb.compile/compile-ops.exp
@@ -358,7 +358,7 @@ set program [subst_vars {
 }]
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # Make some DWARF for the test.
@@ -413,15 +413,15 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto func]} {
-    return -1
+    return
 }
 
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
 
 # If we have a bug, this will hang.
diff --git a/gdb/testsuite/gdb.compile/compile-print.exp b/gdb/testsuite/gdb.compile/compile-print.exp
index 77bf7d894d2..a65096a663e 100644
--- a/gdb/testsuite/gdb.compile/compile-print.exp
+++ b/gdb/testsuite/gdb.compile/compile-print.exp
@@ -22,15 +22,15 @@ require is_c_compiler_gcc
 require allow_compile_tests
 
 if { [prepare_for_testing "failed to prepare" "$testfile"] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
 
 gdb_test "compile print varint" " = 10"
diff --git a/gdb/testsuite/gdb.compile/compile-setjmp.exp b/gdb/testsuite/gdb.compile/compile-setjmp.exp
index d4b17bfc996..9d2c47f7bc8 100644
--- a/gdb/testsuite/gdb.compile/compile-setjmp.exp
+++ b/gdb/testsuite/gdb.compile/compile-setjmp.exp
@@ -22,15 +22,15 @@ require is_c_compiler_gcc
 require allow_compile_tests
 
 if { [prepare_for_testing "failed to prepare" $testfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "compile file -r ${srcdir}/${subdir}/$srcfile2" \
diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.compile/compile-tls.exp
index 7685d97a118..d18ef837996 100644
--- a/gdb/testsuite/gdb.compile/compile-tls.exp
+++ b/gdb/testsuite/gdb.compile/compile-tls.exp
@@ -23,7 +23,7 @@ require allow_compile_tests
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
@@ -32,7 +32,7 @@ if {![runto_main]} {
 }
 
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
 
 gdb_test "compile code local_scope = 1" \
diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp
index 0522c3c3770..4429f653a63 100644
--- a/gdb/testsuite/gdb.compile/compile.exp
+++ b/gdb/testsuite/gdb.compile/compile.exp
@@ -34,7 +34,7 @@ if { $srcfile3 != "" } {
 lappend srcfilesoptions $srcfile4 "nodebug"
 if { [build_executable_from_specs $testfile.exp $testfile $options \
 	  {*}$srcfilesoptions] } {
-    return -1
+    return
 }
 
 clean_restart ${testfile}
@@ -55,11 +55,11 @@ gdb_test "compile file -r ${srcdir}/${subdir}/${testfile}-mod.c" \
     "test compile file command without running inferior"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
 
 #
@@ -386,14 +386,14 @@ set binfile [standard_output_file $testfile]
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} $libbin {debug}] != ""
      || [gdb_compile ${srcdir}/${subdir}/${srcfile} $binfile executable \
 	     [list debug shlib=$libbin]] == -1 } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 gdb_load_shlib $libbin
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "compile code shlib_func ();" "call shared library function"
diff --git a/gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp b/gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp
index 020d1742529..b3d2b3583d7 100644
--- a/gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp
+++ b/gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp
@@ -27,21 +27,21 @@ set opts {}
 lappend opts debug
 if { [gdb_compile $s1 ${objfile} object $opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set opts {}
 lappend opts "additional_flags=-gctf"
 if { [gdb_compile $s2 ${objfile2} object $opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set opts {}
 lappend opts "additional_flags=-Wl,-ctf-variables"
 if { [gdb_compile [list ${objfile} ${objfile2}] $binfile executable $opts] != "" } {
     unsupported "failed to link"
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dap/catch-unhandled.exp b/gdb/testsuite/gdb.dap/catch-unhandled.exp
index fae071a11ac..399d73c914a 100644
--- a/gdb/testsuite/gdb.dap/catch-unhandled.exp
+++ b/gdb/testsuite/gdb.dap/catch-unhandled.exp
@@ -21,7 +21,7 @@ require allow_ada_tests allow_dap_tests gnat_runtime_has_debug_info
 standard_ada_testfile prog
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
-    return -1
+    return
 }
 
 if {[dap_initialize] == ""} {
diff --git a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
index 4fabc9931b4..eae60901329 100644
--- a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
+++ b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
@@ -27,7 +27,7 @@ require allow_debuginfod_tests
 
 if {[build_executable "build executable" ${testfile} ${srcfile} \
 	 {debug build-id}] == -1} {
-    return -1
+    return
 }
 
 # Split debug information from BINFILE into BINFILE.debug.
@@ -37,7 +37,7 @@ if {[build_executable "build executable" ${testfile} ${srcfile} \
 # information by GDB will need to be done based on the build-id.
 if {[gdb_gnu_strip_debug $binfile no-debuglink]} {
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
 
 # Get the .build-id/PREFIX/SUFFIX.debug file name, and convert it to
diff --git a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
index ce154044a38..35f91bff261 100644
--- a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
+++ b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
@@ -28,7 +28,7 @@ require allow_debuginfod_tests
 
 if {[build_executable "build executable" $testfile $srcfile debug] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # The procedure gdb_gnu_strip_debug will produce an executable called
@@ -38,7 +38,7 @@ if {[build_executable "build executable" $testfile $srcfile debug] == -1} {
 if {[gdb_gnu_strip_debug $binfile]} {
     # Check that you have a recent version of strip and objcopy installed.
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
 
 set debugfile [standard_output_file ${testfile}.debug]
diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
index 6a79ceaa606..e7c2f524abe 100644
--- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
@@ -29,17 +29,17 @@ set outputdir [standard_output_file {}]
 if { [catch {file copy -force ${srcdir}/${subdir}/${srcfile} \
 	     [standard_output_file ${sourcetmp}]}] != 0 } {
     error "create temporary file"
-    return -1
+    return
 }
 
 if { [gdb_compile "$sourcetmp" "$binfile" executable {debug build-id}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if { [gdb_compile "$sourcetmp" "${binfile}2" executable {debug build-id}] != "" } {
     fail "compile"
-    return -1
+    return
 }
 
 # Write some assembly that just has a .gnu_debugaltlink section.
diff --git a/gdb/testsuite/gdb.disasm/am33.exp b/gdb/testsuite/gdb.disasm/am33.exp
index 878b462754a..32a61a2c1e7 100644
--- a/gdb/testsuite/gdb.disasm/am33.exp
+++ b/gdb/testsuite/gdb.disasm/am33.exp
@@ -24,7 +24,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
      untested "failed to compile"
-     return -1
+     return
 }
 
 proc call_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/basics.exp b/gdb/testsuite/gdb.disasm/basics.exp
index cca864bbbd2..e2596dc5e2c 100644
--- a/gdb/testsuite/gdb.disasm/basics.exp
+++ b/gdb/testsuite/gdb.disasm/basics.exp
@@ -19,11 +19,11 @@
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile ${srcfile}] == -1 } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Check the '/s' and '/m' flags can't be used together.
diff --git a/gdb/testsuite/gdb.disasm/h8300s.exp b/gdb/testsuite/gdb.disasm/h8300s.exp
index b9852454aa4..78e1704b1ca 100644
--- a/gdb/testsuite/gdb.disasm/h8300s.exp
+++ b/gdb/testsuite/gdb.disasm/h8300s.exp
@@ -23,7 +23,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-ms}] != "" } {
      untested "failed to compile"
-     return -1
+     return
 }
 
 proc all_set_machine_h8300s { } {
diff --git a/gdb/testsuite/gdb.disasm/hppa.exp b/gdb/testsuite/gdb.disasm/hppa.exp
index c8e27614cee..957ccb3b1bd 100644
--- a/gdb/testsuite/gdb.disasm/hppa.exp
+++ b/gdb/testsuite/gdb.disasm/hppa.exp
@@ -28,7 +28,7 @@ if  { $comp_output != "" } {
 	return
     } else {
 	perror "Couldn't compile ${srcfile}"
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.disasm/mn10300.exp b/gdb/testsuite/gdb.disasm/mn10300.exp
index 699905ec3b1..75d3df78938 100644
--- a/gdb/testsuite/gdb.disasm/mn10300.exp
+++ b/gdb/testsuite/gdb.disasm/mn10300.exp
@@ -24,7 +24,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
      untested "failed to compile"
-     return -1
+     return
 }
 
 proc add_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/sh3.exp b/gdb/testsuite/gdb.disasm/sh3.exp
index 9873abce9dc..f85594b8ff2 100644
--- a/gdb/testsuite/gdb.disasm/sh3.exp
+++ b/gdb/testsuite/gdb.disasm/sh3.exp
@@ -23,7 +23,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
      untested "failed to compile"
-     return -1
+     return
 }
 
 proc all_fp_move_and_load_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/t01_mov.exp b/gdb/testsuite/gdb.disasm/t01_mov.exp
index 18455eb124c..c344d826a35 100644
--- a/gdb/testsuite/gdb.disasm/t01_mov.exp
+++ b/gdb/testsuite/gdb.disasm/t01_mov.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t02_mova.exp b/gdb/testsuite/gdb.disasm/t02_mova.exp
index 2015c969851..24ae8422c6a 100644
--- a/gdb/testsuite/gdb.disasm/t02_mova.exp
+++ b/gdb/testsuite/gdb.disasm/t02_mova.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t03_add.exp b/gdb/testsuite/gdb.disasm/t03_add.exp
index 34171a0f277..ac3d96dd9b1 100644
--- a/gdb/testsuite/gdb.disasm/t03_add.exp
+++ b/gdb/testsuite/gdb.disasm/t03_add.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t04_sub.exp b/gdb/testsuite/gdb.disasm/t04_sub.exp
index a291220bfd8..917c5c714b7 100644
--- a/gdb/testsuite/gdb.disasm/t04_sub.exp
+++ b/gdb/testsuite/gdb.disasm/t04_sub.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.exp b/gdb/testsuite/gdb.disasm/t05_cmp.exp
index 08a722d0e94..3887e691548 100644
--- a/gdb/testsuite/gdb.disasm/t05_cmp.exp
+++ b/gdb/testsuite/gdb.disasm/t05_cmp.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.exp b/gdb/testsuite/gdb.disasm/t06_ari2.exp
index be9bbf8c9b5..e12db1e908a 100644
--- a/gdb/testsuite/gdb.disasm/t06_ari2.exp
+++ b/gdb/testsuite/gdb.disasm/t06_ari2.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.exp b/gdb/testsuite/gdb.disasm/t07_ari3.exp
index 9b175be2fa9..fb55055f7fc 100644
--- a/gdb/testsuite/gdb.disasm/t07_ari3.exp
+++ b/gdb/testsuite/gdb.disasm/t07_ari3.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t08_or.exp b/gdb/testsuite/gdb.disasm/t08_or.exp
index 3d46ab37fe7..fa083f92a50 100644
--- a/gdb/testsuite/gdb.disasm/t08_or.exp
+++ b/gdb/testsuite/gdb.disasm/t08_or.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t09_xor.exp b/gdb/testsuite/gdb.disasm/t09_xor.exp
index 57622deec96..430ab662ab6 100644
--- a/gdb/testsuite/gdb.disasm/t09_xor.exp
+++ b/gdb/testsuite/gdb.disasm/t09_xor.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t10_and.exp b/gdb/testsuite/gdb.disasm/t10_and.exp
index 2d4dc4376ac..e702ef0c4d3 100644
--- a/gdb/testsuite/gdb.disasm/t10_and.exp
+++ b/gdb/testsuite/gdb.disasm/t10_and.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t11_logs.exp b/gdb/testsuite/gdb.disasm/t11_logs.exp
index 9bdc363e476..fc28e2c4fb7 100644
--- a/gdb/testsuite/gdb.disasm/t11_logs.exp
+++ b/gdb/testsuite/gdb.disasm/t11_logs.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t12_bit.exp b/gdb/testsuite/gdb.disasm/t12_bit.exp
index f1df5a0bd2e..e335f7b30ae 100644
--- a/gdb/testsuite/gdb.disasm/t12_bit.exp
+++ b/gdb/testsuite/gdb.disasm/t12_bit.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t13_otr.exp b/gdb/testsuite/gdb.disasm/t13_otr.exp
index 8ee990ed074..e36b7b492cb 100644
--- a/gdb/testsuite/gdb.disasm/t13_otr.exp
+++ b/gdb/testsuite/gdb.disasm/t13_otr.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} {
      untested "failed to link"
-     return -1
+     return
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.dlang/circular.exp b/gdb/testsuite/gdb.dlang/circular.exp
index 87148e2e0c6..c6c4dcb3af9 100644
--- a/gdb/testsuite/gdb.dlang/circular.exp
+++ b/gdb/testsuite/gdb.dlang/circular.exp
@@ -127,13 +127,13 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language d"
 
 if {![runto "circular1.found"]} {
-    return -1
+    return
 }
 
 # This last test shouldn't timeout.
diff --git a/gdb/testsuite/gdb.dlang/dlang-start-2.exp b/gdb/testsuite/gdb.dlang/dlang-start-2.exp
index 95764e68f35..368db31a015 100644
--- a/gdb/testsuite/gdb.dlang/dlang-start-2.exp
+++ b/gdb/testsuite/gdb.dlang/dlang-start-2.exp
@@ -70,13 +70,13 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 # Verify that "start" lands inside the right procedure.
 if {[gdb_start_cmd] < 0} {
     unsupported "start failed"
-    return -1
+    return
 }
 
 gdb_test "" \
diff --git a/gdb/testsuite/gdb.dlang/dlang-start.exp b/gdb/testsuite/gdb.dlang/dlang-start.exp
index c0eca57cddf..b3271c850b2 100644
--- a/gdb/testsuite/gdb.dlang/dlang-start.exp
+++ b/gdb/testsuite/gdb.dlang/dlang-start.exp
@@ -25,13 +25,13 @@ require !use_gdb_stub
 
 standard_testfile simple.d
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug d}]} {
-    return -1
+    return
 }
 
 # Verify that "start" lands inside the right procedure.
 if {[gdb_start_cmd] < 0} {
     unsupported "start failed"
-    return -1
+    return
 }
 
 gdb_test "" \
diff --git a/gdb/testsuite/gdb.dlang/watch-loc.exp b/gdb/testsuite/gdb.dlang/watch-loc.exp
index 139fe8f0579..b61a444d54f 100644
--- a/gdb/testsuite/gdb.dlang/watch-loc.exp
+++ b/gdb/testsuite/gdb.dlang/watch-loc.exp
@@ -69,13 +69,13 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language d"
 
 if {![runto "_Dmain"]} {
-    return -1
+    return
 }
 
 # watch -l will rewrite the expression to "*(watch.tstruct *) 0x12345",
diff --git a/gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp b/gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp
index c2ca03a6693..38c77084e58 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp
@@ -78,7 +78,7 @@ set obj [standard_output_file "${testfile}-dw.o"]
 if {[build_executable_and_dwo_files "$testfile.exp" "${binfile}" {nodebug} \
 	 [list $asm_file [list nodebug split-dwo] $obj] \
 	 [list $srcfile  [list nodebug]]]} {
-    return -1
+    return
 }
 
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.fortran/allocated.exp b/gdb/testsuite/gdb.fortran/allocated.exp
index 4d3687afeea..bffe33a9289 100644
--- a/gdb/testsuite/gdb.fortran/allocated.exp
+++ b/gdb/testsuite/gdb.fortran/allocated.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/array-bounds-high.exp b/gdb/testsuite/gdb.fortran/array-bounds-high.exp
index 11de8791627..dfa2c88af0b 100644
--- a/gdb/testsuite/gdb.fortran/array-bounds-high.exp
+++ b/gdb/testsuite/gdb.fortran/array-bounds-high.exp
@@ -23,7 +23,7 @@ standard_testfile .f90
 load_lib fortran.exp
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/array-bounds.exp b/gdb/testsuite/gdb.fortran/array-bounds.exp
index 7a5de350430..ef762a9ae14 100644
--- a/gdb/testsuite/gdb.fortran/array-bounds.exp
+++ b/gdb/testsuite/gdb.fortran/array-bounds.exp
@@ -23,7 +23,7 @@ standard_testfile .f90
 load_lib fortran.exp
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gdb.fortran/array-element.exp
index f2ac7c5ce59..78425bde8d5 100644
--- a/gdb/testsuite/gdb.fortran/array-element.exp
+++ b/gdb/testsuite/gdb.fortran/array-element.exp
@@ -23,7 +23,7 @@ require allow_fortran_tests
 standard_testfile .f
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![runto sub_]} {
diff --git a/gdb/testsuite/gdb.fortran/array-no-bounds.exp b/gdb/testsuite/gdb.fortran/array-no-bounds.exp
index b62fde31172..a69a6e4988c 100644
--- a/gdb/testsuite/gdb.fortran/array-no-bounds.exp
+++ b/gdb/testsuite/gdb.fortran/array-no-bounds.exp
@@ -23,7 +23,7 @@ load_lib fortran.exp
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {f90 debug}] } {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/array-slices-bad.exp b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
index c4aa0ec01b4..6547b75c94a 100644
--- a/gdb/testsuite/gdb.fortran/array-slices-bad.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
@@ -22,12 +22,12 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![runto [gdb_get_line_number "First Breakpoint"]]} {
     perror "couldn't run to breakpoint First Breakpoint"
-    return -1
+    return
 }
 
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
index e56b777bad3..53744b5c848 100644
--- a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp
index 84ef464f809..df96c6f46cb 100644
--- a/gdb/testsuite/gdb.fortran/array-slices.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices.exp
@@ -43,7 +43,7 @@ load_lib fortran.exp
 
 if {[build_executable ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 # Takes the name of an array slice as used in the test source, and extracts
diff --git a/gdb/testsuite/gdb.fortran/associated.exp b/gdb/testsuite/gdb.fortran/associated.exp
index 47ad222198e..95e215acb1e 100644
--- a/gdb/testsuite/gdb.fortran/associated.exp
+++ b/gdb/testsuite/gdb.fortran/associated.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/assumedrank.exp b/gdb/testsuite/gdb.fortran/assumedrank.exp
index d8574ebdff9..05091b6b608 100644
--- a/gdb/testsuite/gdb.fortran/assumedrank.exp
+++ b/gdb/testsuite/gdb.fortran/assumedrank.exp
@@ -24,17 +24,17 @@ load_lib fortran.exp
 if { [test_compiler_info {gfortran-*} f90] &&
      ![test_compiler_info {gfortran-1[1-9]-*} f90] } {
     untested "compiler does not support assumed rank"
-    return -1
+    return
 }
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90 dwarf5}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/backtrace.exp b/gdb/testsuite/gdb.fortran/backtrace.exp
index 32adad8dd1b..9bc4cb991aa 100644
--- a/gdb/testsuite/gdb.fortran/backtrace.exp
+++ b/gdb/testsuite/gdb.fortran/backtrace.exp
@@ -20,7 +20,7 @@ load_lib fortran.exp
 standard_testfile .f90
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.fortran/block-data.exp
index 32bd4f3c46c..f15d6ada5e2 100644
--- a/gdb/testsuite/gdb.fortran/block-data.exp
+++ b/gdb/testsuite/gdb.fortran/block-data.exp
@@ -27,11 +27,11 @@ standard_testfile .f
 load_lib "fortran.exp"
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 with_test_prefix "default values" {
diff --git a/gdb/testsuite/gdb.fortran/call-no-debug.exp b/gdb/testsuite/gdb.fortran/call-no-debug.exp
index e3161635536..6ddcf10e411 100644
--- a/gdb/testsuite/gdb.fortran/call-no-debug.exp
+++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile [list debug f90] \
 	      $srcfile [list debug f90] \
 	      $srcfile2 [list nodebug f90]]]} {
-    return -1
+    return
 }
 
 # Find a possibly mangled version of NAME, a function we want to call
@@ -68,7 +68,7 @@ set some_func [find_mangled_name "some_func"]
 set string_func [find_mangled_name "string_func"]
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Call the function SOME_FUNC, that takes a single integer and returns
diff --git a/gdb/testsuite/gdb.fortran/charset.exp b/gdb/testsuite/gdb.fortran/charset.exp
index c73960dd9a6..3dd00fea956 100644
--- a/gdb/testsuite/gdb.fortran/charset.exp
+++ b/gdb/testsuite/gdb.fortran/charset.exp
@@ -23,11 +23,11 @@ load_lib fortran.exp
 
 # Ifx, and ifort do not support kind=4 for CHARACTER.
 if { [test_compiler_info {ifx-*} f90] || [test_compiler_info {ifort-*} f90] } {
-    return -1
+    return
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug additional_flags=-fbackslash f90}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
index ba221cc5038..c6a9e96c63e 100644
--- a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
+++ b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
@@ -23,11 +23,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break Here"]
diff --git a/gdb/testsuite/gdb.fortran/common-block.exp b/gdb/testsuite/gdb.fortran/common-block.exp
index d0d03b395be..07a66b03837 100644
--- a/gdb/testsuite/gdb.fortran/common-block.exp
+++ b/gdb/testsuite/gdb.fortran/common-block.exp
@@ -22,7 +22,7 @@ load_lib "fortran.exp"
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 $srcfile {debug f90 quiet}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/completion.exp b/gdb/testsuite/gdb.fortran/completion.exp
index 17640a9479d..159d92e3a67 100644
--- a/gdb/testsuite/gdb.fortran/completion.exp
+++ b/gdb/testsuite/gdb.fortran/completion.exp
@@ -23,11 +23,11 @@ load_lib completion-support.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 test_gdb_complete_none "p var%x"
diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp
index 39aff4268c9..f0fdc556601 100644
--- a/gdb/testsuite/gdb.fortran/complex.exp
+++ b/gdb/testsuite/gdb.fortran/complex.exp
@@ -19,7 +19,7 @@ load_lib fortran.exp
 require allow_fortran_tests
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/debug-expr.exp b/gdb/testsuite/gdb.fortran/debug-expr.exp
index 4cd78c7d478..85fc5477043 100644
--- a/gdb/testsuite/gdb.fortran/debug-expr.exp
+++ b/gdb/testsuite/gdb.fortran/debug-expr.exp
@@ -25,11 +25,11 @@ standard_testfile .f90
 load_lib fortran.exp
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break Here"]
diff --git a/gdb/testsuite/gdb.fortran/derived-type-function.exp b/gdb/testsuite/gdb.fortran/derived-type-function.exp
index 4551f71a3b8..05eaf6b9761 100644
--- a/gdb/testsuite/gdb.fortran/derived-type-function.exp
+++ b/gdb/testsuite/gdb.fortran/derived-type-function.exp
@@ -24,7 +24,7 @@ standard_testfile .f90
 load_lib fortran.exp
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/derived-type-striding.exp b/gdb/testsuite/gdb.fortran/derived-type-striding.exp
index 322001fc8a3..c17ff946831 100644
--- a/gdb/testsuite/gdb.fortran/derived-type-striding.exp
+++ b/gdb/testsuite/gdb.fortran/derived-type-striding.exp
@@ -26,7 +26,7 @@ set gcc_with_broken_stride [test_compiler_info {gfortran-[89]-*} f90]
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![runto [gdb_get_line_number "post_init"]]} {
diff --git a/gdb/testsuite/gdb.fortran/derived-type.exp b/gdb/testsuite/gdb.fortran/derived-type.exp
index c55ebb338e2..04cab4b1196 100644
--- a/gdb/testsuite/gdb.fortran/derived-type.exp
+++ b/gdb/testsuite/gdb.fortran/derived-type.exp
@@ -24,7 +24,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp b/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
index fc508434f07..70d0ccbfe89 100644
--- a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
+++ b/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
@@ -23,7 +23,7 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/empty-string.exp b/gdb/testsuite/gdb.fortran/empty-string.exp
index f191893c1a8..4a6a9de8194 100644
--- a/gdb/testsuite/gdb.fortran/empty-string.exp
+++ b/gdb/testsuite/gdb.fortran/empty-string.exp
@@ -21,11 +21,11 @@ standard_testfile ".f90"
 load_lib fortran.exp
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.fortran/entry-point.exp b/gdb/testsuite/gdb.fortran/entry-point.exp
index cbdfbf629cf..43b0492cdd3 100644
--- a/gdb/testsuite/gdb.fortran/entry-point.exp
+++ b/gdb/testsuite/gdb.fortran/entry-point.exp
@@ -21,12 +21,12 @@ standard_testfile .f90
 load_lib "fortran.exp"
 
 if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
     untested "could not run to main"
-    return -1
+    return
 }
 
 # Test if we can set a breakpoint via the entry-point name.
diff --git a/gdb/testsuite/gdb.fortran/function-calls.exp b/gdb/testsuite/gdb.fortran/function-calls.exp
index 2b92a793763..2edc4fccbba 100644
--- a/gdb/testsuite/gdb.fortran/function-calls.exp
+++ b/gdb/testsuite/gdb.fortran/function-calls.exp
@@ -21,7 +21,7 @@ require allow_fortran_tests
 standard_testfile ".f90"
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} {
-    return -1
+    return
 }
 
 with_complaints 5 {
diff --git a/gdb/testsuite/gdb.fortran/huge.exp b/gdb/testsuite/gdb.fortran/huge.exp
index f854600d446..07f1fac6ff8 100644
--- a/gdb/testsuite/gdb.fortran/huge.exp
+++ b/gdb/testsuite/gdb.fortran/huge.exp
@@ -53,7 +53,7 @@ clean_restart ${::testfile}
 
 with_timeout_factor 3 {
     if {![fortran_runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set max-value-size unlimited"
diff --git a/gdb/testsuite/gdb.fortran/info-main.exp b/gdb/testsuite/gdb.fortran/info-main.exp
index e21fb4456a6..11a97a9ded1 100644
--- a/gdb/testsuite/gdb.fortran/info-main.exp
+++ b/gdb/testsuite/gdb.fortran/info-main.exp
@@ -23,7 +23,7 @@ save_vars { GDBFLAGS } {
     set GDBFLAGS [string map {"-readnow" ""} "$GDBFLAGS"]
 
     if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} {
-	return -1
+	return
     }
 }
 
@@ -31,7 +31,7 @@ gdb_test "info main" "simple" "info main prior to start"
 
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
 
 gdb_test "info main" "simple" "info main post start"
diff --git a/gdb/testsuite/gdb.fortran/info-modules.exp b/gdb/testsuite/gdb.fortran/info-modules.exp
index 06158f9c674..a1873900910 100644
--- a/gdb/testsuite/gdb.fortran/info-modules.exp
+++ b/gdb/testsuite/gdb.fortran/info-modules.exp
@@ -25,7 +25,7 @@ standard_testfile info-types.f90 info-types-2.f90
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile2 $srcfile] {debug f90}] } {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/info-types.exp b/gdb/testsuite/gdb.fortran/info-types.exp
index 63058ad2852..2a6e6a15988 100644
--- a/gdb/testsuite/gdb.fortran/info-types.exp
+++ b/gdb/testsuite/gdb.fortran/info-types.exp
@@ -24,7 +24,7 @@ standard_testfile info-types.f90 info-types-2.f90
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile2 $srcfile] {debug f90}] } {
-    return -1
+    return
 }
 
 # Don't run to main to avoid increasing the search scope to include
diff --git a/gdb/testsuite/gdb.fortran/intrinsic-precedence.exp b/gdb/testsuite/gdb.fortran/intrinsic-precedence.exp
index f47a3775510..a93d70c2beb 100644
--- a/gdb/testsuite/gdb.fortran/intrinsic-precedence.exp
+++ b/gdb/testsuite/gdb.fortran/intrinsic-precedence.exp
@@ -25,16 +25,16 @@ set lib_flags [list debug]
 set bin_flags [list f90 debug shlib=${binfile_lib}]
 
 if {[gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != "" } {
-    return -1
+    return
 }
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
      ${bin_flags}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "all-assigned"]
diff --git a/gdb/testsuite/gdb.fortran/intrinsics.exp b/gdb/testsuite/gdb.fortran/intrinsics.exp
index 898cab86f8f..a5278700a2b 100644
--- a/gdb/testsuite/gdb.fortran/intrinsics.exp
+++ b/gdb/testsuite/gdb.fortran/intrinsics.exp
@@ -22,7 +22,7 @@ require allow_fortran_tests
 standard_testfile .f90
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/intvar-array.exp b/gdb/testsuite/gdb.fortran/intvar-array.exp
index b454b013991..4d05a6c6bb2 100644
--- a/gdb/testsuite/gdb.fortran/intvar-array.exp
+++ b/gdb/testsuite/gdb.fortran/intvar-array.exp
@@ -22,11 +22,11 @@ load_lib "fortran.exp"
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp b/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
index ba98fec7777..3f47072e11a 100644
--- a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
+++ b/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
@@ -21,11 +21,11 @@ load_lib "fortran.exp"
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
index 6d3c4b98779..c11956ef3c8 100644
--- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp
+++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp
index d2eb95ff3de..b340e401c6f 100644
--- a/gdb/testsuite/gdb.fortran/library-module.exp
+++ b/gdb/testsuite/gdb.fortran/library-module.exp
@@ -23,7 +23,7 @@ set libfile [standard_output_file ${testfile}-lib.so]
 
 if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90}] != "" } {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 # prepare_for_testing cannot be used as linking with $libfile cannot be passed
@@ -32,7 +32,7 @@ if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90
 
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90 shlib=$libfile]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.fortran/limited-length.exp b/gdb/testsuite/gdb.fortran/limited-length.exp
index dbaa7d7afe1..09d14418c2c 100644
--- a/gdb/testsuite/gdb.fortran/limited-length.exp
+++ b/gdb/testsuite/gdb.fortran/limited-length.exp
@@ -22,7 +22,7 @@ require allow_fortran_tests
 standard_testfile .f90
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fortran/logical.exp
index 185d63d1b87..8b6e266746e 100644
--- a/gdb/testsuite/gdb.fortran/logical.exp
+++ b/gdb/testsuite/gdb.fortran/logical.exp
@@ -21,7 +21,7 @@ load_lib fortran.exp
 require allow_fortran_tests
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/max-depth.exp b/gdb/testsuite/gdb.fortran/max-depth.exp
index 5a2abcc5ea5..34623d30606 100644
--- a/gdb/testsuite/gdb.fortran/max-depth.exp
+++ b/gdb/testsuite/gdb.fortran/max-depth.exp
@@ -23,7 +23,7 @@ require allow_fortran_tests
 standard_testfile .f90
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
index 43f77d3eb66..3a8ee17da06 100644
--- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
+++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
@@ -32,7 +32,7 @@ if {[prepare_for_testing_full "failed to prepare" \
 	      $srcfile {debug} \
 	      $srcfile2 {debug c++ additional_flags=-std=c++11} \
 	      $srcfile3 {debug f90}]]} {
-    return -1
+    return
 }
 
 set have_index [exec_has_index_section $binfile]
diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp
index e3b0c95b76f..653d75366cf 100644
--- a/gdb/testsuite/gdb.fortran/module.exp
+++ b/gdb/testsuite/gdb.fortran/module.exp
@@ -20,7 +20,7 @@ require allow_fortran_tests
 standard_testfile .f90
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } {
-    return -1
+    return
 }
 
 # Test automatic language detection before the inferior starts.  It tests the
diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp
index d7df19e98ae..efb0399f454 100644
--- a/gdb/testsuite/gdb.fortran/multi-dim.exp
+++ b/gdb/testsuite/gdb.fortran/multi-dim.exp
@@ -22,7 +22,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug f90}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.fortran/namelist.exp
index 25c9ae920a6..9f1aad15429 100644
--- a/gdb/testsuite/gdb.fortran/namelist.exp
+++ b/gdb/testsuite/gdb.fortran/namelist.exp
@@ -22,7 +22,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
index 84f1d3394f3..a17e48ee57a 100644
--- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
+++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
@@ -22,7 +22,7 @@ standard_testfile ".f90"
 
 if {[build_executable ${testfile}.exp ${testfile} \
 	 ${srcfile} {debug f90}]} {
-    return -1
+    return
 }
 
 set int4 [fortran_int4]
diff --git a/gdb/testsuite/gdb.fortran/nested-funcs.exp b/gdb/testsuite/gdb.fortran/nested-funcs.exp
index 03f3013ea9c..b9f7785e9f1 100644
--- a/gdb/testsuite/gdb.fortran/nested-funcs.exp
+++ b/gdb/testsuite/gdb.fortran/nested-funcs.exp
@@ -22,7 +22,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/oop_extend_type.exp b/gdb/testsuite/gdb.fortran/oop_extend_type.exp
index 070a72a9211..4804228c280 100644
--- a/gdb/testsuite/gdb.fortran/oop_extend_type.exp
+++ b/gdb/testsuite/gdb.fortran/oop_extend_type.exp
@@ -20,12 +20,12 @@ require allow_fortran_tests
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
      {debug f90 quiet}] } {
-	 return -1
+	 return
 }
 
 if {![fortran_runto_main]} {
     perror "could not run to main"
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed differently.
diff --git a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
index 801738b9acc..c987789c09d 100644
--- a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
+++ b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed
diff --git a/gdb/testsuite/gdb.fortran/pointers.exp b/gdb/testsuite/gdb.fortran/pointers.exp
index c5e191af74d..2ef955d9b3e 100644
--- a/gdb/testsuite/gdb.fortran/pointers.exp
+++ b/gdb/testsuite/gdb.fortran/pointers.exp
@@ -18,12 +18,12 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed
diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp
index 78f3b1745da..f674d26ed2a 100644
--- a/gdb/testsuite/gdb.fortran/print-formatted.exp
+++ b/gdb/testsuite/gdb.fortran/print-formatted.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 standard_testfile .f90
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
-    return -1
+    return
 }
 
 gdb_test "next" ".*" "go to the end of the program"
diff --git a/gdb/testsuite/gdb.fortran/print_type.exp b/gdb/testsuite/gdb.fortran/print_type.exp
index a41cc03b4c2..a7df15f3905 100644
--- a/gdb/testsuite/gdb.fortran/print_type.exp
+++ b/gdb/testsuite/gdb.fortran/print_type.exp
@@ -23,11 +23,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed
diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/gdb.fortran/printing-types.exp
index 7e0219ecee7..862101b0d9d 100644
--- a/gdb/testsuite/gdb.fortran/printing-types.exp
+++ b/gdb/testsuite/gdb.fortran/printing-types.exp
@@ -19,11 +19,11 @@ standard_testfile .f90
 load_lib fortran.exp
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "write"]
diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.exp b/gdb/testsuite/gdb.fortran/ptr-indentation.exp
index 5325fb4214e..0748be70ce5 100644
--- a/gdb/testsuite/gdb.fortran/ptr-indentation.exp
+++ b/gdb/testsuite/gdb.fortran/ptr-indentation.exp
@@ -19,11 +19,11 @@ standard_testfile .f90
 load_lib fortran.exp
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 set int [fortran_int4]
diff --git a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp
index 31380592641..35eb900fbab 100644
--- a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp
+++ b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp
@@ -21,7 +21,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/rank.exp b/gdb/testsuite/gdb.fortran/rank.exp
index 61831e91e72..58b1b0d3228 100644
--- a/gdb/testsuite/gdb.fortran/rank.exp
+++ b/gdb/testsuite/gdb.fortran/rank.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/shape.exp b/gdb/testsuite/gdb.fortran/shape.exp
index d52325b5b42..224f9771593 100644
--- a/gdb/testsuite/gdb.fortran/shape.exp
+++ b/gdb/testsuite/gdb.fortran/shape.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp
index f81a1c507d6..243e777b13d 100644
--- a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp
+++ b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp
@@ -22,7 +22,7 @@ require allow_fortran_tests
 standard_testfile ".f90"
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} {
-    return -1
+    return
 }
 
 if {![runto [gdb_get_line_number "post_truth_table_init"]]} {
diff --git a/gdb/testsuite/gdb.fortran/size.exp b/gdb/testsuite/gdb.fortran/size.exp
index c6368d1fdae..1c4dbc2bfd3 100644
--- a/gdb/testsuite/gdb.fortran/size.exp
+++ b/gdb/testsuite/gdb.fortran/size.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint 1"]
diff --git a/gdb/testsuite/gdb.fortran/sizeof.exp b/gdb/testsuite/gdb.fortran/sizeof.exp
index 2d0bf2e732f..2cc5a27ff1e 100644
--- a/gdb/testsuite/gdb.fortran/sizeof.exp
+++ b/gdb/testsuite/gdb.fortran/sizeof.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Test breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/string-types.exp b/gdb/testsuite/gdb.fortran/string-types.exp
index d8a54c66dc9..aa8a0f14a89 100644
--- a/gdb/testsuite/gdb.fortran/string-types.exp
+++ b/gdb/testsuite/gdb.fortran/string-types.exp
@@ -23,7 +23,7 @@ require allow_fortran_tests
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug f90 quiet}]} {
-    return -1
+    return
 }
 
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.fortran/subarray.exp
index f8677168b33..20a60953370 100644
--- a/gdb/testsuite/gdb.fortran/subarray.exp
+++ b/gdb/testsuite/gdb.fortran/subarray.exp
@@ -24,7 +24,7 @@ standard_testfile .f
 load_lib fortran.exp
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
index 91582272356..6ba20822d01 100644
--- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
+++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Check the association status of various types of VLA's
diff --git a/gdb/testsuite/gdb.fortran/vla-array.exp b/gdb/testsuite/gdb.fortran/vla-array.exp
index 9487f1de24e..f36521c4473 100644
--- a/gdb/testsuite/gdb.fortran/vla-array.exp
+++ b/gdb/testsuite/gdb.fortran/vla-array.exp
@@ -20,12 +20,12 @@ require allow_fortran_tests
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}]} {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
 
 # Try to access vla string / vla string array / string array values.
diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
index 1e68fcebd9e..39849d4b5fc 100644
--- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp
+++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
@@ -20,14 +20,14 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 # check that all fortran standard datatypes will be
 # handled correctly when using as VLA's
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed differently.
diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.fortran/vla-history.exp
index 84e769b6112..83a17480b4b 100644
--- a/gdb/testsuite/gdb.fortran/vla-history.exp
+++ b/gdb/testsuite/gdb.fortran/vla-history.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Set some breakpoints and print complete vla.
diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
index 493c1cf6578..1c0db4a69c9 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 set real4 [fortran_real4]
diff --git a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
index c4dc7c2b143..c4828ebe77c 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed differently.
diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp
index 5fc84f8c279..1e9e408529f 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptype.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed differently.
diff --git a/gdb/testsuite/gdb.fortran/vla-sizeof.exp b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
index 559c37b1ad2..8deffbf8b0e 100644
--- a/gdb/testsuite/gdb.fortran/vla-sizeof.exp
+++ b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Try to access values in non allocated VLA
diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp
index c5807a3d3a6..f72f927fc1a 100644
--- a/gdb/testsuite/gdb.fortran/vla-type.exp
+++ b/gdb/testsuite/gdb.fortran/vla-type.exp
@@ -20,7 +20,7 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
      {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 # Depending on the compiler being used, the type names can be printed differently.
@@ -30,7 +30,7 @@ set int [fortran_int4]
 # the debugger when accessing it.
 if {![runto [gdb_get_line_number "before-allocated"]]} {
     perror "couldn't run to breakpoint before-allocated"
-    return -1
+    return
 }
 
 gdb_test "print twov" " = \\\( ivla1 = <not allocated>, ivla2 = <not allocated> \\\)" \
diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
index 26f422f3588..51c88e6cc8f 100644
--- a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Check VLA with arbitrary length and check that elements outside of
diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
index 3bc64612be7..3d0b5ef55bf 100644
--- a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # "up" works with GCC but other Fortran compilers may copy the values into the
diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub.exp b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
index c9e5ac9b817..fe99d5bb0fb 100644
--- a/gdb/testsuite/gdb.fortran/vla-value-sub.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Check the values of VLA's in subroutine can be evaluated correctly
diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp
index ef309f146fe..ac960cd3c92 100644
--- a/gdb/testsuite/gdb.fortran/vla-value.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
      {debug f90 quiet}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
 
 # Depending on the compiler being used,
diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp
index 9e3dfb7b9fc..9f15e8e29b2 100644
--- a/gdb/testsuite/gdb.fortran/whatis_type.exp
+++ b/gdb/testsuite/gdb.fortran/whatis_type.exp
@@ -20,7 +20,7 @@ load_lib "fortran.exp"
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 			  ${srcfile} {debug f90}] } {
-    return -1
+    return
 }
 
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp
index 4bef3232e91..f797c2e09bb 100644
--- a/gdb/testsuite/gdb.go/chan.exp
+++ b/gdb/testsuite/gdb.go/chan.exp
@@ -25,14 +25,14 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
diff --git a/gdb/testsuite/gdb.go/global-local-var-shadow.exp b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
index c79aa389516..7fd9152872e 100644
--- a/gdb/testsuite/gdb.go/global-local-var-shadow.exp
+++ b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
@@ -24,13 +24,13 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 gdb_test_multiple "print st" "print global var st" {
diff --git a/gdb/testsuite/gdb.go/handcall.exp b/gdb/testsuite/gdb.go/handcall.exp
index 6d69ac31d6a..9e1fd8ca2f2 100644
--- a/gdb/testsuite/gdb.go/handcall.exp
+++ b/gdb/testsuite/gdb.go/handcall.exp
@@ -24,11 +24,11 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 gdb_test "print add (1, 2)" " = 3"
diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp
index 7e911b7da99..97e28712ec3 100644
--- a/gdb/testsuite/gdb.go/hello.exp
+++ b/gdb/testsuite/gdb.go/hello.exp
@@ -24,13 +24,13 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp
index 02cb932dfd9..c6d483a1f4d 100644
--- a/gdb/testsuite/gdb.go/integers.exp
+++ b/gdb/testsuite/gdb.go/integers.exp
@@ -24,14 +24,14 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
diff --git a/gdb/testsuite/gdb.go/max-depth.exp b/gdb/testsuite/gdb.go/max-depth.exp
index c0bc9acdd2a..dd4548d2232 100644
--- a/gdb/testsuite/gdb.go/max-depth.exp
+++ b/gdb/testsuite/gdb.go/max-depth.exp
@@ -24,11 +24,11 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp
index 13db8d5773f..b622a9bece4 100644
--- a/gdb/testsuite/gdb.go/methods.exp
+++ b/gdb/testsuite/gdb.go/methods.exp
@@ -24,14 +24,14 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 set bp_location1 {main.T.Foo}
 set bp_location2 {main.T.Bar}
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 set found_wrong_foo 0
diff --git a/gdb/testsuite/gdb.go/no-package.exp b/gdb/testsuite/gdb.go/no-package.exp
index 28b9bab93b7..f42a50243ff 100644
--- a/gdb/testsuite/gdb.go/no-package.exp
+++ b/gdb/testsuite/gdb.go/no-package.exp
@@ -24,7 +24,7 @@ require allow_go_tests support_go_compile !use_gdb_stub
 standard_testfile integers.go
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]} {
-    return -1
+    return
 }
 
 # The bug was that stopping in _start would crash.
diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp
index a1125cbc2d6..75624217f5a 100644
--- a/gdb/testsuite/gdb.go/package.exp
+++ b/gdb/testsuite/gdb.go/package.exp
@@ -25,18 +25,18 @@ standard_testfile package1.go package2.go
 
 if  { [gdb_compile "${srcdir}/${subdir}/${testfile}2.go" "${binfile}2.o" object {debug go}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${testfile}1.go ${binfile}2.o" "${binfile}" executable "debug go libdir=[standard_output_file {}]"] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 set bp_location1 {package2.Foo}
diff --git a/gdb/testsuite/gdb.go/strings.exp b/gdb/testsuite/gdb.go/strings.exp
index 60db052357f..009b4a0f5b1 100644
--- a/gdb/testsuite/gdb.go/strings.exp
+++ b/gdb/testsuite/gdb.go/strings.exp
@@ -22,11 +22,11 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 gdb_test {print "abc" + "def"} {.* = "abcdef"}
diff --git a/gdb/testsuite/gdb.go/types.exp b/gdb/testsuite/gdb.go/types.exp
index c5c94f3220f..9478b4bef7c 100644
--- a/gdb/testsuite/gdb.go/types.exp
+++ b/gdb/testsuite/gdb.go/types.exp
@@ -24,11 +24,11 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 # It's not clear yet what GCC will emit.
diff --git a/gdb/testsuite/gdb.go/unsafe.exp b/gdb/testsuite/gdb.go/unsafe.exp
index e1f4ca5295c..7519d6fb6da 100644
--- a/gdb/testsuite/gdb.go/unsafe.exp
+++ b/gdb/testsuite/gdb.go/unsafe.exp
@@ -24,11 +24,11 @@ require allow_go_tests support_go_compile
 standard_testfile .go
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } {
-    return -1
+    return
 }
 
 if { [go_runto_main] < 0 } {
-    return -1
+    return
 }
 
 gdb_test "print unsafe.Sizeof(42)" ".* = 4"
diff --git a/gdb/testsuite/gdb.modula2/builtin-procedure-adr.exp b/gdb/testsuite/gdb.modula2/builtin-procedure-adr.exp
index c9e43b27333..721f458866f 100644
--- a/gdb/testsuite/gdb.modula2/builtin-procedure-adr.exp
+++ b/gdb/testsuite/gdb.modula2/builtin-procedure-adr.exp
@@ -20,7 +20,7 @@
 standard_testfile unbounded1.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug quiet}]} {
-    return -1
+    return
 }
 
 if {![runto main]} {
diff --git a/gdb/testsuite/gdb.modula2/max-depth.exp b/gdb/testsuite/gdb.modula2/max-depth.exp
index 68d9ff19d54..f034acb769d 100644
--- a/gdb/testsuite/gdb.modula2/max-depth.exp
+++ b/gdb/testsuite/gdb.modula2/max-depth.exp
@@ -18,11 +18,11 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug quiet}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.modula2/multidim.exp b/gdb/testsuite/gdb.modula2/multidim.exp
index 362821ce9c8..4d5a0779986 100644
--- a/gdb/testsuite/gdb.modula2/multidim.exp
+++ b/gdb/testsuite/gdb.modula2/multidim.exp
@@ -21,7 +21,7 @@ standard_testfile multidim.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug quiet}]} {
-    return -1
+    return
 }
 
 if {![runto here]} {
diff --git a/gdb/testsuite/gdb.modula2/unbounded-array.exp b/gdb/testsuite/gdb.modula2/unbounded-array.exp
index 545bc9b08ec..251f2f8efea 100644
--- a/gdb/testsuite/gdb.modula2/unbounded-array.exp
+++ b/gdb/testsuite/gdb.modula2/unbounded-array.exp
@@ -20,7 +20,7 @@
 standard_testfile unbounded1.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug quiet}]} {
-    return -1
+    return
 }
 
 if {![runto foo]} {
diff --git a/gdb/testsuite/gdb.multi/address-space-reset.exp b/gdb/testsuite/gdb.multi/address-space-reset.exp
index 659889719bb..32d9bffff5f 100644
--- a/gdb/testsuite/gdb.multi/address-space-reset.exp
+++ b/gdb/testsuite/gdb.multi/address-space-reset.exp
@@ -26,7 +26,7 @@ standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}]} {
-    return -1
+    return
 }
 
 # Problematic scenario is seen in non-stop mode.
@@ -36,7 +36,7 @@ save_vars {GDBFLAGS} {
 }
 
 if {![runto "breakpoint_1"]} {
-    return -1
+    return
 }
 
 # Start an empty gdbserver in a new inferior.
@@ -46,7 +46,7 @@ gdb_test "inferior 2" "Switching to inferior 2.*"
 set res [gdbserver_start "--multi" ""]
 set gdbserver_gdbport [lindex $res 1]
 if {[gdb_target_cmd "extended-remote" $gdbserver_gdbport]} {
-    return -1
+    return
 }
 
 # Go back to inferior 1.  Continuing should hit the next breakpoint.
diff --git a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp b/gdb/testsuite/gdb.multi/attach-no-multi-process.exp
index c735a641c03..355dbd0fa3d 100644
--- a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp
+++ b/gdb/testsuite/gdb.multi/attach-no-multi-process.exp
@@ -27,7 +27,7 @@ require allow_gdbserver_tests
 require can_spawn_for_attach
 
 if {[build_executable "build" $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 proc test {target_non_stop} {
diff --git a/gdb/testsuite/gdb.multi/base.exp b/gdb/testsuite/gdb.multi/base.exp
index c2403765986..1f1fca0ad76 100644
--- a/gdb/testsuite/gdb.multi/base.exp
+++ b/gdb/testsuite/gdb.multi/base.exp
@@ -31,15 +31,15 @@ set srcfile3 ${exec3}.c
 set binfile3 [standard_output_file ${exec3}]
 
 if { [build_executable ${testfile}.exp ${exec1} "${srcfile1}" {debug}] == -1 } {
-    return -1
+    return
 }
 
 if { [build_executable ${testfile}.exp ${exec2} "${srcfile2}" {debug}] == -1} {
-    return -1
+    return
 }
 
 if { [build_executable ${testfile}.exp ${exec3} "${srcfile3}" {debug}] == -1 } {
-    return -1
+    return
 }
 
 clean_restart ${exec1}
@@ -155,7 +155,7 @@ gdb_test "list commonfun" "from goodbye.*" "list commonfun in goodbye"
 gdb_test "inferior 1" ".*" "switch to inferior 1 to run it"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "break hello" ".*"
diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
index 5c491e2607d..277cd329c44 100644
--- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
+++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
@@ -34,11 +34,11 @@ set binfile2 [standard_output_file ${exec2}]
 set compile_options {debug}
 
 if { [build_executable ${testfile}.exp ${exec1} "${srcfile1}" $compile_options] == -1 } {
-    return -1
+    return
 }
 
 if { [build_executable ${testfile}.exp ${exec2} "${srcfile2}" $compile_options] == -1 } {
-    return -1
+    return
 }
 
 # Start with a fresh gdb
diff --git a/gdb/testsuite/gdb.multi/bp-thread-specific.exp b/gdb/testsuite/gdb.multi/bp-thread-specific.exp
index 74461ca51e4..e55ac4919f4 100644
--- a/gdb/testsuite/gdb.multi/bp-thread-specific.exp
+++ b/gdb/testsuite/gdb.multi/bp-thread-specific.exp
@@ -27,11 +27,11 @@ require !use_gdb_stub
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 delete_breakpoints
@@ -62,7 +62,7 @@ gdb_test "info breakpoints" \
     "check thread b/p on main still has updated correctly"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "info threads" \
diff --git a/gdb/testsuite/gdb.multi/checkpoint-multi.exp b/gdb/testsuite/gdb.multi/checkpoint-multi.exp
index 532c5fda11b..b847d06b5e0 100644
--- a/gdb/testsuite/gdb.multi/checkpoint-multi.exp
+++ b/gdb/testsuite/gdb.multi/checkpoint-multi.exp
@@ -45,15 +45,15 @@ set srcfile3 ${exec3}.c
 set binfile3 [standard_output_file ${exec3}]
 
 if { [build_executable ${testfile}.exp ${exec1} "${srcfile1}" {debug}] == -1 } {
-    return -1
+    return
 }
 
 if { [build_executable ${testfile}.exp ${exec2} "${srcfile2}" {debug}] == -1 } {
-    return -1
+    return
 }
 
 if { [build_executable ${testfile}.exp ${exec3} "${srcfile3}" {debug}] == -1 } {
-    return -1
+    return
 }
 
 # Start two inferiors, place a checkpoint on inferior 2, but switch
diff --git a/gdb/testsuite/gdb.multi/detach-stepi.exp b/gdb/testsuite/gdb.multi/detach-stepi.exp
index 74beb022bfd..44c10ddebed 100644
--- a/gdb/testsuite/gdb.multi/detach-stepi.exp
+++ b/gdb/testsuite/gdb.multi/detach-stepi.exp
@@ -24,11 +24,11 @@ standard_testfile
 require allow_multi_inferior_tests
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 delete_breakpoints
@@ -41,7 +41,7 @@ gdb_test "inferior 2" "Switching to inferior .*" \
 
 gdb_load $binfile
 if {![runto "a_function"]} {
-    return -1
+    return
 }
 
 gdb_test "info inferiors" ".*" "info inferiors for logging"
diff --git a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
index 161437d0d0f..d964c89bdbc 100644
--- a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
+++ b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
@@ -22,7 +22,7 @@ require !use_gdb_stub
 require allow_multi_inferior_tests
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 # Inferior 1 stops at f1.
diff --git a/gdb/testsuite/gdb.multi/gdb-settings.exp b/gdb/testsuite/gdb.multi/gdb-settings.exp
index 75670a6ad11..d5eb2f7b5fa 100644
--- a/gdb/testsuite/gdb.multi/gdb-settings.exp
+++ b/gdb/testsuite/gdb.multi/gdb-settings.exp
@@ -24,7 +24,7 @@ load_lib gdb-guile.exp
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 # Cache whether we can run Python and/or Guile tests.
@@ -53,7 +53,7 @@ foreach_with_prefix inf $inferiors {
 
     if { $run } {
 	if { ![runto_main] } {
-	    return -1
+	    return
 	}
     }
 }
diff --git a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp
index fc756a83252..f974797a693 100644
--- a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp
+++ b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp
@@ -28,11 +28,11 @@ set binfile1 [standard_output_file $testfile1]
 set binfile2 [standard_output_file $testfile2]
 
 if {[build_executable ${testfile}.exp ${binfile1} "${srcfile1}"] != 0} {
-    return -1
+    return
 }
 
 if {[build_executable ${testfile}.exp ${binfile2} "${srcfile2}"] != 0} {
-    return -1
+    return
 }
 
 # Start the first inferior.
diff --git a/gdb/testsuite/gdb.multi/info-threads.exp b/gdb/testsuite/gdb.multi/info-threads.exp
index cd2fd03f0ee..fe5611ca94f 100644
--- a/gdb/testsuite/gdb.multi/info-threads.exp
+++ b/gdb/testsuite/gdb.multi/info-threads.exp
@@ -21,11 +21,11 @@
 standard_testfile hello.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {pthreads debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Add another inferior.
diff --git a/gdb/testsuite/gdb.multi/multi-arch.exp b/gdb/testsuite/gdb.multi/multi-arch.exp
index 39da75507e9..b498da7ff71 100644
--- a/gdb/testsuite/gdb.multi/multi-arch.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch.exp
@@ -62,7 +62,7 @@ if { $march2 != "" } {
 
 if { [build_executable "failed to prepare" ${exec1} "${srcfile1}" \
 	  [list debug additional_flags=${march1}]] } {
-    return -1
+    return
 }
 
 set options [list debug]
@@ -72,7 +72,7 @@ if {[istarget "aarch64*-*-*"]} {
 	lappend options "compiler=[arm_cc_for_target]"
     } else {
 	unsupported "ARM compiler is not known"
-	return -1
+	return
     }
 } else {
     lappend options "additional_flags=${march2}"
@@ -80,7 +80,7 @@ if {[istarget "aarch64*-*-*"]} {
 
 if { [build_executable "failed to prepare" ${exec2} "${srcfile2}" \
 	 $options]} {
-    return -1
+    return
 }
 
 # Start inferior 1
diff --git a/gdb/testsuite/gdb.multi/multi-attach.exp b/gdb/testsuite/gdb.multi/multi-attach.exp
index 453c9fe7cc3..03a30446129 100644
--- a/gdb/testsuite/gdb.multi/multi-attach.exp
+++ b/gdb/testsuite/gdb.multi/multi-attach.exp
@@ -24,7 +24,7 @@ standard_testfile
 require can_spawn_for_attach
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 # Start the programs running and then wait for a bit, to be sure that
diff --git a/gdb/testsuite/gdb.multi/multi-exit.exp b/gdb/testsuite/gdb.multi/multi-exit.exp
index 1ebf4b32208..c2492c6d090 100644
--- a/gdb/testsuite/gdb.multi/multi-exit.exp
+++ b/gdb/testsuite/gdb.multi/multi-exit.exp
@@ -29,7 +29,7 @@ require allow_multi_inferior_tests
 require !use_gdb_stub
 
 if {[build_executable "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 # We are testing GDB's ability to stop all threads.
@@ -70,7 +70,7 @@ set NUM_INFS 10
 
 for {set i 1} {$i <= $NUM_INFS} {incr i} {
     if {[start_inferior $i] < 0} {
-	return -1
+	return
     }
 }
 
@@ -92,7 +92,7 @@ for {set i 1} {$i <= $NUM_INFS} {incr i} {
 	}
 
 	if {$live_inferior == ""} {
-	    return -1
+	    return
 	}
 
 	gdb_test "inferior $live_inferior" \
@@ -111,7 +111,7 @@ for {set i 1} {$i <= $NUM_INFS} {incr i} {
 	}
 
 	if {$exited_inferior == ""} {
-	    return -1
+	    return
 	}
     }
 }
diff --git a/gdb/testsuite/gdb.multi/multi-kill.exp b/gdb/testsuite/gdb.multi/multi-kill.exp
index 6ed0230010d..3ede21fe7e9 100644
--- a/gdb/testsuite/gdb.multi/multi-kill.exp
+++ b/gdb/testsuite/gdb.multi/multi-kill.exp
@@ -29,7 +29,7 @@ require allow_multi_inferior_tests
 require !use_gdb_stub
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 # We are testing GDB's ability to stop all threads.
@@ -83,7 +83,7 @@ array set testpid {}
 
 for {set i 1} {$i <= $NUM_INFS} {incr i} {
     if {[start_inferior $i] < 0} {
-	return -1
+	return
     }
 }
 
@@ -123,7 +123,7 @@ for {set i 2} {$i <= $NUM_INFS} {incr i} {
 	}
 
 	if {$live_inferior == ""} {
-	    return -1
+	    return
 	}
 
 	gdb_test "inferior $live_inferior" \
diff --git a/gdb/testsuite/gdb.multi/multi-re-run.exp b/gdb/testsuite/gdb.multi/multi-re-run.exp
index 8dbde3acfff..067dab89009 100644
--- a/gdb/testsuite/gdb.multi/multi-re-run.exp
+++ b/gdb/testsuite/gdb.multi/multi-re-run.exp
@@ -35,14 +35,14 @@ set binfile2 [standard_output_file $testfile2]
 with_test_prefix "exec1" {
     if { [build_executable "failed to prepare" $testfile1 $srcfile1 \
 	      [list pthreads debug]] } {
-	return -1
+	return
     }
 }
 
 with_test_prefix "exec2" {
     if { [build_executable "failed to prepare" $testfile2 $srcfile2 \
 	      [list pthreads debug]] } {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp
index 44ad86eb907..127e95db8b7 100644
--- a/gdb/testsuite/gdb.multi/multi-term-settings.exp
+++ b/gdb/testsuite/gdb.multi/multi-term-settings.exp
@@ -30,7 +30,7 @@ require allow_multi_inferior_tests
 require can_spawn_for_attach
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 # Start the programs running and then wait for a bit, to be sure that
diff --git a/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp
index ff2bcc87ca7..26b1bc14830 100644
--- a/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp
+++ b/gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp
@@ -28,7 +28,7 @@ require !use_gdb_stub
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 # Setup for the tests.  Create two inferiors, both running the global
diff --git a/gdb/testsuite/gdb.multi/pending-bp.exp b/gdb/testsuite/gdb.multi/pending-bp.exp
index 808bd4c5d83..a9b7d7e6c66 100644
--- a/gdb/testsuite/gdb.multi/pending-bp.exp
+++ b/gdb/testsuite/gdb.multi/pending-bp.exp
@@ -25,7 +25,7 @@ set binfile_lib [standard_output_file $libname.so]
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] != "" } {
     untested "failed to compile shared library 1"
-    return -1
+    return
 }
 
 set binfile_lib_target [gdb_download_shlib $binfile_lib]
@@ -34,7 +34,7 @@ if { [build_executable "failed to prepare" $testfile $srcfile \
 	  [list debug \
 	       additional_flags=-DSHLIB_NAME=\"$binfile_lib_target\" \
 	       shlib_load]] } {
-    return -1
+    return
 }
 
 # Start two inferiors, both running the same test binary.  The arguments
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index c991ea59193..ae2ecdffb83 100644
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -16,7 +16,7 @@
 standard_testfile
 
 if { [build_executable ${testfile}.exp ${binfile} "${srcfile}" {debug}] != 0 } {
-    return -1
+    return
 }
 
 proc switch_to_inferior { num message } {
diff --git a/gdb/testsuite/gdb.multi/run-only-second-inf.exp b/gdb/testsuite/gdb.multi/run-only-second-inf.exp
index a167de81491..73e3437c25d 100644
--- a/gdb/testsuite/gdb.multi/run-only-second-inf.exp
+++ b/gdb/testsuite/gdb.multi/run-only-second-inf.exp
@@ -23,7 +23,7 @@ standard_testfile
 require !use_gdb_stub
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 # Setting the target to non-stop mode revealed a bug where the context
diff --git a/gdb/testsuite/gdb.multi/start-inferior-specific.exp b/gdb/testsuite/gdb.multi/start-inferior-specific.exp
index 47cffd0afb9..f734aa9f22c 100644
--- a/gdb/testsuite/gdb.multi/start-inferior-specific.exp
+++ b/gdb/testsuite/gdb.multi/start-inferior-specific.exp
@@ -34,11 +34,11 @@ set testfile_other $testfile-other
 set binfile_other [standard_output_file $testfile_other]
 
 if { [build_executable ${testfile}.exp ${binfile} "${srcfile}" {debug}] != 0 } {
-    return -1
+    return
 }
 
 if { [build_executable ${testfile}.exp ${binfile_other} "${srcfile_other}" {debug}] != 0 } {
-    return -1
+    return
 }
 
 proc do_test {} {
diff --git a/gdb/testsuite/gdb.multi/stop-all-on-exit.exp b/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
index 3463e897d5f..8c08d2bbbb0 100644
--- a/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
+++ b/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
@@ -31,11 +31,11 @@ if {![gdb_protocol_is_native]} {
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Add a second inferior that will sleep longer.
@@ -43,7 +43,7 @@ gdb_test "add-inferior -exec $binfile" "Added inferior 2.*" \
     "add the second inferior"
 gdb_test "inferior 2" ".*Switching to inferior 2.*"
 if {![runto_main]} {
-    return -1
+    return
 }
 gdb_test "print duration=10" "= 10"
 
diff --git a/gdb/testsuite/gdb.multi/tids-gid-reset.exp b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
index e02884109d1..d6e5d7ed183 100644
--- a/gdb/testsuite/gdb.multi/tids-gid-reset.exp
+++ b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
@@ -24,7 +24,7 @@ standard_testfile
 
 if { [build_executable "failed to prepare" ${testfile} ${srcfile} \
 	  {pthreads debug}] } {
-    return -1
+    return
 }
 
 with_test_prefix "single-inferior" {
@@ -32,7 +32,7 @@ with_test_prefix "single-inferior" {
 	clean_restart ${testfile}
 
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
 
 	gdb_test "info threads -gid" "\\* 1 +1 +.*"
@@ -41,7 +41,7 @@ with_test_prefix "single-inferior" {
     with_test_prefix "restart" {
 	gdb_continue_to_end
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
     }
 
@@ -82,7 +82,7 @@ with_test_prefix "multi-inferior" {
     with_test_prefix "restart" {
 	gdb_continue_to_end
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
     }
 
diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp
index be42fcbffd0..1a1be716d3f 100644
--- a/gdb/testsuite/gdb.multi/tids.exp
+++ b/gdb/testsuite/gdb.multi/tids.exp
@@ -25,11 +25,11 @@ standard_testfile
 require !use_gdb_stub
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {pthreads debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Issue "thread apply TID_LIST p 1234" and expect EXP_TID_LIST (a list
diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
index bf71f11673f..2283d5926aa 100644
--- a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
+++ b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
@@ -22,7 +22,7 @@ require allow_fork_tests
 standard_testfile
 
 if {[build_executable "failed to build" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 # The test proper.  DISPOSE indicates how to dispose of the fork
diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
index a68ece0bdbb..175c3261704 100644
--- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp
+++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
@@ -28,7 +28,7 @@ require allow_hw_watchpoint_access_tests
 
 if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.opencl/callfuncs.exp b/gdb/testsuite/gdb.opencl/callfuncs.exp
index 571f1fcb8bd..7868eb975c3 100644
--- a/gdb/testsuite/gdb.opencl/callfuncs.exp
+++ b/gdb/testsuite/gdb.opencl/callfuncs.exp
@@ -28,7 +28,7 @@ set clprogram [remote_download target $srcdir/$subdir/$srcfile]
 # Compile the generic OpenCL host app
 if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.opencl/convs_casts.exp b/gdb/testsuite/gdb.opencl/convs_casts.exp
index b7173d206f8..40f8952780f 100644
--- a/gdb/testsuite/gdb.opencl/convs_casts.exp
+++ b/gdb/testsuite/gdb.opencl/convs_casts.exp
@@ -27,7 +27,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl]
 # Compile the generic OpenCL host app
 if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Load the OpenCL app
diff --git a/gdb/testsuite/gdb.opencl/datatypes.exp b/gdb/testsuite/gdb.opencl/datatypes.exp
index 73dcb6ed417..965bd5148cd 100644
--- a/gdb/testsuite/gdb.opencl/datatypes.exp
+++ b/gdb/testsuite/gdb.opencl/datatypes.exp
@@ -27,7 +27,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl]
 # Compile the generic OpenCL host app
 if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.opencl/operators.exp b/gdb/testsuite/gdb.opencl/operators.exp
index 92f345251b6..8977d012463 100644
--- a/gdb/testsuite/gdb.opencl/operators.exp
+++ b/gdb/testsuite/gdb.opencl/operators.exp
@@ -27,7 +27,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl]
 # Compile the generic OpenCL host app
 if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Load the OpenCL app
diff --git a/gdb/testsuite/gdb.opencl/vec_comps.exp b/gdb/testsuite/gdb.opencl/vec_comps.exp
index 4c18c8c4041..f6a26d1a670 100644
--- a/gdb/testsuite/gdb.opencl/vec_comps.exp
+++ b/gdb/testsuite/gdb.opencl/vec_comps.exp
@@ -27,7 +27,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl]
 # Compile the generic OpenCL host app
 if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Load the OpenCL app
diff --git a/gdb/testsuite/gdb.opt/break-on-_exit.exp b/gdb/testsuite/gdb.opt/break-on-_exit.exp
index 8ba9267fe25..fa7cd96d61d 100644
--- a/gdb/testsuite/gdb.opt/break-on-_exit.exp
+++ b/gdb/testsuite/gdb.opt/break-on-_exit.exp
@@ -38,14 +38,14 @@ standard_testfile
 # See if we have target board readnow.exp or similar.
 if {[readnow]} {
     untested "--readnever not allowed in combination with --readnow"
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -readnever"
 
     if {[prepare_for_testing "failed to prepare" $testfile $srcfile nodebug]} {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
index f36bb62a78a..5fbfba73351 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
@@ -23,7 +23,7 @@ standard_testfile .c -2.c -3.c
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2 $srcfile3] \
 	 {debug optimize=-O2 nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto start_sequence]} {
diff --git a/gdb/testsuite/gdb.opt/fortran-string.exp b/gdb/testsuite/gdb.opt/fortran-string.exp
index ac0e6f31802..2664a323afe 100644
--- a/gdb/testsuite/gdb.opt/fortran-string.exp
+++ b/gdb/testsuite/gdb.opt/fortran-string.exp
@@ -24,7 +24,7 @@ standard_testfile .f90
 
 if { [prepare_for_testing "prepare for testing" ${testfile} ${srcfile} \
 	  {debug f90 additional_flags=-O1}] } {
-    return -1
+    return
 }
 
 if {![runto f]} {
diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp
index c794aa659b3..e473ec92326 100644
--- a/gdb/testsuite/gdb.opt/inline-break.exp
+++ b/gdb/testsuite/gdb.opt/inline-break.exp
@@ -21,7 +21,7 @@ standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  {debug additional_flags=-Winline}] } {
-    return -1
+    return
 }
 
 # Return a string that may be used to match the output of "info break NUM".
@@ -195,7 +195,7 @@ foreach_with_prefix cmd [list "break" "tbreak"] {
     # Start with a clean state.
     delete_breakpoints
     if {![runto_main]} {
-	return -1
+	return
     }
 
     # Assemble flags to pass to gdb_breakpoint.  Lame but this is just
diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
index 9bfc32f58b3..22a18d94897 100644
--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
+++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
@@ -20,7 +20,7 @@ standard_testfile .c inline-markers.c
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2] {debug additional_flags=-Winline}]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set listsize 1"
diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp
index 6af398e5cf4..3844b7c5149 100644
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -17,7 +17,7 @@ standard_testfile .c inline-markers.c
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2] {debug additional_flags=-Winline}]} {
-    return -1
+    return
 }
 
 runto_main
diff --git a/gdb/testsuite/gdb.opt/inline-small-func.exp b/gdb/testsuite/gdb.opt/inline-small-func.exp
index 9e209f0918e..08aa7e6b6b6 100644
--- a/gdb/testsuite/gdb.opt/inline-small-func.exp
+++ b/gdb/testsuite/gdb.opt/inline-small-func.exp
@@ -38,11 +38,11 @@ standard_testfile inline-small-func.c inline-small-func.h
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile] {debug optimize=-O1}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp
index ecd7cba22e9..117eb318cb3 100644
--- a/gdb/testsuite/gdb.opt/solib-intra-step.exp
+++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp
@@ -31,7 +31,7 @@ set bin_flags [list debug shlib=${binfile_lib}]
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
   untested "failed to compile"
-  return -1
+  return
 }
 
 clean_restart ${::testfile}
diff --git a/gdb/testsuite/gdb.opt/static-optimized-out.exp b/gdb/testsuite/gdb.opt/static-optimized-out.exp
index 92a5d2836d6..dc3d1c5f82e 100644
--- a/gdb/testsuite/gdb.opt/static-optimized-out.exp
+++ b/gdb/testsuite/gdb.opt/static-optimized-out.exp
@@ -24,7 +24,7 @@ lappend opts "optimize=-O2 -flto"
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile $srcfile2] $opts] } {
-    return -1
+    return
 }
 
 set val ""
diff --git a/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp b/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp
index 02139742686..92fb921a5b8 100644
--- a/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp
+++ b/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp
@@ -19,7 +19,7 @@ standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug class]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.pascal/floats.exp b/gdb/testsuite/gdb.pascal/floats.exp
index 86e8852e3d2..74a6ee403d0 100644
--- a/gdb/testsuite/gdb.pascal/floats.exp
+++ b/gdb/testsuite/gdb.pascal/floats.exp
@@ -19,7 +19,7 @@ standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.pascal/gdb11492.exp b/gdb/testsuite/gdb.pascal/gdb11492.exp
index 361c0928b7b..3ca4bd2fce2 100644
--- a/gdb/testsuite/gdb.pascal/gdb11492.exp
+++ b/gdb/testsuite/gdb.pascal/gdb11492.exp
@@ -19,7 +19,7 @@ standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.pascal/hello.exp b/gdb/testsuite/gdb.pascal/hello.exp
index 749b7dbbe39..8e906b4ef27 100644
--- a/gdb/testsuite/gdb.pascal/hello.exp
+++ b/gdb/testsuite/gdb.pascal/hello.exp
@@ -18,7 +18,7 @@ load_lib "pascal.exp"
 standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
+  return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.pascal/integers.exp b/gdb/testsuite/gdb.pascal/integers.exp
index 697c3b971f3..9bc0df0b736 100644
--- a/gdb/testsuite/gdb.pascal/integers.exp
+++ b/gdb/testsuite/gdb.pascal/integers.exp
@@ -18,7 +18,7 @@ load_lib "pascal.exp"
 standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
+  return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.pascal/str-chars.exp b/gdb/testsuite/gdb.pascal/str-chars.exp
index dd72ffc60d1..7f59175e562 100644
--- a/gdb/testsuite/gdb.pascal/str-chars.exp
+++ b/gdb/testsuite/gdb.pascal/str-chars.exp
@@ -18,7 +18,7 @@ load_lib "pascal.exp"
 standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
+  return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.pascal/stub-method.exp b/gdb/testsuite/gdb.pascal/stub-method.exp
index 43874da5089..c414192fe68 100644
--- a/gdb/testsuite/gdb.pascal/stub-method.exp
+++ b/gdb/testsuite/gdb.pascal/stub-method.exp
@@ -21,7 +21,7 @@ load_lib "pascal.exp"
 standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
+  return
 }
 
 # If this fails, the failure will have already been recorded.
diff --git a/gdb/testsuite/gdb.perf/backtrace.exp b/gdb/testsuite/gdb.perf/backtrace.exp
index 2573e529f8a..f6d4d8a6c0d 100644
--- a/gdb/testsuite/gdb.perf/backtrace.exp
+++ b/gdb/testsuite/gdb.perf/backtrace.exp
@@ -40,7 +40,7 @@ PerfTest::assemble {
     lappend compile_flags "additional_flags=-DBACKTRACE_DEPTH=${BACKTRACE_DEPTH}"
 
     if { [gdb_compile "$srcdir/$subdir/$srcfile" ${binfile} executable $compile_flags] != ""} {
-	return -1
+	return
     }
 
     return 0
@@ -50,7 +50,7 @@ PerfTest::assemble {
     clean_restart $::testfile
 
     if ![runto_main] {
-	return -1
+	return
     }
 
     gdb_breakpoint "fun2"
diff --git a/gdb/testsuite/gdb.perf/disassemble.exp b/gdb/testsuite/gdb.perf/disassemble.exp
index c9da08cab44..2e4f4b99fa5 100644
--- a/gdb/testsuite/gdb.perf/disassemble.exp
+++ b/gdb/testsuite/gdb.perf/disassemble.exp
@@ -44,7 +44,7 @@ PerfTest::assemble {
     # we only run to main function of child GDB, so child GDB's
     # prompt can't be printed out.
     if ![runto_main] {
-	return -1
+	return
     }
 
     return 0
diff --git a/gdb/testsuite/gdb.perf/single-step.exp b/gdb/testsuite/gdb.perf/single-step.exp
index 7c9ba607f57..ffbb6dc40b7 100644
--- a/gdb/testsuite/gdb.perf/single-step.exp
+++ b/gdb/testsuite/gdb.perf/single-step.exp
@@ -34,7 +34,7 @@ PerfTest::assemble {
     global srcdir subdir srcfile binfile
 
     if { [gdb_compile "$srcdir/$subdir/$srcfile" ${binfile} executable {debug}] != "" } {
-	return -1
+	return
     }
     return 0
 } {
@@ -42,7 +42,7 @@ PerfTest::assemble {
     clean_restart $::testfile
 
     if ![runto_main] {
-	return -1
+	return
     }
     return 0
 } {
diff --git a/gdb/testsuite/gdb.perf/skip-command.exp b/gdb/testsuite/gdb.perf/skip-command.exp
index 18d9840aec6..95f157941c4 100644
--- a/gdb/testsuite/gdb.perf/skip-command.exp
+++ b/gdb/testsuite/gdb.perf/skip-command.exp
@@ -115,7 +115,7 @@ PerfTest::assemble {
 
     write_skip_func_source $skip_func_file "skip_func" [expr 4 * $SKIP_DIRECTIVE_COUNT]
     if { [gdb_compile [list "$srcdir/$subdir/$srcfile" $skip_func_file] ${binfile} executable {c++ debug}] != "" } {
-	return -1
+	return
     }
     return 0
 } {
diff --git a/gdb/testsuite/gdb.perf/skip-prologue.exp b/gdb/testsuite/gdb.perf/skip-prologue.exp
index d0a3fe36c2b..7810be8a0c0 100644
--- a/gdb/testsuite/gdb.perf/skip-prologue.exp
+++ b/gdb/testsuite/gdb.perf/skip-prologue.exp
@@ -43,7 +43,7 @@ PerfTest::assemble {
 
     if { [gdb_compile "$srcdir/$subdir/$srcfile" ${binfile} executable $opts] != "" } {
 	untested "failed to compile"
-	return -1
+	return
     }
 
     return 0
@@ -54,7 +54,7 @@ PerfTest::assemble {
     clean_restart $::testfile
 
     if ![runto_main] {
-	return -1
+	return
     }
     return 0
 } {
diff --git a/gdb/testsuite/gdb.perf/solib.exp b/gdb/testsuite/gdb.perf/solib.exp
index 0ad4610a202..103e79f2285 100644
--- a/gdb/testsuite/gdb.perf/solib.exp
+++ b/gdb/testsuite/gdb.perf/solib.exp
@@ -50,7 +50,7 @@ PerfTest::assemble {
 
 	# Compile.
 	if { [gdb_compile_shlib $src $exe {debug}] != "" } {
-	    return -1
+	    return
 	}
 
 	# Delete object files to save some space.
@@ -65,7 +65,7 @@ PerfTest::assemble {
     }
 
     if { [gdb_compile "$srcdir/$subdir/$srcfile" ${binfile} executable  $compile_flags] != "" } {
-	return -1
+	return
     }
 
     return 0
@@ -75,7 +75,7 @@ PerfTest::assemble {
     clean_restart $::testfile
 
     if ![runto_main] {
-	return -1
+	return
     }
     return 0
 } {
diff --git a/gdb/testsuite/gdb.perf/template-breakpoints.exp b/gdb/testsuite/gdb.perf/template-breakpoints.exp
index 2ddd3b363fb..b36eee5702e 100644
--- a/gdb/testsuite/gdb.perf/template-breakpoints.exp
+++ b/gdb/testsuite/gdb.perf/template-breakpoints.exp
@@ -40,7 +40,7 @@ PerfTest::assemble {
 	lappend compile_flags "additional_flags=-DEXPANSION_DEPTH=${EXPANSION_DEPTH}"
 
 	if { [gdb_compile "$srcdir/$subdir/$srcfile" ${binfile} executable $compile_flags] != ""} {
-		return -1
+		return
 	}
 
 	return 0
@@ -50,7 +50,7 @@ PerfTest::assemble {
 	clean_restart $::testfile
 
 	if ![runto_main] {
-		return -1
+		return
 	}
 
 	return 0
diff --git a/gdb/testsuite/gdb.replay/connect.exp b/gdb/testsuite/gdb.replay/connect.exp
index 86f51d81ef2..73a556741b5 100644
--- a/gdb/testsuite/gdb.replay/connect.exp
+++ b/gdb/testsuite/gdb.replay/connect.exp
@@ -29,7 +29,7 @@ require has_gdbreplay
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 # Connect to gdbserver and run to a breakpoint in main.  Record the
diff --git a/gdb/testsuite/gdb.replay/missing-thread.exp b/gdb/testsuite/gdb.replay/missing-thread.exp
index e3844c82453..23bbddac556 100644
--- a/gdb/testsuite/gdb.replay/missing-thread.exp
+++ b/gdb/testsuite/gdb.replay/missing-thread.exp
@@ -35,7 +35,7 @@ require has_gdbreplay
 standard_testfile
 
 if { [build_executable "failed to build exec" $testfile $srcfile {debug pthreads}] } {
-    return -1
+    return
 }
 
 # Start the inferior and record a remote log for our interaction with it.
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 c0603886383..842a3211090 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
@@ -39,7 +39,7 @@ require allow_hipcc_tests
 # Build the host executable.
 if { [build_executable "failed to prepare" \
 	  $testfile $srcfile {debug hip}] == -1 } {
-    return -1
+    return
 }
 
 set hipmodule_path [standard_output_file ${testfile}.co]
@@ -48,7 +48,7 @@ set hipmodule_path [standard_output_file ${testfile}.co]
 if { [gdb_compile $srcdir/$subdir/$srcfile \
 	$hipmodule_path object \
 	{ debug hip additional_flags=--genco additional_flags=-DDEVICE } ] != "" } {
-    return -1
+    return
 }
 
 proc do_test { } {
diff --git a/gdb/testsuite/gdb.threads/leader-exit-schedlock.exp b/gdb/testsuite/gdb.threads/leader-exit-schedlock.exp
index b821faf1765..0b6a798abc8 100644
--- a/gdb/testsuite/gdb.threads/leader-exit-schedlock.exp
+++ b/gdb/testsuite/gdb.threads/leader-exit-schedlock.exp
@@ -23,7 +23,7 @@
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 # Run "info threads" and return a list of various information:
diff --git a/gdb/testsuite/gdb.threads/step-over-process-exit.exp b/gdb/testsuite/gdb.threads/step-over-process-exit.exp
index 6c98ebe3956..33aa03b9ffd 100644
--- a/gdb/testsuite/gdb.threads/step-over-process-exit.exp
+++ b/gdb/testsuite/gdb.threads/step-over-process-exit.exp
@@ -28,7 +28,7 @@ require {expr {$exit_is_reliable}}
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthread}] } {
-    return -1
+    return
 }
 
 # WHICH is which thread exits the process.  Can be "main" for main
diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp
index 9dc2be66a77..4f16033f473 100644
--- a/gdb/testsuite/gdb.trace/actions-changed.exp
+++ b/gdb/testsuite/gdb.trace/actions-changed.exp
@@ -20,7 +20,7 @@ standard_testfile
 require gdb_trace_common_supports_arch
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc test_actions_changed { } {
@@ -162,12 +162,12 @@ proc test_actions_changed { } {
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 test_actions_changed
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 8a8a08d0f9e..2cb53260d34 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
@@ -242,12 +242,12 @@ gdb_load $binfile
 gdb_breakpoint "main"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint .*" "run to main"] != 0} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 gdb_trace_setactions "set actions for first tracepoint" \
diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp
index c4c0c5abcf8..d88a2c68147 100644
--- a/gdb/testsuite/gdb.trace/ax.exp
+++ b/gdb/testsuite/gdb.trace/ax.exp
@@ -27,7 +27,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index bdfe1215de6..da3f540fa0f 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -25,11 +25,11 @@ require gdb_trace_common_supports_arch
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 [list debug nowarnings nopie]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
@@ -104,7 +104,7 @@ all tests in this module will fail."
 }
 
 if {$return_me == 1} {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.trace/basic-libipa.exp b/gdb/testsuite/gdb.trace/basic-libipa.exp
index 1f080c63c5d..0fbb326b8ec 100644
--- a/gdb/testsuite/gdb.trace/basic-libipa.exp
+++ b/gdb/testsuite/gdb.trace/basic-libipa.exp
@@ -32,7 +32,7 @@ gdb_download_shlib $libipa
 
 if { [build_executable "failed to prepare" $testfile $srcfile \
 	  [list debug shlib=$libipa]] } {
-    return -1
+    return
 }
 
 save_vars { env(ASAN_OPTIONS) } {
@@ -46,7 +46,7 @@ save_vars { env(ASAN_OPTIONS) } {
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 pass "inferior with libinproctrace.so started"
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 5557e4cfff6..ed17f5bbd9b 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -36,7 +36,7 @@ if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $additional_flags] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
@@ -45,12 +45,12 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 
@@ -355,7 +355,7 @@ gdb_load_shlib $libipa
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable \
 	  [list debug nowarnings shlib=$libipa shlib=$lib_sl1 shlib_load] ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 tracepoint_change_loc_1 "ftrace"
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index e96000f2e24..11751374299 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -18,7 +18,7 @@ load_lib "trace-support.exp"
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings nopie}]} {
-    return -1
+    return
 }
 
 # Tests:
@@ -74,7 +74,7 @@ proc run_trace_experiment { } {
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 if { ![gdb_target_supports_trace] } {
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index 0fbc9de24c2..ac64f60d685 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -20,7 +20,7 @@ standard_testfile
 set executable $testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings nopie}]} {
-    return -1
+    return
 }
 
 # Tests:
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index a4dafdc1d27..1b787688bb3 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -24,7 +24,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
index 8202520b482..67cfbcca6b4 100644
--- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
+++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
@@ -24,21 +24,21 @@ set gdbserver_reconnect_p 1
 
 if { [info proc gdb_reconnect] == "" } {
     unsupported "target does not support reconnect"
-    return -1
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 # Disconnect in tracing.
diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index fe652b827f0..405f0d7e519 100644
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -21,12 +21,12 @@ standard_testfile .c entry-values-dw.S
 
 if  {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \
 	  object {nodebug}] != ""} {
-    return -1
+    return
 }
 
 if  {[gdb_compile [list ${binfile}1.o] \
 	  "${binfile}1" executable {}] != ""} {
-    return -1
+    return
 }
 
 clean_restart ${testfile}1
@@ -75,7 +75,7 @@ if { [string equal $returned_from_foo ""] } {
     # The following test makes no sense if the offset is unknown.  We need
     # to update the pattern above to match call or branch instruction for
     # the target architecture.
-    return -1
+    return
 }
 
 # Make some DWARF for the test.
@@ -155,18 +155,18 @@ Dwarf::assemble $asm_file {
 }
 
 if  {[gdb_compile $asm_file ${binfile}2.o object {nodebug}] != ""} {
-    return -1
+    return
 }
 
 if  {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
 	  "${binfile}" executable {}] != ""} {
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "foo"
@@ -200,12 +200,12 @@ clean_restart $testfile
 load_lib "trace-support.exp"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 gdb_test "trace foo" "Tracepoint $decimal at .*"
diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index a05bb793aea..19483607e05 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -38,12 +38,12 @@ with_test_prefix "runtime trace support check" {
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     if {![gdb_target_supports_trace]} {
 	unsupported "target does not support trace"
-	return -1
+	return
     }
 }
 
@@ -60,7 +60,7 @@ if { [prepare_for_testing "prepare for testing with libipa" \
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index 3ceb6f88058..b6addf722c0 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -27,16 +27,16 @@ require gdb_trace_common_supports_arch
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 [list debug $additional_flags]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 require allow_in_proc_agent
@@ -50,7 +50,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug nopie $additional_flags shlib=$libipa] ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 clean_restart ${executable}
 
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 034411636dc..0ee9c452e86 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -25,7 +25,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
@@ -99,7 +99,7 @@ gdb_trace_setactions "collect on tracepoint 1" "1" \
 	"collect gdb_struct1_test" "^$"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint ${decimal}, main.*" "run to main"] != 0} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
index 78e8c942b57..51840e5f30b 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
@@ -20,16 +20,16 @@ standard_testfile actions.c
 require gdb_trace_common_supports_arch
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
index 9facc8dee17..5a13f321d9e 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
@@ -18,16 +18,16 @@ load_lib trace-support.exp
 standard_testfile trace-unavailable.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug nopie}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
index 535a14add37..78320e73cc7 100644
--- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
@@ -36,7 +36,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 		"additional_flags=-DTFILE_DIR=\"$tfile_dir\""]] \
 	  != "" } {
      untested "failed to compile"
-     return -1
+     return
 }
 
 # Make sure we are starting fresh.
diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index b727d7a1b5c..c41c390080a 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -32,13 +32,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 load_lib mi-support.exp
diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index 5005eba59f3..ded552cb24b 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -23,7 +23,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Test notifications on creating, deleting and modifying TSV.
@@ -223,12 +223,12 @@ proc test_upload_tsv { } {
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp
index 3222b63d8a9..ea75851fcd8 100644
--- a/gdb/testsuite/gdb.trace/no-attach-trace.exp
+++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp
@@ -22,7 +22,7 @@ load_lib trace-support.exp
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Start GDB, but don't run so that we have no process attached.
@@ -43,6 +43,6 @@ gdb_test "tstart" "Target returns error code.*\."
 
 with_test_prefix "after tstart" {
     if {![runto_main]} {
-	return -1
+	return
     }
 }
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index ff9ae26fb89..7497855fa0b 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index 32fa58166f0..4e5b53b7c78 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index 57958aaeed0..8d0eec9bda8 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index 8da7115ca0d..cf3df0ada33 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -32,13 +32,13 @@ set lib_opts [gdb_target_symbol_prefix_flags]
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
@@ -47,12 +47,12 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 # Verify pending tracepoint is resolved to running to main.
@@ -180,7 +180,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_multiple "$trace_type set_point2" "set pending tracepoint on set_point2" {
@@ -248,7 +248,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test "next" ".*"
@@ -321,7 +321,7 @@ proc pending_tracepoint_disconnect_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_multiple "trace pendfunc3" "set pending tracepoint on set_point2" {
@@ -368,7 +368,7 @@ proc pending_tracepoint_disconnect_after_resolved { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_multiple "trace set_point2" "set pending tracepoint on set_point2" {
@@ -420,7 +420,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_multiple "$trace_type set_point2" "set pending tracepoint on set_point2" {
@@ -502,7 +502,7 @@ lappend exec_opts "shlib=$libipa"
 
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
     untested "failed to compile with in-process agent library"
-    return -1
+    return
 }
 
 pending_tracepoint_resolved "ftrace"
diff --git a/gdb/testsuite/gdb.trace/pr16508.exp b/gdb/testsuite/gdb.trace/pr16508.exp
index 7d8b0d08c8d..d3ef8feb0b8 100644
--- a/gdb/testsuite/gdb.trace/pr16508.exp
+++ b/gdb/testsuite/gdb.trace/pr16508.exp
@@ -19,16 +19,16 @@ set executable $testfile
 
 if {[prepare_for_testing "failed to prepare for trace tests" \
 	 $executable $srcfile [list debug]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 gdb_test "trace start" ".*"
diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp
index ae647383922..62a08c3695c 100644
--- a/gdb/testsuite/gdb.trace/qtro.exp
+++ b/gdb/testsuite/gdb.trace/qtro.exp
@@ -27,18 +27,18 @@ require gdb_protocol_is_remote
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Check whether the target supports tracepoints.
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 # Run a trace session, stop it, and then inspect the resulting trace
@@ -91,13 +91,13 @@ gdb_test_multiple "show remote traceframe-info-packet" $test {
     }
 }
 if { $traceframe_info_supported == -1 } {
-    return -1
+    return
 }
 
 # Check whether we're testing with our own GDBserver.
 set is_gdbserver [target_is_gdbserver]
 if { $is_gdbserver == -1 } {
-    return -1
+    return
 }
 
 # Now disassemble (IOW, read from read-only memory) while inspecting a
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
index 5ff104a725d..a0a1003ffb3 100644
--- a/gdb/testsuite/gdb.trace/range-stepping.exp
+++ b/gdb/testsuite/gdb.trace/range-stepping.exp
@@ -21,21 +21,21 @@ set executable $testfile
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 if {![gdb_range_stepping_enabled]} {
     unsupported "range stepping not supported by the target"
-    return -1
+    return
 }
 
 # Check that range stepping works well with tracepoints.
@@ -74,7 +74,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug nowarnings shlib=$libipa] ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp
index 7d9b1c15d64..0599b2e8e07 100644
--- a/gdb/testsuite/gdb.trace/read-memory.exp
+++ b/gdb/testsuite/gdb.trace/read-memory.exp
@@ -18,16 +18,16 @@ load_lib "trace-support.exp"
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 # Set tracepoints, start tracing and collect data.
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 32d7a9fb3ae..8539975c407 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings nopie}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 clean_restart $testfile
 runto_main
@@ -104,7 +104,7 @@ all tests in this module will fail."
 }
 
 if {$return_me == 1} {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 92f15ce5ac5..448b0a6d31e 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -23,7 +23,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp
index dd3958d7ffd..f46380c217c 100644
--- a/gdb/testsuite/gdb.trace/signal.exp
+++ b/gdb/testsuite/gdb.trace/signal.exp
@@ -33,16 +33,16 @@ require {!target_info exists gdb,nosignals}
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 # Step 1, find the syscall instruction address.
@@ -57,13 +57,13 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
     set syscall_insn "\[ \t\](swi|svc)\[ \t\]"
 } else {
     unsupported "unknown syscall instruction"
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
 clean_restart ${testfile}
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "kill" -qualified
diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp
index d8ed0a3bda4..e7003d19326 100644
--- a/gdb/testsuite/gdb.trace/stap-trace.exp
+++ b/gdb/testsuite/gdb.trace/stap-trace.exp
@@ -101,7 +101,7 @@ proc gdb_collect_probe_arg { msg probe val_arg0 } {
 
 if {![compile_stap_bin "stap-probe-nosem"]} {
     # An appropriate failure message has already been output
-    return -1
+    return
 }
 
 clean_restart $executable
@@ -121,7 +121,7 @@ gdb_exit
 
 if {![compile_stap_bin "stap-probe-sem" "-DUSE_PROBES"]} {
     # An appropriate failure message has already been output
-    return -1
+    return
 }
 
 gdb_collect_probe_arg "probe args with semaphore" "-probe-stap two" "46"
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index e41ca4555aa..4ea57e93ff5 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -21,16 +21,16 @@ set expfile $testfile.exp
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 # Verify that the sequence of commands "tstart tstop tstart" works well.
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index b596968ce7f..d963d450126 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -29,7 +29,7 @@ set additional_flags [list quiet debug shlib=$libipa shlib_load \
 
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $additional_flags] != ""} {
     untested "UST library or headers are not installed"
-    return -1
+    return
 }
 
 # Test that the socket file is removed when GDB quits, detaches or
@@ -368,7 +368,7 @@ if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } {
 clean_restart $executable
 gdb_load_shlib $libipa
 if {![runto_main]} {
-    return -1
+    return
 }
 if {![gdb_target_supports_trace]} {
     # At this point, the socket file has been created.  We must make sure it is
@@ -377,7 +377,7 @@ if {![gdb_target_supports_trace]} {
     # the socket file.
     gdb_test "detach" "Detaching .*, process .*"
     unsupported "current target does not support trace"
-    return -1
+    return
 }
 
 # Double-check that marker ID ("-m") is not mistaken for an explicit location
diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 0401b0a2c3f..1ecb784b361 100644
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -41,7 +41,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	       "additional_flags=-DTFILE_DIR=\"$tfile_dir\""]] \
 	 != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Make sure we are starting fresh.
@@ -52,7 +52,7 @@ remote_file target delete $tfile_error
 
 if { ![generate_tracefile $binfile] } {
     unsupported "unable to generate trace file"
-    return -1
+    return
 }
 
 if {!$purely_local} {
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 5cf4122c017..cb4d255b781 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -24,7 +24,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
 	  executable {debug nowarnings nopie}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
@@ -117,7 +117,7 @@ gdb_test_multiple "tstart" "6.1: tstart" {
 }
 
 if {$return_me == 1} {
-    return -1
+    return
 }
 
 # test tstatus (when trace on)
@@ -148,7 +148,7 @@ gdb_test_multiple "tstop" "7.1: tstop" {
 }
 
 if {$return_me == 1} {
-    return -1
+    return
 }
 
 # test tstatus (when trace off)
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index 27df24b7094..215d2c2ff4b 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -25,16 +25,16 @@ require gdb_trace_common_supports_arch
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 [list debug $additional_flags]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 # Set breakpoint and tracepoint at the same address.
@@ -48,7 +48,7 @@ proc break_trace_same_addr_1 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
@@ -82,7 +82,7 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
@@ -120,7 +120,7 @@ proc break_trace_same_addr_3 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
@@ -157,7 +157,7 @@ proc break_trace_same_addr_4 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
@@ -200,7 +200,7 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_breakpoint "marker" -qualified
@@ -273,7 +273,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_breakpoint "marker" -qualified
@@ -355,7 +355,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 clean_restart ${executable}
 
diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
index e774fc4fd49..4b1a8f75a0a 100644
--- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp
+++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
@@ -19,16 +19,16 @@ standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 set BUFFER_SIZE 4
@@ -46,7 +46,7 @@ gdb_test_multiple "tstatus" $test {
 # If we did not get the default size then there is no point in running the
 # tests below.
 if { $default_size < 0 } {
-  return -1
+  return
 }
 
 # Change buffer size to 'BUFFER_SIZE'.
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index 7eb5df7ab7c..d63d7b8a89d 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -27,16 +27,16 @@ require gdb_trace_common_supports_arch
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 [list debug $additional_flags]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 require allow_in_proc_agent
@@ -50,7 +50,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [list debug $additional_flags shlib=$libipa] ] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${executable}
diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
index 04ec2973674..a3b6b328b25 100644
--- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp
+++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
@@ -27,18 +27,18 @@ set options [list debug [gdb_target_symbol_prefix_flags]]
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 # Compile the test case with the in-process agent library.
@@ -50,7 +50,7 @@ lappend options shlib=$libipa
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     untested "failed to compile with in-process agent library"
-    return -1
+    return
 }
 
 # This test makes sure that disabling and enabling tracepoints works
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index 90dd5284adc..d43ccc3dc91 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -28,12 +28,12 @@ with_test_prefix "runtime trace support check" {
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     if {![gdb_target_supports_trace]} {
 	unsupported "target does not support trace"
-	return -1
+	return
     }
 }
 
@@ -48,7 +48,7 @@ proc step_over_tracepoint { testfile trace_type } \
     # Make sure inferior is running in all-stop mode.
     gdb_test_no_output "set non-stop 0"
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test "break set_point1" "Breakpoint \[0-9\] at $hex: file.*"
@@ -71,7 +71,7 @@ proc break_trace_same_addr { testfile trace_type option } \
     # Start with a fresh gdb.
     clean_restart $testfile
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index e4d39470e9b..5b34092d7dc 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
index e23b4186442..35ec9f539af 100644
--- a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
+++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
@@ -20,16 +20,16 @@ standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
      [list debug additional_flags=-mavx]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 gdb_test_multiple "print \$ymm15" "check for AVX support" {
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index fae22b0e8c4..16bfdf2304d 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -28,18 +28,18 @@ set executable $testfile
 # Check that the target supports trace.
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 # Compile the test case with the in-process agent library.
@@ -49,7 +49,7 @@ set ipalib [get_in_proc_agent]
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [concat {debug c} shlib=$ipalib]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Typically we need a little extra time for this test.
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index 9ee56d490b1..017f59f893f 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -22,16 +22,16 @@ require gdb_trace_common_supports_arch
 
 if {[prepare_for_testing "failed to prepare" $executable $srcfile \
 	 [list debug]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 set tstatus_output ""
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index b1b706735e7..aea6484dec2 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -20,7 +20,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
index 1a118c920da..ee8fb5d52a2 100644
--- a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
+++ b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
@@ -25,7 +25,7 @@ set opts {}
 
 if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \
 	   object {nodebug}] != "" } {
-    return -1
+    return
 }
 
 Dwarf::assemble $asm_file {
@@ -284,23 +284,23 @@ Dwarf::assemble $asm_file {
 }
 
 if  { [gdb_compile ${asm_file} ${binfile}2.o object {nodebug}] != "" } {
-    return -1
+    return
 }
 
 if  { [gdb_compile [list ${binfile}1.o ${binfile}2.o] ${binfile} \
 	   executable {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 gdb_breakpoint "end" -qualified
diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index cd652affc0f..8fd3af60e32 100644
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -20,7 +20,7 @@ set executable $testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug nowarnings c++ nopie}]} {
-    return -1
+    return
 }
 
 set ws "\[\r\n\t \]+"
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 8b7472cfcf4..0203517fb78 100644
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -23,7 +23,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index f96034391a2..91f2f3853da 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
@@ -102,12 +102,12 @@ gdb_load $binfile
 gdb_breakpoint "main"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint .*" "run to main"] != 0} {
-    return -1
+    return
 }
 
 if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
-    return -1
+    return
 }
 
 gdb_trace_setactions "set stepcount to $stepcount" \