[v2,32/37] GDB: testsuite: threads: Don't return -1 from top-level (sed)

Message ID 20260429230432.60487-33-thiago.bauermann@linaro.org
State New
Headers
Series GDB: testsuite: Fix top-level returns |

Commit Message

Thiago Jung Bauermann April 29, 2026, 11:04 p.m. UTC
  This patch is purely the result of running:

$ sed -i 's/^    return -1/    return/' *.exp*

inside gdb/testsuite/gdb.threads.
---
 .../gdb.threads/access-mem-running-thread-exit.exp        | 2 +-
 gdb/testsuite/gdb.threads/async.exp                       | 2 +-
 gdb/testsuite/gdb.threads/attach-into-signal.exp          | 4 ++--
 .../gdb.threads/attach-many-short-lived-threads.exp       | 2 +-
 gdb/testsuite/gdb.threads/attach-non-stop.exp             | 2 +-
 gdb/testsuite/gdb.threads/attach-slow-waitpid.exp         | 2 +-
 gdb/testsuite/gdb.threads/attach-stopped.exp              | 4 ++--
 gdb/testsuite/gdb.threads/bp_in_thread.exp                | 2 +-
 gdb/testsuite/gdb.threads/break-while-running.exp         | 2 +-
 gdb/testsuite/gdb.threads/check-libthread-db.exp          | 2 +-
 gdb/testsuite/gdb.threads/clone-attach-detach.exp         | 2 +-
 gdb/testsuite/gdb.threads/clone-new-thread-event.exp      | 4 ++--
 gdb/testsuite/gdb.threads/clone-thread_db.exp             | 4 ++--
 .../gdb.threads/continue-pending-after-query.exp          | 2 +-
 gdb/testsuite/gdb.threads/continue-pending-status.exp     | 4 ++--
 gdb/testsuite/gdb.threads/create-fail.exp                 | 2 +-
 gdb/testsuite/gdb.threads/current-lwp-dead.exp            | 4 ++--
 gdb/testsuite/gdb.threads/del-pending-thread-bp.exp       | 4 ++--
 gdb/testsuite/gdb.threads/detach-step-over.exp            | 4 ++--
 gdb/testsuite/gdb.threads/dlopen-libpthread.exp           | 6 +++---
 gdb/testsuite/gdb.threads/execl.exp                       | 4 ++--
 gdb/testsuite/gdb.threads/fork-child-threads.exp          | 2 +-
 gdb/testsuite/gdb.threads/fork-thread-pending.exp         | 2 +-
 .../gdb.threads/forking-threads-plus-breakpoint.exp       | 2 +-
 gdb/testsuite/gdb.threads/gcore-stale-thread.exp          | 4 ++--
 gdb/testsuite/gdb.threads/gcore-thread.exp                | 4 ++--
 gdb/testsuite/gdb.threads/hand-call-in-threads.exp        | 2 +-
 gdb/testsuite/gdb.threads/hand-call-new-thread.exp        | 2 +-
 gdb/testsuite/gdb.threads/ia64-sigill.exp                 | 4 ++--
 gdb/testsuite/gdb.threads/inf-thr-count.exp               | 8 ++++----
 gdb/testsuite/gdb.threads/infcall-thread-announce.exp     | 4 ++--
 gdb/testsuite/gdb.threads/info-threads-cur-sal.exp        | 4 ++--
 gdb/testsuite/gdb.threads/info-threads-options.exp        | 4 ++--
 gdb/testsuite/gdb.threads/interrupt-while-step-over.exp   | 4 ++--
 gdb/testsuite/gdb.threads/interrupted-hand-call.exp       | 2 +-
 gdb/testsuite/gdb.threads/killed-outside.exp              | 6 +++---
 gdb/testsuite/gdb.threads/killed.exp                      | 2 +-
 gdb/testsuite/gdb.threads/leader-exit.exp                 | 4 ++--
 gdb/testsuite/gdb.threads/linux-dp.exp                    | 2 +-
 gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp    | 2 +-
 .../gdb.threads/main-thread-exit-during-detach.exp        | 2 +-
 gdb/testsuite/gdb.threads/manythreads.exp                 | 2 +-
 gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp    | 4 ++--
 gdb/testsuite/gdb.threads/multi-create.exp                | 2 +-
 gdb/testsuite/gdb.threads/multiple-step-overs.exp         | 2 +-
 gdb/testsuite/gdb.threads/names.exp                       | 2 +-
 gdb/testsuite/gdb.threads/next-bp-other-thread.exp        | 2 +-
 .../gdb.threads/next-while-other-thread-longjmps.exp      | 2 +-
 gdb/testsuite/gdb.threads/no-unwaited-for-left.exp        | 4 ++--
 gdb/testsuite/gdb.threads/non-ldr-exc-1.exp               | 2 +-
 gdb/testsuite/gdb.threads/non-ldr-exc-2.exp               | 2 +-
 gdb/testsuite/gdb.threads/non-ldr-exc-3.exp               | 2 +-
 gdb/testsuite/gdb.threads/non-ldr-exc-4.exp               | 2 +-
 gdb/testsuite/gdb.threads/non-ldr-exit.exp                | 4 ++--
 gdb/testsuite/gdb.threads/non-stop-fair-events.exp        | 4 ++--
 gdb/testsuite/gdb.threads/omp-par-scope.exp               | 4 ++--
 gdb/testsuite/gdb.threads/omp-task.exp                    | 4 ++--
 gdb/testsuite/gdb.threads/pending-step.exp                | 2 +-
 gdb/testsuite/gdb.threads/print-threads.exp               | 2 +-
 .../gdb.threads/process-dies-while-handling-bp.exp        | 2 +-
 .../process-exit-status-is-leader-exit-status.exp         | 2 +-
 gdb/testsuite/gdb.threads/pthread_cond_wait.exp           | 2 +-
 gdb/testsuite/gdb.threads/pthreads.exp                    | 2 +-
 gdb/testsuite/gdb.threads/queue-signal.exp                | 2 +-
 gdb/testsuite/gdb.threads/reconnect-signal.exp            | 2 +-
 gdb/testsuite/gdb.threads/schedlock.exp                   | 2 +-
 gdb/testsuite/gdb.threads/siginfo-threads.exp             | 4 ++--
 .../gdb.threads/signal-command-handle-nopass.exp          | 2 +-
 .../signal-command-multiple-signals-pending.exp           | 2 +-
 .../gdb.threads/signal-delivered-right-thread.exp         | 2 +-
 gdb/testsuite/gdb.threads/signal-sigtrap.exp              | 2 +-
 .../signal-while-stepping-over-bp-other-thread.exp        | 4 ++--
 gdb/testsuite/gdb.threads/sigstep-threads.exp             | 4 ++--
 gdb/testsuite/gdb.threads/sigthread.exp                   | 2 +-
 .../gdb.threads/step-bg-decr-pc-switch-thread.exp         | 2 +-
 .../gdb.threads/step-over-lands-on-breakpoint.exp         | 2 +-
 .../gdb.threads/step-over-trips-on-watchpoint.exp         | 2 +-
 gdb/testsuite/gdb.threads/stepi-random-signal.exp         | 4 ++--
 gdb/testsuite/gdb.threads/stop-with-handle.exp            | 2 +-
 gdb/testsuite/gdb.threads/switch-threads.exp              | 2 +-
 gdb/testsuite/gdb.threads/thread-bp-deleted.exp           | 6 +++---
 gdb/testsuite/gdb.threads/thread-execl.exp                | 2 +-
 gdb/testsuite/gdb.threads/thread-find.exp                 | 2 +-
 gdb/testsuite/gdb.threads/thread-specific-bp.exp          | 2 +-
 gdb/testsuite/gdb.threads/thread-specific.exp             | 2 +-
 gdb/testsuite/gdb.threads/thread-unwindonsignal.exp       | 2 +-
 gdb/testsuite/gdb.threads/thread_check.exp                | 2 +-
 gdb/testsuite/gdb.threads/thread_events.exp               | 2 +-
 gdb/testsuite/gdb.threads/threadapply.exp                 | 2 +-
 gdb/testsuite/gdb.threads/threadcrash.exp                 | 2 +-
 gdb/testsuite/gdb.threads/threxit-hop-specific.exp        | 2 +-
 gdb/testsuite/gdb.threads/tid-reuse.exp                   | 4 ++--
 gdb/testsuite/gdb.threads/tls-core.exp                    | 2 +-
 gdb/testsuite/gdb.threads/tls-nodebug-pie.exp             | 2 +-
 gdb/testsuite/gdb.threads/tls-nodebug.exp                 | 2 +-
 gdb/testsuite/gdb.threads/tls-sepdebug.exp                | 4 ++--
 gdb/testsuite/gdb.threads/tls-shared.exp                  | 2 +-
 gdb/testsuite/gdb.threads/tls-so_extern.exp               | 2 +-
 gdb/testsuite/gdb.threads/tls-var.exp                     | 2 +-
 gdb/testsuite/gdb.threads/tls.exp                         | 2 +-
 gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp     | 2 +-
 gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp     | 2 +-
 gdb/testsuite/gdb.threads/vfork-multi-inferior.exp        | 4 ++--
 gdb/testsuite/gdb.threads/watchthreads-reorder.exp        | 2 +-
 gdb/testsuite/gdb.threads/watchthreads.exp                | 2 +-
 gdb/testsuite/gdb.threads/watchthreads2.exp               | 4 ++--
 gdb/testsuite/gdb.threads/wp-replication.exp              | 2 +-
 107 files changed, 147 insertions(+), 147 deletions(-)
  

Patch

diff --git a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
index 35da068db6b6..d0db40c4be5b 100644
--- a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
+++ b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
@@ -36,11 +36,11 @@ 
 # file open per inferior.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # The test proper.  NON_STOP indicates whether we're testing in
 # non-stop, or all-stop mode.
 
diff --git a/gdb/testsuite/gdb.threads/async.exp b/gdb/testsuite/gdb.threads/async.exp
index fa57796452f2..2fe787f6bed5 100644
--- a/gdb/testsuite/gdb.threads/async.exp
+++ b/gdb/testsuite/gdb.threads/async.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # At this point GDB will be busy handling the breakpoint hits and
 # re-resuming the program.  Even if GDB internally switches thread
 # context, the user should not notice it.  The following part of the
diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp
index 7c9c30036d2b..2f682ebb0738 100644
--- a/gdb/testsuite/gdb.threads/attach-into-signal.exp
+++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp
@@ -119,18 +119,18 @@  proc corefunc { threadtype executable } {
 
 # build the test case first without threads
 #
 if {[build_executable $testfile $executable_nothr $srcfile] == -1} {
     untested "attach-into-signal.exp (nonthreaded)"
-    return -1
+    return
 }
 
 corefunc nonthreaded ${executable_nothr}
 
 # build the test case also with threads
 #
 if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" [standard_output_file ${executable_thr}] executable {debug additional_flags=-DUSE_THREADS}] != "" } {
     untested "attach-into-signal.exp (threaded)"
-    return -1
+    return
 }
 
 corefunc threaded ${executable_thr}
diff --git a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
index 16e33c027b09..0f1b141b1ea1 100644
--- a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
+++ b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
@@ -193,9 +193,9 @@  proc test {} {
 # failure.
 set options { "additional_flags=-DTIMEOUT=$timeout" debug pthreads }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 $options] == -1} {
-    return -1
+    return
 }
 
 test
diff --git a/gdb/testsuite/gdb.threads/attach-non-stop.exp b/gdb/testsuite/gdb.threads/attach-non-stop.exp
index 3f55459e7ede..3d363398cc23 100644
--- a/gdb/testsuite/gdb.threads/attach-non-stop.exp
+++ b/gdb/testsuite/gdb.threads/attach-non-stop.exp
@@ -132,11 +132,11 @@  proc test {target_non_stop non_stop cmd} {
 
     kill_wait_spawned_process $test_spawn_id
 }
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 foreach_with_prefix target-non-stop {"off" "on"} {
     foreach_with_prefix non-stop {"off" "on"} {
 	foreach_with_prefix cmd {"attach" "attach&"} {
diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
index c71cd98501f4..343a96bc5112 100644
--- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
+++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
@@ -96,11 +96,11 @@  set testpid [spawn_id_get_pid $test_spawn_id]
 # Start GDB with preload library in place.
 if { [gdb_spawn_with_ld_preload $libobj] == -1 } {
     # Make sure we get UNTESTED rather than UNRESOLVED.
     set errcnt 0
     untested "Couldn't start GDB with preloaded lib"
-    return -1
+    return
 }
 
 # Load binary, and attach to running program.
 gdb_load ${binfile}
 gdb_test "attach $testpid" "Attaching to program.*" "attach to target"
diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
index 63a8f481e2e0..2f84c6d77f2f 100644
--- a/gdb/testsuite/gdb.threads/attach-stopped.exp
+++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
@@ -77,18 +77,18 @@  proc corefunc { threadtype } {
 
 # build the test case first without threads
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "attach-stopped.exp (unthreaded)"
-    return -1
+    return
 }
 
 corefunc nonthreaded
 
 # build the test case first without threads
 #
 if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DUSE_THREADS}] != "" } {
     untested "attach-stopped.exp (threaded)"
-    return -1
+    return
 }
 
 corefunc threaded
diff --git a/gdb/testsuite/gdb.threads/bp_in_thread.exp b/gdb/testsuite/gdb.threads/bp_in_thread.exp
index 001eeaae6e98..07f5e2f1b807 100644
--- a/gdb/testsuite/gdb.threads/bp_in_thread.exp
+++ b/gdb/testsuite/gdb.threads/bp_in_thread.exp
@@ -19,11 +19,11 @@ 
 # a breakpoint.
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart $::testfile
 
 runto_main
diff --git a/gdb/testsuite/gdb.threads/break-while-running.exp b/gdb/testsuite/gdb.threads/break-while-running.exp
index 9d500f38b148..c4ad127d982c 100644
--- a/gdb/testsuite/gdb.threads/break-while-running.exp
+++ b/gdb/testsuite/gdb.threads/break-while-running.exp
@@ -23,11 +23,11 @@ 
 #   still threads running.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # The test proper.  UPDATE_THREAD_LIST indicates whether we should do
 # an "info threads" to sync the thread list after the first stop.
 # ALWAYS_INSERTED indicates whether testing in "breakpoint
diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsuite/gdb.threads/check-libthread-db.exp
index 3e95d7e84a7c..1110c1c848ec 100644
--- a/gdb/testsuite/gdb.threads/check-libthread-db.exp
+++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp
@@ -25,11 +25,11 @@  require !gdb_debug_enabled
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable debug] != "" } {
-    return -1
+    return
 }
 
 # Case 1: libthread_db fakes a single thread with th_unique == NULL.
 set thread_re1 "0 => $decimal => 0"
 # Case 2: libthread_db already initialized.
diff --git a/gdb/testsuite/gdb.threads/clone-attach-detach.exp b/gdb/testsuite/gdb.threads/clone-attach-detach.exp
index e3294b8c7bfb..cd4544a8057f 100644
--- a/gdb/testsuite/gdb.threads/clone-attach-detach.exp
+++ b/gdb/testsuite/gdb.threads/clone-attach-detach.exp
@@ -26,11 +26,11 @@  if {![istarget *-*-linux*]} {
 require can_spawn_for_attach
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 set test_spawn_id [spawn_wait_for_attach $binfile]
 set testpid [spawn_id_get_pid $test_spawn_id]
 
diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
index 44f4f7e63109..2e49766f33d1 100644
--- a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
+++ b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
@@ -19,15 +19,15 @@ 
 if {![istarget *-*-linux*]} {
     return
 }
 
 if { [prepare_for_testing "failed to prepare" clone-new-thread-event] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_test "continue" \
     "Thread 2 received signal SIGUSR1, User defined signal 1.*" \
     "catch SIGUSR1"
diff --git a/gdb/testsuite/gdb.threads/clone-thread_db.exp b/gdb/testsuite/gdb.threads/clone-thread_db.exp
index a5a185ad9c83..77297a8e74b4 100644
--- a/gdb/testsuite/gdb.threads/clone-thread_db.exp
+++ b/gdb/testsuite/gdb.threads/clone-thread_db.exp
@@ -21,15 +21,15 @@  if {![istarget *-*-linux*]} {
 }
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "break clone_fn" "Breakpoint.*at.*file.*$srcfile.*line.*"
 gdb_test "continue" "clone_fn .* at .*" "continue to clone_fn"
 
diff --git a/gdb/testsuite/gdb.threads/continue-pending-after-query.exp b/gdb/testsuite/gdb.threads/continue-pending-after-query.exp
index 43f5bd368b19..97f9081443a7 100644
--- a/gdb/testsuite/gdb.threads/continue-pending-after-query.exp
+++ b/gdb/testsuite/gdb.threads/continue-pending-after-query.exp
@@ -43,11 +43,11 @@ 
 # Ref: https://sourceware.org/ml/gdb-patches/2015-01/msg00592.html
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 proc test {} {
     global srcfile gdb_prompt
 
diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.exp b/gdb/testsuite/gdb.threads/continue-pending-status.exp
index 1ffa6fd32425..01fb61c3b525 100644
--- a/gdb/testsuite/gdb.threads/continue-pending-status.exp
+++ b/gdb/testsuite/gdb.threads/continue-pending-status.exp
@@ -20,15 +20,15 @@ 
 require {!target_info exists gdb,nointerrupts}
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set break_line [gdb_get_line_number "break here"]
 
 # Return current thread's number.
diff --git a/gdb/testsuite/gdb.threads/create-fail.exp b/gdb/testsuite/gdb.threads/create-fail.exp
index b2528281b7e1..c77ccab17ae2 100644
--- a/gdb/testsuite/gdb.threads/create-fail.exp
+++ b/gdb/testsuite/gdb.threads/create-fail.exp
@@ -22,11 +22,11 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 set iterations 10
 for {set i 1} {$i <= $iterations} {incr i} {
     with_test_prefix "iteration $i" {
diff --git a/gdb/testsuite/gdb.threads/current-lwp-dead.exp b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
index 5c9aa76e9d9a..272771114a3f 100644
--- a/gdb/testsuite/gdb.threads/current-lwp-dead.exp
+++ b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
@@ -28,15 +28,15 @@  standard_testfile
 if {![istarget *-*-linux*]} {
     return
 }
 
 if { [prepare_for_testing "failed to prepare" current-lwp-dead] } {
-    return -1
+    return
 }
 
 if {[runto_main] <= 0} {
-    return -1
+    return
 }
 
 # Run to "fn" so that thread 2 is made current.
 gdb_breakpoint "fn"
 gdb_continue_to_breakpoint "fn" ".*do_clone.*"
diff --git a/gdb/testsuite/gdb.threads/del-pending-thread-bp.exp b/gdb/testsuite/gdb.threads/del-pending-thread-bp.exp
index 1870adcde22a..09a6f56a5660 100644
--- a/gdb/testsuite/gdb.threads/del-pending-thread-bp.exp
+++ b/gdb/testsuite/gdb.threads/del-pending-thread-bp.exp
@@ -28,20 +28,20 @@  set libname $testfile-lib
 set srcfile_lib $srcdir/$subdir/$libname.c
 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]
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  [list debug \
 	       additional_flags=-DSHLIB_NAME=\"$binfile_lib_target\" \
 	       shlib_load pthreads]] } {
-    return -1
+    return
 }
 
 gdb_locate_shlib $binfile_lib
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/detach-step-over.exp b/gdb/testsuite/gdb.threads/detach-step-over.exp
index 85198111fd07..b034788ae6cf 100644
--- a/gdb/testsuite/gdb.threads/detach-step-over.exp
+++ b/gdb/testsuite/gdb.threads/detach-step-over.exp
@@ -352,15 +352,15 @@  proc_with_prefix test_detach_quit {condition_eval target_non_stop \
 # wait at least as long as we may wait before declaring a time out
 # failure.
 set options { "additional_flags=-DTIMEOUT=$timeout" debug pthreads }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Probe support for "set breakpoint condition-evaluation target".
 # This setting influences who steps over the breakpoint, the (remote)
 # target (e.g. gdbserver) or gdb, thus exposing issues on either the
diff --git a/gdb/testsuite/gdb.threads/dlopen-libpthread.exp b/gdb/testsuite/gdb.threads/dlopen-libpthread.exp
index 1dacbdbb1b28..03ce0dd1612d 100644
--- a/gdb/testsuite/gdb.threads/dlopen-libpthread.exp
+++ b/gdb/testsuite/gdb.threads/dlopen-libpthread.exp
@@ -31,16 +31,16 @@  set lib_dlopen [shlib_target_file ${executable}.so]
 # PASS - it is OK if GDB processes it still before relocation.
 
 set relink_args [build_executable_own_libs ${testfile}.exp ${executable}.so $srclibfile {debug shlib_pthreads} no]
 if {$relink_args == "" || ![prelink_no $relink_args]
     || [prepare_for_testing "failed to prepare" ${executable} ${srcmainfile} {debug shlib_load}] } {
-    return -1
+    return
 }
 gdb_load_shlib $binfile_lib
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 set probe_names {}
 # Fedora 17 name.  There's specific code in
 # svr4_find_and_create_probe_breakpoints to deal with this.
@@ -60,11 +60,11 @@  foreach probe_name $probe_names {
     }
 }
 
 if { !$have_probe } {
     untested "no matching probes"
-    return -1
+    return
 }
 
 # We link the exec without -lpthread, but libpthread.so may already be loaded at main
 # due to LD_PRELOAD.
 set libpthread_maybe_preloaded 0
diff --git a/gdb/testsuite/gdb.threads/execl.exp b/gdb/testsuite/gdb.threads/execl.exp
index fcbd865a9e84..a5ad5a48ca92 100644
--- a/gdb/testsuite/gdb.threads/execl.exp
+++ b/gdb/testsuite/gdb.threads/execl.exp
@@ -17,20 +17,20 @@ 
 
 # Original image, loads a thread library.
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 # New image, that does not load a thread library.
 set testfile1 "execl1"
 set srcfile1 ${testfile1}.c
 set binfile1 [standard_output_file ${testfile1}]
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 if { [is_remote target] } {
     gdb_remote_download target $binfile1
diff --git a/gdb/testsuite/gdb.threads/fork-child-threads.exp b/gdb/testsuite/gdb.threads/fork-child-threads.exp
index fec474f4c701..c6090eaaaf42 100644
--- a/gdb/testsuite/gdb.threads/fork-child-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-child-threads.exp
@@ -16,11 +16,11 @@ 
 require allow_fork_tests
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
index 6f81e5e7e491..0cf4878d13f8 100644
--- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
+++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
@@ -16,11 +16,11 @@ 
 require allow_fork_tests
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
index 231709369e5c..b3a2fdb9ac16 100644
--- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
+++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
@@ -21,11 +21,11 @@  require allow_fork_tests
 standard_testfile
 
 set linenum [gdb_get_line_number "set break here"]
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # Assume yes.
 set displaced_stepping_supported 1
 
diff --git a/gdb/testsuite/gdb.threads/gcore-stale-thread.exp b/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
index 1f1974109fea..9faa2686c767 100644
--- a/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
@@ -15,19 +15,19 @@ 
 
 standard_testfile
 set corefile [standard_output_file ${testfile}.core]
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != ""} {
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 gdb_test_no_output "set non-stop on"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_multiple "info threads" "threads are supported" {
     -re ".* main .*\r\n$gdb_prompt $" {
 	# OK, threads are supported.
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index 75c538074a92..c3b8c56dd4b9 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -35,11 +35,11 @@  if {[istarget "*-*-linux"]} {
 
 set opts [list debug]
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${objfile}" object $opts] != ""
     || ([gdb_compile_pthreads "${objfile}" "${binfile}" executable [concat $opts {ldflags=-Wl,-z,norelro}] ] != ""
 	&& [gdb_compile_pthreads "${objfile}" "${binfile}" executable $opts] != "") } {
-    return -1
+    return
 }
 
 # Now we can proceed with the real testing.
 
 # Start with a fresh gdb.
@@ -54,11 +54,11 @@  set horiz "\[^\n\r\]*"
 set nl "\r\n"
 
 set timeout 30
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_multiple "info threads" "threads are supported" {
     -re ".* main .*$gdb_prompt $" {
 	# OK, threads are supported.
diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
index f2d93cedfed9..f6d29720cc6f 100644
--- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -22,11 +22,11 @@  standard_testfile
 # Some targets can't do function calls, so don't even bother with this
 # test.
 require {!target_info exists gdb,cannot_call_functions}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
-    return -1
+    return
 }
 
 proc get_dummy_frame_number { } {
     global gdb_prompt
 
diff --git a/gdb/testsuite/gdb.threads/hand-call-new-thread.exp b/gdb/testsuite/gdb.threads/hand-call-new-thread.exp
index f9c59089a2ba..891e47e6c9c4 100644
--- a/gdb/testsuite/gdb.threads/hand-call-new-thread.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-new-thread.exp
@@ -17,11 +17,11 @@ 
 # to stopped state once the call finishes.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.threads/ia64-sigill.exp b/gdb/testsuite/gdb.threads/ia64-sigill.exp
index e69b9478998f..b19c62e8ded6 100644
--- a/gdb/testsuite/gdb.threads/ia64-sigill.exp
+++ b/gdb/testsuite/gdb.threads/ia64-sigill.exp
@@ -20,17 +20,17 @@ 
 # breakpoint has been already deleted.  moribund locations are not active in
 # the default all-stop mode.
 
 standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" ${binfile} executable [list debug additional_flags=-lrt]] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set test "info addr label"
 gdb_test_multiple $test $test {
     -re "Symbol \"label\" is at ${::hex}0 in .*\r\n$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.threads/inf-thr-count.exp b/gdb/testsuite/gdb.threads/inf-thr-count.exp
index af48648e5ca5..feb81ab6673e 100644
--- a/gdb/testsuite/gdb.threads/inf-thr-count.exp
+++ b/gdb/testsuite/gdb.threads/inf-thr-count.exp
@@ -35,22 +35,22 @@ 
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # Start GDB.  Ensure we are in non-stop mode as we need to read from
 # the inferior while it is running.
 save_vars {GDBFLAGS} {
     append GDBFLAGS { -ex "set non-stop on"}
     clean_restart $::testfile
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint breakpt
 gdb_continue_to_breakpoint "first breakpt call"
 
@@ -129,11 +129,11 @@  proc wait_for_stage { num } {
 }
 
 # Wait until we can see that the extra thread has been created.
 if {![wait_for_stage 1]} {
     unresolved "failed to see thread start"
-    return -1
+    return
 }
 
 
 if {[target_info exists gdb_protocol]
     && ([target_info gdb_protocol] == "remote"
@@ -158,11 +158,11 @@  gdb_test_no_output "set variable spin = 0" \
     "set 'spin' flag to allow worker thread to exit"
 
 # Wait until the extra thread has exited.
 if {![wait_for_stage 2]} {
     unresolved "failed to see thread start"
-    return -1
+    return
 }
 
 # Check that the second thread has gone away.
 gdb_test {with print thread-events on -- p $_inferior_thread_count} \
     "^${exit_thread_re}$re_var = 1" \
diff --git a/gdb/testsuite/gdb.threads/infcall-thread-announce.exp b/gdb/testsuite/gdb.threads/infcall-thread-announce.exp
index 311daaca87cc..a554670f1e6e 100644
--- a/gdb/testsuite/gdb.threads/infcall-thread-announce.exp
+++ b/gdb/testsuite/gdb.threads/infcall-thread-announce.exp
@@ -18,15 +18,15 @@ 
 # function call from GDB.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint breakpt
 gdb_continue_to_breakpoint "first breakpt call"
 
diff --git a/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp b/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp
index 1b4fa3a8d3ee..3e8533674d46 100644
--- a/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp
+++ b/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp
@@ -18,17 +18,17 @@  standard_testfile info-threads-cur-sal.c info-threads-cur-sal-2.c
 set executable ${testfile}
 
 if {[gdb_compile_pthreads \
 	 "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" \
 	 "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${executable}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "start"
 gdb_continue_to_breakpoint "start"
 
diff --git a/gdb/testsuite/gdb.threads/info-threads-options.exp b/gdb/testsuite/gdb.threads/info-threads-options.exp
index 15c4904892e7..476c62cb323c 100644
--- a/gdb/testsuite/gdb.threads/info-threads-options.exp
+++ b/gdb/testsuite/gdb.threads/info-threads-options.exp
@@ -17,20 +17,20 @@ 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable debug] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     clean_restart $::testfile
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "stop_here"
 gdb_test_multiple "continue -a&" "" {
     -re "Continuing.\r\n$gdb_prompt " {
diff --git a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp
index 446af5e23eca..e8b29dce2fa3 100644
--- a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp
+++ b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp
@@ -18,15 +18,15 @@ 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Read the number of threads out of the inferior.
 set NUM_THREADS [get_integer_valueof "num_threads" -1]
 
diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
index e921ea0cf06f..23a3d038c09a 100644
--- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
+++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
@@ -23,11 +23,11 @@  standard_testfile
 # Some targets can't do function calls, so don't even bother with this
 # test.
 require {!target_info exists gdb,cannot_call_functions}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.threads/killed-outside.exp b/gdb/testsuite/gdb.threads/killed-outside.exp
index 51726ebf0e9c..67d6c6b32239 100644
--- a/gdb/testsuite/gdb.threads/killed-outside.exp
+++ b/gdb/testsuite/gdb.threads/killed-outside.exp
@@ -18,21 +18,21 @@ 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {pthreads debug}] == -1} {
-    return -1
+    return
 }
 
 if { ![runto "all_started"] } {
-    return -1
+    return
 }
 delete_breakpoints
 
 set testpid [get_valueof "" "pid" -1 "get pid of inferior"]
 if { $testpid == -1 } {
-    return -1
+    return
 }
 remote_exec target "kill -9 ${testpid}"
 
 # Give it some time to die.
 sleep 2
diff --git a/gdb/testsuite/gdb.threads/killed.exp b/gdb/testsuite/gdb.threads/killed.exp
index 96fe37dbefed..39b60dff8dd4 100644
--- a/gdb/testsuite/gdb.threads/killed.exp
+++ b/gdb/testsuite/gdb.threads/killed.exp
@@ -56,11 +56,11 @@ 
 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 
 clean_restart ${::testfile}
 
diff --git a/gdb/testsuite/gdb.threads/leader-exit.exp b/gdb/testsuite/gdb.threads/leader-exit.exp
index 9aa7d0fdf3f1..b5e6f558ac7b 100644
--- a/gdb/testsuite/gdb.threads/leader-exit.exp
+++ b/gdb/testsuite/gdb.threads/leader-exit.exp
@@ -19,17 +19,17 @@  require {!target_info exists gdb,nointerrupts}
 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${executable}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
 
diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
index 5592e364e1f4..42773f2293b5 100644
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ b/gdb/testsuite/gdb.threads/linux-dp.exp
@@ -39,11 +39,11 @@  if {![istarget *-*-linux-gnu*]} {
     return
 }
 
 standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 gdb_test_no_output "set print sevenbit-strings"
 runto_main
diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
index a26abab630d5..3a9e7c193a58 100644
--- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
+++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
@@ -23,11 +23,11 @@  require allow_hw_watchpoint_multi_tests
 
 standard_testfile
 if {[gdb_compile_pthreads \
 	 "${srcdir}/${subdir}/${srcfile}" \
 	 "${binfile}" executable {debug} ] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
diff --git a/gdb/testsuite/gdb.threads/main-thread-exit-during-detach.exp b/gdb/testsuite/gdb.threads/main-thread-exit-during-detach.exp
index 7df41da642c3..717eca236c03 100644
--- a/gdb/testsuite/gdb.threads/main-thread-exit-during-detach.exp
+++ b/gdb/testsuite/gdb.threads/main-thread-exit-during-detach.exp
@@ -38,11 +38,11 @@  standard_testfile
 
 require allow_python_tests
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # Run the test.  When SPAWN_INFERIOR is true the inferior is started
 # as a separate process which GDB then attaches too.  When
 # SPAWN_INFERIOR is false the inferior is started directly within GDB.
diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp
index c0c0c8917c81..aabbb24b4d9e 100644
--- a/gdb/testsuite/gdb.threads/manythreads.exp
+++ b/gdb/testsuite/gdb.threads/manythreads.exp
@@ -26,11 +26,11 @@  if {[info exists DEBUG]} {
     # make check RUNTESTFLAGS='gdb.threads/manythreads.exp DEBUG=1'
     lappend opts "additional_flags=-DDEBUG"
 }
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 gdb_test_no_output "set print sevenbit-strings"
 runto_main
diff --git a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
index 881a489b04d6..cc5fe888f878 100644
--- a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
+++ b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
@@ -17,18 +17,18 @@ 
 # exiting, in non-stop mode.  Originally based on multi-create.exp.
 
 standard_testfile multi-create.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set pagination off"
 gdb_test_no_output "set non-stop on"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Create a breakpoint that does "info threads" when hit, which will be
 # just while other threads are being created or exiting.
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
diff --git a/gdb/testsuite/gdb.threads/multi-create.exp b/gdb/testsuite/gdb.threads/multi-create.exp
index 9bc49b6b7e1a..a34ddfe69957 100644
--- a/gdb/testsuite/gdb.threads/multi-create.exp
+++ b/gdb/testsuite/gdb.threads/multi-create.exp
@@ -16,11 +16,11 @@ 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 runto_main
 
diff --git a/gdb/testsuite/gdb.threads/multiple-step-overs.exp b/gdb/testsuite/gdb.threads/multiple-step-overs.exp
index 8433e16340ad..2159718f2a63 100644
--- a/gdb/testsuite/gdb.threads/multiple-step-overs.exp
+++ b/gdb/testsuite/gdb.threads/multiple-step-overs.exp
@@ -21,11 +21,11 @@  set executable ${testfile}
 
 require {!target_info exists gdb,nosignals}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
+    return
 }
 
 # Prepare environment for test.
 
 proc setup {} {
diff --git a/gdb/testsuite/gdb.threads/names.exp b/gdb/testsuite/gdb.threads/names.exp
index dc3ed4eaa2ca..31f36f1b3d7c 100644
--- a/gdb/testsuite/gdb.threads/names.exp
+++ b/gdb/testsuite/gdb.threads/names.exp
@@ -19,11 +19,11 @@ 
 require {!target_info exists gdb,no_thread_names}
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 if {![runto "all_threads_ready"]} {
     return
 }
diff --git a/gdb/testsuite/gdb.threads/next-bp-other-thread.exp b/gdb/testsuite/gdb.threads/next-bp-other-thread.exp
index 56f2c8440e98..9f07ad6aaa9b 100644
--- a/gdb/testsuite/gdb.threads/next-bp-other-thread.exp
+++ b/gdb/testsuite/gdb.threads/next-bp-other-thread.exp
@@ -20,11 +20,11 @@ 
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # Test all "set scheduler-locking" variants.
 foreach schedlock {"off" "step" "on" } {
     with_test_prefix "schedlock=$schedlock" {
diff --git a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
index aa6fc1965a92..6852e8d7f876 100644
--- a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
+++ b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
@@ -22,11 +22,11 @@  standard_testfile
 
 set linenum [gdb_get_line_number "set break here"]
 
 if {[prepare_for_testing "failed to prepare" \
 	 $testfile $srcfile {c++ debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
index e21a7fe4c9fa..621da59db46f 100644
--- a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
+++ b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
@@ -18,17 +18,17 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${executable}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint $srcfile:[gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
 
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exc-1.exp b/gdb/testsuite/gdb.threads/non-ldr-exc-1.exp
index 360630e6f66a..442b6fb639ff 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exc-1.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exc-1.exp
@@ -18,11 +18,11 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 proc do_test { lock_sched nonstop } {
     global executable
 
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp b/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp
index f331e823c2b2..ead262cc2b50 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp
@@ -19,11 +19,11 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 proc do_test { lock_sched nonstop } {
     global executable
     global tdlabel_re
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exc-3.exp b/gdb/testsuite/gdb.threads/non-ldr-exc-3.exp
index 76ac3f155628..2ad3a84d24bf 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exc-3.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exc-3.exp
@@ -21,11 +21,11 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 proc do_test { lock_sched nonstop } {
     global executable
 
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp b/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp
index a895a51f4a99..fad49047ac39 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exc-4.exp
@@ -20,11 +20,11 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 proc do_test { lock_sched nonstop } {
     global executable
 
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exit.exp b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
index e49f3ce86074..6b5e85fd2fa0 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exit.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
@@ -17,15 +17,15 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
 
diff --git a/gdb/testsuite/gdb.threads/non-stop-fair-events.exp b/gdb/testsuite/gdb.threads/non-stop-fair-events.exp
index 7593c2432f3c..53d62963f62b 100644
--- a/gdb/testsuite/gdb.threads/non-stop-fair-events.exp
+++ b/gdb/testsuite/gdb.threads/non-stop-fair-events.exp
@@ -21,17 +21,17 @@  set executable ${testfile}
 
 require {!target_info exists gdb,nosignals}
 
 set options { "additional_flags=-DTIMEOUT=$timeout" debug pthreads }
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options] == -1} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set non-stop on"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # We want "handle print", to make sure the target backend reports the
 # signal to the run control core.
 gdb_test "handle SIGUSR1 print nostop pass" ""
diff --git a/gdb/testsuite/gdb.threads/omp-par-scope.exp b/gdb/testsuite/gdb.threads/omp-par-scope.exp
index 5f919a1952a1..b561bf2f4a5b 100644
--- a/gdb/testsuite/gdb.threads/omp-par-scope.exp
+++ b/gdb/testsuite/gdb.threads/omp-par-scope.exp
@@ -34,11 +34,11 @@  if {[support_nested_function_tests]} {
     lappend opts "additional_flags=-DHAVE_NESTED_FUNCTION_SUPPORT"
     set have_nested_function_support 1
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 # gdb_openmp_setup may be defined to set auto-load safe-path and possibly
 # sysroot.  These settings are required for gdb to be able to find
 # the libgomp python plugin.  (sysroot only needs to be defined for
@@ -59,11 +59,11 @@  if {[info procs gdb_openmp_setup] != ""} {
 	return -1
     }
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # We want to invoke setup_kfail (and in some cases setup_xfail) when
 # GDB does not yet have support for finding the values of variables in
 # (non-master) threads.  We'll check this by looking at the output of
diff --git a/gdb/testsuite/gdb.threads/omp-task.exp b/gdb/testsuite/gdb.threads/omp-task.exp
index a77ffe86cf95..636bcf989159 100644
--- a/gdb/testsuite/gdb.threads/omp-task.exp
+++ b/gdb/testsuite/gdb.threads/omp-task.exp
@@ -22,22 +22,22 @@  standard_testfile
 
 set have_nested_function_support 0
 set opts {openmp debug}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {[info procs gdb_openmp_setup] != ""} {
     if {[gdb_openmp_setup $binfile] != ""} {
 	untested "could not set up OpenMP environment"
 	return -1
     }
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "omp task shared"]
 gdb_test "continue" ".*Breakpoint 2.*" "continue 1"
 gdb_test "print share1" "= 9"
diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
index 4395195a703f..c9ff1de32c89 100644
--- a/gdb/testsuite/gdb.threads/pending-step.exp
+++ b/gdb/testsuite/gdb.threads/pending-step.exp
@@ -49,11 +49,11 @@ 
 #    breakpoint hit.  GDB reports to the user a spurious SIGTRAP.
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
index e03e2e48ccb5..a1ac1fdd230b 100644
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -25,11 +25,11 @@  standard_testfile
 # regexp for "horizontal" text (i.e. doesn't include newline or
 # carriage return)
 set horiz "\[^\n\r\]*"
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 # Now we can proceed with the real testing.
 
 clean_restart ${::testfile}
diff --git a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
index e4ec42e0dd53..624422bb7ea2 100644
--- a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
+++ b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
@@ -26,11 +26,11 @@ 
 standard_testfile
 
 set linenum [gdb_get_line_number "set break here"]
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # The test proper.  If COND_BP_TARGET is true, then test with
 # conditional breakpoints evaluated on the target side, if possible.
 
diff --git a/gdb/testsuite/gdb.threads/process-exit-status-is-leader-exit-status.exp b/gdb/testsuite/gdb.threads/process-exit-status-is-leader-exit-status.exp
index 7876e9f763c7..8ecacba59d5e 100644
--- a/gdb/testsuite/gdb.threads/process-exit-status-is-leader-exit-status.exp
+++ b/gdb/testsuite/gdb.threads/process-exit-status-is-leader-exit-status.exp
@@ -30,11 +30,11 @@  if { ![istarget "*-*-linux*"] } {
 }
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 for {set iteration 0} {$iteration < 10} {incr iteration} {
     with_test_prefix "iteration=$iteration" {
 	if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/pthread_cond_wait.exp b/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
index a3d5cc2f2081..ae700b8715ca 100644
--- a/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
+++ b/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
@@ -20,11 +20,11 @@ 
 # being blocked on a call to pthread_cond_wait().
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 runto_main
 
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 0e382af9835b..93d242b56f20 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -29,11 +29,11 @@  if {[istarget "*-*-linux"]} {
 } else {
     set target_cflags ""
 }
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 gdb_test_no_output "set print sevenbit-strings"
diff --git a/gdb/testsuite/gdb.threads/queue-signal.exp b/gdb/testsuite/gdb.threads/queue-signal.exp
index c461df0aa28d..905f47c1243b 100644
--- a/gdb/testsuite/gdb.threads/queue-signal.exp
+++ b/gdb/testsuite/gdb.threads/queue-signal.exp
@@ -15,11 +15,11 @@ 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable { debug }] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
index bbd5e651b7f7..e1079f3d1feb 100644
--- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
+++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
@@ -27,11 +27,11 @@  set executable ${testfile}
 if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
index a6c453c59c2c..0136d625e777 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -26,11 +26,11 @@  standard_testfile
 
 # The number of threads, including the main thread.
 set NUM 2
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 # Now we can proceed with the real testing.
 
 # Get the current contents of the `args` array in the test program.
diff --git a/gdb/testsuite/gdb.threads/siginfo-threads.exp b/gdb/testsuite/gdb.threads/siginfo-threads.exp
index 81fc03ef5a52..acf1185cdfc5 100644
--- a/gdb/testsuite/gdb.threads/siginfo-threads.exp
+++ b/gdb/testsuite/gdb.threads/siginfo-threads.exp
@@ -18,17 +18,17 @@  set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" \
 	 ${binfile} \
 	 executable \
 	 [list debug additional_flags=-lrt]] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # `nostop noprint pass' could in some cases report false PASS due to
 # the (preempt 'handle') code path in linux-nat.c.
 
diff --git a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
index 4eff994fa098..d5b657bfc3dd 100644
--- a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
@@ -22,11 +22,11 @@  standard_testfile
 
 require {!target_info exists gdb,nosignals}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable { debug }] != "" } {
-    return -1
+    return
 }
 
 # Run the test proper.  STEP_OVER indicates whether we leave in place
 # a breakpoint that needs to be stepped over when we explicitly
 # request a signal be delivered with the "signal" command.
diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
index 983a5e8dc43c..9aeb8597fc93 100644
--- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
@@ -20,11 +20,11 @@  standard_testfile
 
 require {!target_info exists gdb,nosignals}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable { debug }] != "" } {
-    return -1
+    return
 }
 
 # Run the test proper.  SCHEDLOCK indicates which variant (around
 # scheduler-locking) of the test to perform.
 
diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
index 0138cc0036a7..745447d3a075 100644
--- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
+++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
@@ -17,11 +17,11 @@  standard_testfile
 
 require {!target_info exists gdb,nosignals}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable { debug }] != "" } {
-    return -1
+    return
 }
 
 # Run test proper.  COMMAND indicates whether to resume the inferior
 # with "signal 0" or "continue".
 
diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
index c3f5af8905e6..55c2ee626d5f 100644
--- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp
+++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
@@ -20,11 +20,11 @@  standard_testfile
 
 require {!target_info exists gdb,nosignals}
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}]} {
-    return -1
+    return
 }
 
 # Run test proper.  SIGTRAP_THREAD is the thread that should get the
 # SIGTRAP.
 
diff --git a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp
index 589da62a15b2..f7bc6cb36b9e 100644
--- a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp
+++ b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp
@@ -27,11 +27,11 @@  set executable ${testfile}
 
 require {!target_info exists gdb,nosignals}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
+    return
 }
 
 proc get_value {var test} {
     global expect_out
     global gdb_prompt
@@ -50,11 +50,11 @@  proc get_value {var test} {
 # Start with a fresh gdb.
 
 clean_restart $executable
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "set wait-thread-2 breakpoint here"]
 gdb_continue_to_breakpoint "run to wait-thread-2 breakpoint"
 gdb_test "info threads" "" "info threads with thread 2"
diff --git a/gdb/testsuite/gdb.threads/sigstep-threads.exp b/gdb/testsuite/gdb.threads/sigstep-threads.exp
index 77f65cf359d6..1ad86f01440c 100644
--- a/gdb/testsuite/gdb.threads/sigstep-threads.exp
+++ b/gdb/testsuite/gdb.threads/sigstep-threads.exp
@@ -16,17 +16,17 @@ 
 standard_testfile
 set executable ${testfile}
 
 if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # `noprint' would not test the full logic of GDB.
 gdb_test "handle SIGUSR1 nostop print pass" \
     "\r\nSIGUSR1\[ \t\]+No\[ \t\]+Yes\[ \t\]+Yes\[ \t\].*"
diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.threads/sigthread.exp
index 5e6094d9691a..af5941a41cdd 100644
--- a/gdb/testsuite/gdb.threads/sigthread.exp
+++ b/gdb/testsuite/gdb.threads/sigthread.exp
@@ -19,11 +19,11 @@  standard_testfile
 # This test requires sending ^C to interrupt the running target.
 require {!target_info exists gdb,nointerrupts}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable { debug }] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp b/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp
index a87e076398ea..deb3432c9a8e 100644
--- a/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp
+++ b/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp
@@ -29,11 +29,11 @@ 
 #  been single-stepped, not continued.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp b/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp
index ccd81078ba9c..d391239f5018 100644
--- a/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp
+++ b/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp
@@ -19,11 +19,11 @@ 
 standard_testfile
 set executable ${testfile}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
+    return
 }
 
 # The test proper.  DISPLACED is true if we should try with displaced
 # stepping.  COMMAND is the execution command to test.
 proc do_test {displaced command} {
diff --git a/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp b/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp
index 0a0c5edb97a3..877309a9f4ef 100644
--- a/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp
+++ b/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp
@@ -24,11 +24,11 @@  set executable ${testfile}
 # watchpoints.
 require allow_hw_watchpoint_tests
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
+    return
 }
 
 # The test proper.  DISPLACED is true if we should try with displaced
 # stepping.  WITH_BP is true if we should try with a thread-specific
 # breakpoint (for the wrong thread) right after the instruction that
diff --git a/gdb/testsuite/gdb.threads/stepi-random-signal.exp b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
index a63b9b76502b..64b07ec00bb8 100644
--- a/gdb/testsuite/gdb.threads/stepi-random-signal.exp
+++ b/gdb/testsuite/gdb.threads/stepi-random-signal.exp
@@ -23,18 +23,18 @@  set executable ${testfile}
 if { [gdb_compile_pthreads \
 	  "${srcdir}/${subdir}/${srcfile}" \
 	  "${binfile}" \
 	  executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
 
 # Start the second thread.
 if {![runto start]} {
-    return -1
+    return
 }
 
 # Go back to the main thread, and leave it in the loop, where we're
 # reasonably sure we don't have 'conditional jmp $pc'-like
 # instructions.  We wouldn't be able to detect whether a stepi makes
diff --git a/gdb/testsuite/gdb.threads/stop-with-handle.exp b/gdb/testsuite/gdb.threads/stop-with-handle.exp
index 895d7ef7bac7..de40a3f1e946 100644
--- a/gdb/testsuite/gdb.threads/stop-with-handle.exp
+++ b/gdb/testsuite/gdb.threads/stop-with-handle.exp
@@ -23,11 +23,11 @@ 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" \
 	 "${testfile}" "${srcfile}" {debug pthreads}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.threads/switch-threads.exp b/gdb/testsuite/gdb.threads/switch-threads.exp
index bd25b1b49ffb..10e40e6843b8 100644
--- a/gdb/testsuite/gdb.threads/switch-threads.exp
+++ b/gdb/testsuite/gdb.threads/switch-threads.exp
@@ -24,11 +24,11 @@ 
 # command.
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 runto_main
diff --git a/gdb/testsuite/gdb.threads/thread-bp-deleted.exp b/gdb/testsuite/gdb.threads/thread-bp-deleted.exp
index 037e8288b62f..f7791e0ea90f 100644
--- a/gdb/testsuite/gdb.threads/thread-bp-deleted.exp
+++ b/gdb/testsuite/gdb.threads/thread-bp-deleted.exp
@@ -24,11 +24,11 @@ 
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}] == -1} {
-    return -1
+    return
 }
 
 # We need to do things a little differently when using the remote protocol.
 set is_remote \
     [expr \
@@ -41,19 +41,19 @@  save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"maint set target-non-stop on\""
     clean_restart ${::testfile}
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Check we hace non-stop mode.  We do try to force this on above, but maybe
 # the target doesn't support non-stop mode, in which case (hopefully)
 # non-stop mode will still show as off, and this test should not be run.
 if {![is_target_non_stop]} {
     unsupported "required non-stop mode"
-    return -1
+    return
 }
 
 delete_breakpoints
 
 gdb_breakpoint "breakpt"
diff --git a/gdb/testsuite/gdb.threads/thread-execl.exp b/gdb/testsuite/gdb.threads/thread-execl.exp
index b926664b4508..cd6d6e4f57bf 100644
--- a/gdb/testsuite/gdb.threads/thread-execl.exp
+++ b/gdb/testsuite/gdb.threads/thread-execl.exp
@@ -18,11 +18,11 @@ 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable debug] != "" } {
-    return -1
+    return
 }
 
 # Run the test proper.  SCHEDLOCK specifies what scheduler-locking
 # should be set to.
 
diff --git a/gdb/testsuite/gdb.threads/thread-find.exp b/gdb/testsuite/gdb.threads/thread-find.exp
index acaf99f3c02d..b08e148a081a 100644
--- a/gdb/testsuite/gdb.threads/thread-find.exp
+++ b/gdb/testsuite/gdb.threads/thread-find.exp
@@ -16,11 +16,11 @@ 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@gnu.org
 
 standard_testfile linux-dp.c
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 gdb_test_no_output "set print sevenbit-strings"
 runto_main
diff --git a/gdb/testsuite/gdb.threads/thread-specific-bp.exp b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
index 36d2344619a9..d698b0ce96b1 100644
--- a/gdb/testsuite/gdb.threads/thread-specific-bp.exp
+++ b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
@@ -19,11 +19,11 @@ 
 standard_testfile
 
 if {[gdb_compile_pthreads \
 	 "${srcdir}/${subdir}/${srcfile}" \
 	 "${binfile}" executable {debug} ] != "" } {
-    return -1
+    return
 }
 
 # Extract and return the thread ID of the thread stopped at function
 # FUNC.
 
diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp
index 814e870bc89b..79932ab9dc17 100644
--- a/gdb/testsuite/gdb.threads/thread-specific.exp
+++ b/gdb/testsuite/gdb.threads/thread-specific.exp
@@ -19,11 +19,11 @@ 
 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 # Return a list of the valid thread IDs, with the initial thread first.
 proc get_thread_list { } {
   global gdb_prompt
diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
index d46c3de8c203..d77b323338cc 100644
--- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
+++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
@@ -23,11 +23,11 @@  standard_testfile interrupted-hand-call.c
 # Some targets can't do function calls, so don't even bother with this
 # test.
 require {!target_info exists gdb,cannot_call_functions}
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index 1a79e1126502..e48e3d5b3c37 100644
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -33,11 +33,11 @@ 
 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 
 clean_restart ${::testfile}
 
diff --git a/gdb/testsuite/gdb.threads/thread_events.exp b/gdb/testsuite/gdb.threads/thread_events.exp
index f7075f82724e..37579bdd395d 100644
--- a/gdb/testsuite/gdb.threads/thread_events.exp
+++ b/gdb/testsuite/gdb.threads/thread_events.exp
@@ -34,11 +34,11 @@  if {[target_info gdb_protocol] == "remote"
 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 proc gdb_test_thread_start {messages_enabled command pattern message} {
   global gdb_prompt
 
diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp
index 73b61056a192..f8827ae7ea65 100644
--- a/gdb/testsuite/gdb.threads/threadapply.exp
+++ b/gdb/testsuite/gdb.threads/threadapply.exp
@@ -20,11 +20,11 @@ 
 # and will continue for each thread even though an error may occur in
 # backtracing one of the threads.
 
 standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 #
diff --git a/gdb/testsuite/gdb.threads/threadcrash.exp b/gdb/testsuite/gdb.threads/threadcrash.exp
index 1699449f0ed6..aa39f6509e9c 100644
--- a/gdb/testsuite/gdb.threads/threadcrash.exp
+++ b/gdb/testsuite/gdb.threads/threadcrash.exp
@@ -271,11 +271,11 @@  proc_with_prefix test_gcore {} {
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}]} {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 gdb_test_no_output "set backtrace limit unlimited"
diff --git a/gdb/testsuite/gdb.threads/threxit-hop-specific.exp b/gdb/testsuite/gdb.threads/threxit-hop-specific.exp
index f9064b8a19ba..79134a0c5428 100644
--- a/gdb/testsuite/gdb.threads/threxit-hop-specific.exp
+++ b/gdb/testsuite/gdb.threads/threxit-hop-specific.exp
@@ -18,11 +18,11 @@ 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 runto_main
diff --git a/gdb/testsuite/gdb.threads/tid-reuse.exp b/gdb/testsuite/gdb.threads/tid-reuse.exp
index ce5986986507..57a544f90088 100644
--- a/gdb/testsuite/gdb.threads/tid-reuse.exp
+++ b/gdb/testsuite/gdb.threads/tid-reuse.exp
@@ -17,15 +17,15 @@ 
 # exited thread is reused.  GDB should not crash when this happens.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile { debug pthreads }] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 delete_breakpoints
 
 # Avoid dumping a ton of thread create/exit info in the logs.
diff --git a/gdb/testsuite/gdb.threads/tls-core.exp b/gdb/testsuite/gdb.threads/tls-core.exp
index e59f22b24545..d2e49dbde02b 100644
--- a/gdb/testsuite/gdb.threads/tls-core.exp
+++ b/gdb/testsuite/gdb.threads/tls-core.exp
@@ -15,11 +15,11 @@ 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	executable { debug }] != "" } {
-    return -1
+    return
 }
 
 # Generate a native core file.
 
 set corefile [core_find $binfile]
diff --git a/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp b/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
index cca67f882e1d..9d2a805c4a5f 100644
--- a/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
@@ -15,11 +15,11 @@ 
 
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 	 {pie}] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 if {![runto_main]} {
     return 0
diff --git a/gdb/testsuite/gdb.threads/tls-nodebug.exp b/gdb/testsuite/gdb.threads/tls-nodebug.exp
index cc6573aae6c5..e02788700d89 100644
--- a/gdb/testsuite/gdb.threads/tls-nodebug.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug.exp
@@ -21,11 +21,11 @@  if {[istarget "*-*-linux"]} {
 } else {
     set target_cflags ""
 }
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 if {![runto_main]} {
    return 0
diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug.exp b/gdb/testsuite/gdb.threads/tls-sepdebug.exp
index 1b47fe243ee0..5f705d1750d0 100644
--- a/gdb/testsuite/gdb.threads/tls-sepdebug.exp
+++ b/gdb/testsuite/gdb.threads/tls-sepdebug.exp
@@ -44,11 +44,11 @@  set binsharedfile      [standard_output_file ${binsharedbase}]
 # 'thread_local' to indicate thread local storage.  This is available
 # as a macro starting in C11 and became a C-language keyword in C23.
 if { [build_executable "build library" ${binsharedfile} ${srcsharedfile} \
 	  {debug shlib additional_flags=-std=c11}] == -1 } {
     untested "Couldn't compile test library"
-    return -1
+    return
 }
 
 # Strip debug information from $binsharedfile, placing it in
 # ${binsharedfile}.debug.  Also add a .gnu_debuglink in the former,
 # pointing to the latter.
@@ -59,11 +59,11 @@  gdb_gnu_strip_debug ${binsharedfile}
 if  { [gdb_compile_pthreads \
 	"${srcdir}/${subdir}/${srcmainfile} ${binsharedfile}" \
 	"${binmainfile}" executable [list debug additional_flags=-std=c11]] \
        != "" } {
     untested "Couldn't compile test program"
-    return -1
+    return
 }
 
 set absdir [file dirname [standard_output_file ${binsharedbase}]]
 if { [info exists ::env(LD_LIBRARY_PATH)] } {
     set ld_library_path $::env(LD_LIBRARY_PATH)
diff --git a/gdb/testsuite/gdb.threads/tls-shared.exp b/gdb/testsuite/gdb.threads/tls-shared.exp
index 768b84a2103a..a293809105d6 100644
--- a/gdb/testsuite/gdb.threads/tls-shared.exp
+++ b/gdb/testsuite/gdb.threads/tls-shared.exp
@@ -23,11 +23,11 @@  set binfile_lib [standard_output_file ${libfile}.so]
 
 remote_exec build "rm -f ${binfile}"
 
 if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != ""
      || [gdb_compile_pthreads ${srcdir}/${subdir}/${srcfile} ${binfile} executable [list debug shlib=${binfile_lib}]] != ""} {
-    return -1
+    return
 }
 
 
 clean_restart ${::testfile}
 gdb_load_shlib ${binfile_lib}
diff --git a/gdb/testsuite/gdb.threads/tls-so_extern.exp b/gdb/testsuite/gdb.threads/tls-so_extern.exp
index 91205308067b..eb3f32df6210 100644
--- a/gdb/testsuite/gdb.threads/tls-so_extern.exp
+++ b/gdb/testsuite/gdb.threads/tls-so_extern.exp
@@ -22,11 +22,11 @@  set srcfile_lib ${libfile}.c
 set binfile_lib [standard_output_file ${libfile}.so]
 
 
 if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != ""
      || [gdb_compile_pthreads ${srcdir}/${subdir}/${srcfile} ${binfile} executable [list debug shlib=${binfile_lib}]] != ""} {
-    return -1
+    return
 }
 
 
 clean_restart ${::testfile}
 gdb_load_shlib ${binfile_lib}
diff --git a/gdb/testsuite/gdb.threads/tls-var.exp b/gdb/testsuite/gdb.threads/tls-var.exp
index fe95df91dbbd..5b2968a7bd01 100644
--- a/gdb/testsuite/gdb.threads/tls-var.exp
+++ b/gdb/testsuite/gdb.threads/tls-var.exp
@@ -20,11 +20,11 @@  set objmainfile [standard_output_file ${testfile}-main.o]
 set executable ${testfile}
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${objfile} object {debug}] != ""
      || [gdb_compile ${srcdir}/${subdir}/${srcmainfile} ${objmainfile} object {}] != ""
      || [gdb_compile_pthreads "${objfile} ${objmainfile}" ${binfile} executable {}] != ""} {
-    return -1
+    return
 }
 
 clean_restart ${executable}
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 4a93433e8333..bf48a6f9fc9e 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -23,11 +23,11 @@  if {[istarget "*-*-linux"]} {
 } else {
     set target_cflags ""
 }
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" "${binfile}" executable [list c++ debug]] != "" } {
-    return -1
+    return
 }
 
 ### Compute the value of the a_thread_local variable.
 proc compute_expected_value {value} {
     set expected_value 0
diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
index ade63410da9d..555bc463bb5b 100644
--- a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
+++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
@@ -19,11 +19,11 @@ 
 require allow_fork_tests
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 # DETACH indicates whether "set detach-on-fork" is enabled.  It is
 # either "on" or "off".
 
diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
index 0f35bd5faa04..b0e8079cf2df 100644
--- a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
+++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
@@ -19,11 +19,11 @@ 
 require allow_fork_tests
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}]} {
-    return -1
+    return
 }
 
 # DETACH indicates whether "set detach-on-fork" is enabled.  It is
 # either "on" or "off".
 
diff --git a/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp b/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp
index 2686eba08e70..e258ec719e91 100644
--- a/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp
+++ b/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp
@@ -47,18 +47,18 @@  set nr_loops 20
 # Compile the main program that calls vfork and hits a breakpoint.
 set opts [list debug additional_flags=-DNR_LOOPS=$nr_loops]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 	$opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Compile the secondary program, which just sleeps.
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile_sleep}" "${binfile_sleep}" executable \
 	{debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # We exercise two methods of getting a second inferior to execute while the
 # first one vforks.  METHOD can be:
 #
diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
index 980ca4d66d0c..58b16be70f26 100644
--- a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
@@ -30,11 +30,11 @@  if {![istarget *-*-linux*]} {
     return 0
 }
 
 standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" ${binfile} executable [list debug additional_flags=-lrt]] != "" } {
-    return -1
+    return
 }
 
 foreach reorder {0 1} { with_test_prefix "reorder$reorder" {
 
     clean_restart $testfile
diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
index 77a3f7bc5e2c..e975e22e5730 100644
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads.exp
@@ -26,11 +26,11 @@  proc target_no_stopped_data { } {
     return [istarget s390*-*-*]
 }
 
 standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart $::testfile
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp
index 00229d384c06..49884f4136dd 100644
--- a/gdb/testsuite/gdb.threads/watchthreads2.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads2.exp
@@ -26,11 +26,11 @@  set X_INCR_COUNT 10
 # so the test is only meaningful on a system with hardware watchpoints.
 require allow_hw_watchpoint_tests
 
 standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS -DX_INCR_COUNT=$X_INCR_COUNT"]] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
@@ -66,11 +66,11 @@  for { set i 0 } { $i < $NR_THREADS } { incr i } {
 if { $nr_started == $NR_THREADS } {
     pass "all threads started"
 } else {
     fail "all threads started"
     # No point in continuing.
-    return -1
+    return
 }
 
 # Check that multiple uses of the 'thread' keyword will give an error.
 gdb_test "watch x thread 1 thread 2" "You can specify only one thread\\."
 
diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp
index d5f0ff0068c1..28a5071bd5e5 100644
--- a/gdb/testsuite/gdb.threads/wp-replication.exp
+++ b/gdb/testsuite/gdb.threads/wp-replication.exp
@@ -29,11 +29,11 @@  set NR_TRIGGERS_PER_THREAD 2
 # only meaningful on a target with hardware watchpoint support.
 require allow_hw_watchpoint_tests
 
 standard_testfile
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS -DNR_TRIGGERS_PER_THREAD=$NR_TRIGGERS_PER_THREAD"]] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
 
 # Force hardware watchpoints to be used.