[PATCH 22/36] GDB: testsuite: Python: Don't return -1 from top-level (sed)

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

This patch is purely the result of running:

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

inside gdb/testsuite/gdb.python.
---
 gdb/testsuite/gdb.python/lib-types.exp                    | 2 +-
 gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp    | 2 +-
 gdb/testsuite/gdb.python/py-arch-reg-groups.exp           | 2 +-
 gdb/testsuite/gdb.python/py-arch-reg-names.exp            | 2 +-
 gdb/testsuite/gdb.python/py-arch.exp                      | 2 +-
 gdb/testsuite/gdb.python/py-as-string.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-auto-load-chaining.exp        | 2 +-
 .../py-autoloaded-pretty-printers-in-newobjfile-event.exp | 4 ++--
 gdb/testsuite/gdb.python/py-bad-printers.exp              | 4 ++--
 gdb/testsuite/gdb.python/py-block.exp                     | 2 +-
 gdb/testsuite/gdb.python/py-bp-locations.exp              | 6 +++---
 gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp    | 2 +-
 gdb/testsuite/gdb.python/py-breakpoint.exp                | 2 +-
 gdb/testsuite/gdb.python/py-caller-is.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-cmd-exception.exp             | 2 +-
 gdb/testsuite/gdb.python/py-cmd-prompt.exp                | 2 +-
 gdb/testsuite/gdb.python/py-cmd.exp                       | 2 +-
 gdb/testsuite/gdb.python/py-commands-breakpoint.exp       | 2 +-
 gdb/testsuite/gdb.python/py-connection-removed.exp        | 2 +-
 gdb/testsuite/gdb.python/py-connection.exp                | 2 +-
 gdb/testsuite/gdb.python/py-event-load.exp                | 4 ++--
 gdb/testsuite/gdb.python/py-events.exp                    | 2 +-
 gdb/testsuite/gdb.python/py-evsignal.exp                  | 4 ++--
 gdb/testsuite/gdb.python/py-evthreads.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-exec-file.exp                 | 4 ++--
 gdb/testsuite/gdb.python/py-explore-cc.exp                | 2 +-
 gdb/testsuite/gdb.python/py-explore.exp                   | 2 +-
 .../gdb.python/py-finish-breakpoint-deletion.exp          | 2 +-
 gdb/testsuite/gdb.python/py-finish-breakpoint.exp         | 2 +-
 gdb/testsuite/gdb.python/py-finish-breakpoint2.exp        | 2 +-
 gdb/testsuite/gdb.python/py-frame-args.exp                | 4 ++--
 gdb/testsuite/gdb.python/py-frame-inline.exp              | 2 +-
 gdb/testsuite/gdb.python/py-frame.exp                     | 4 ++--
 gdb/testsuite/gdb.python/py-framefilter-addr.exp          | 2 +-
 gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp    | 2 +-
 gdb/testsuite/gdb.python/py-framefilter-mi.exp            | 4 ++--
 gdb/testsuite/gdb.python/py-framefilter.exp               | 4 ++--
 gdb/testsuite/gdb.python/py-inferior.exp                  | 2 +-
 gdb/testsuite/gdb.python/py-infthread.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-label-symbol-value.exp        | 2 +-
 gdb/testsuite/gdb.python/py-lazy-string.exp               | 4 ++--
 gdb/testsuite/gdb.python/py-linetable-empty.exp           | 2 +-
 gdb/testsuite/gdb.python/py-linetable.exp                 | 4 ++--
 gdb/testsuite/gdb.python/py-mi-cmd.exp                    | 2 +-
 gdb/testsuite/gdb.python/py-mi-events.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-mi-notify.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-mi-objfile.exp                | 2 +-
 .../gdb.python/py-mi-var-info-path-expression.exp         | 2 +-
 gdb/testsuite/gdb.python/py-mi.exp                        | 8 ++++----
 gdb/testsuite/gdb.python/py-missing-debug.exp             | 4 ++--
 gdb/testsuite/gdb.python/py-nested-maps.exp               | 4 ++--
 gdb/testsuite/gdb.python/py-objfile-script.exp            | 2 +-
 gdb/testsuite/gdb.python/py-objfile.exp                   | 4 ++--
 gdb/testsuite/gdb.python/py-pending-frame-level.exp       | 2 +-
 gdb/testsuite/gdb.python/py-pp-cast.exp                   | 4 ++--
 gdb/testsuite/gdb.python/py-pp-integral.exp               | 4 ++--
 gdb/testsuite/gdb.python/py-pp-maint.exp                  | 4 ++--
 gdb/testsuite/gdb.python/py-pp-re-notag.exp               | 4 ++--
 gdb/testsuite/gdb.python/py-pp-registration.exp           | 4 ++--
 gdb/testsuite/gdb.python/py-prettyprint-stub.exp          | 2 +-
 gdb/testsuite/gdb.python/py-progspace-events.exp          | 2 +-
 gdb/testsuite/gdb.python/py-progspace.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-prompt.exp                    | 2 +-
 gdb/testsuite/gdb.python/py-read-memory-leak.exp          | 2 +-
 gdb/testsuite/gdb.python/py-record-btrace-threads.exp     | 4 ++--
 gdb/testsuite/gdb.python/py-record-btrace.exp             | 2 +-
 gdb/testsuite/gdb.python/py-record-full.exp               | 2 +-
 gdb/testsuite/gdb.python/py-recurse-unwind.exp            | 2 +-
 gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp       | 2 +-
 gdb/testsuite/gdb.python/py-send-packet.exp               | 2 +-
 gdb/testsuite/gdb.python/py-shared.exp                    | 4 ++--
 gdb/testsuite/gdb.python/py-strfns.exp                    | 2 +-
 gdb/testsuite/gdb.python/py-sym-artificial.exp            | 4 ++--
 gdb/testsuite/gdb.python/py-symbol.exp                    | 4 ++--
 gdb/testsuite/gdb.python/py-symtab.exp                    | 2 +-
 gdb/testsuite/gdb.python/py-sync-interp.exp               | 2 +-
 gdb/testsuite/gdb.python/py-template.exp                  | 2 +-
 gdb/testsuite/gdb.python/py-thread-exited.exp             | 4 ++--
 gdb/testsuite/gdb.python/py-thrhandle.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-typeprint.exp                 | 2 +-
 gdb/testsuite/gdb.python/py-unwind-inline.exp             | 2 +-
 gdb/testsuite/gdb.python/py-unwind-maint.exp              | 4 ++--
 gdb/testsuite/gdb.python/py-unwind-user-regs.exp          | 2 +-
 gdb/testsuite/gdb.python/py-unwind.exp                    | 2 +-
 gdb/testsuite/gdb.python/py-value-cc.exp                  | 2 +-
 gdb/testsuite/gdb.python/py-value.exp                     | 2 +-
 gdb/testsuite/gdb.python/py-varobj.exp                    | 2 +-
 gdb/testsuite/gdb.python/py-watchpoint.exp                | 2 +-
 gdb/testsuite/gdb.python/py-xmethods.exp                  | 2 +-
 gdb/testsuite/gdb.python/python.exp                       | 2 +-
 gdb/testsuite/gdb.python/tui-window-disabled.exp          | 2 +-
 gdb/testsuite/gdb.python/tui-window.exp                   | 2 +-
 92 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp
index f871abc633a5..aa281c6443d5 100644
--- a/gdb/testsuite/gdb.python/lib-types.exp
+++ b/gdb/testsuite/gdb.python/lib-types.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile .cc
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp b/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp
index c9846b877ac3..52162fc99522 100644
--- a/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp
+++ b/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp
@@ -25,7 +25,7 @@ standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # This proc restarts GDB, makes the inferior reach the desired spot - marked
diff --git a/gdb/testsuite/gdb.python/py-arch-reg-groups.exp b/gdb/testsuite/gdb.python/py-arch-reg-groups.exp
index 5c06ebff9426..6630143f0373 100644
--- a/gdb/testsuite/gdb.python/py-arch-reg-groups.exp
+++ b/gdb/testsuite/gdb.python/py-arch-reg-groups.exp
@@ -20,7 +20,7 @@ require allow_python_tests
 standard_testfile py-arch.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-arch-reg-names.exp b/gdb/testsuite/gdb.python/py-arch-reg-names.exp
index 954cbb77754a..7bbb171e13e1 100644
--- a/gdb/testsuite/gdb.python/py-arch-reg-names.exp
+++ b/gdb/testsuite/gdb.python/py-arch-reg-names.exp
@@ -20,7 +20,7 @@ require allow_python_tests
 standard_testfile py-arch.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-arch.exp b/gdb/testsuite/gdb.python/py-arch.exp
index 12b0e4a10c80..a2ac6ad4bfa1 100644
--- a/gdb/testsuite/gdb.python/py-arch.exp
+++ b/gdb/testsuite/gdb.python/py-arch.exp
@@ -17,7 +17,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-as-string.exp b/gdb/testsuite/gdb.python/py-as-string.exp
index fd4d5d740f45..3dc858db1ada 100644
--- a/gdb/testsuite/gdb.python/py-as-string.exp
+++ b/gdb/testsuite/gdb.python/py-as-string.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-auto-load-chaining.exp b/gdb/testsuite/gdb.python/py-auto-load-chaining.exp
index 5033f21526cc..7a92ff0fac71 100644
--- a/gdb/testsuite/gdb.python/py-auto-load-chaining.exp
+++ b/gdb/testsuite/gdb.python/py-auto-load-chaining.exp
@@ -46,7 +46,7 @@ set remote_python_file [gdb_remote_download host \
 
 # Build the main test executable and start GDB.
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp b/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
index d4498dfc8cd8..9b8a10cf84f5 100644
--- a/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
+++ b/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
@@ -32,7 +32,7 @@ set binfile_lib [standard_output_file "${libname}.so"]
 # Compile library.
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} \
       {debug c++}] != "" } {
-    return -1
+    return
 }
 
 # Compile main program.
@@ -40,7 +40,7 @@ if { [gdb_compile ${srcdir}/${subdir}/${srcfile} \
       ${binfile} \
       executable \
       [list debug c++ shlib=$binfile_lib]] != "" } {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.python/py-bad-printers.exp b/gdb/testsuite/gdb.python/py-bad-printers.exp
index 70704c668118..a96030d6b483 100644
--- a/gdb/testsuite/gdb.python/py-bad-printers.exp
+++ b/gdb/testsuite/gdb.python/py-bad-printers.exp
@@ -23,11 +23,11 @@ require allow_python_tests
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index e4e309da05f0..b0123c4d3b57 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-bp-locations.exp b/gdb/testsuite/gdb.python/py-bp-locations.exp
index 00ff1c9912ac..879306ea0f24 100644
--- a/gdb/testsuite/gdb.python/py-bp-locations.exp
+++ b/gdb/testsuite/gdb.python/py-bp-locations.exp
@@ -20,7 +20,7 @@ require allow_python_tests
 standard_testfile
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {c++ debug}] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
@@ -28,7 +28,7 @@ save_vars { GDBFLAGS } {
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Build a regexp string that represents the __repr__ of a
@@ -80,7 +80,7 @@ gdb_test "python print(gdb.breakpoints()\[1\].locations\[0\])" \
 gdb_continue_to_breakpoint "" ".*25.*"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "add"
diff --git a/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
index 74983a899bdc..0b9d493ada29 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 clean_restart "${testfile}"
diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index 4215f3ca1de0..692d55eb0a21 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -33,7 +33,7 @@ standard_testfile
 set options {debug c++}
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${options}] } {
-    return -1
+    return
 }
 
 set past_throw_catch_line [gdb_get_line_number "Past throw-catch."]
diff --git a/gdb/testsuite/gdb.python/py-caller-is.exp b/gdb/testsuite/gdb.python/py-caller-is.exp
index e512b97d5169..e195e42a8ca6 100644
--- a/gdb/testsuite/gdb.python/py-caller-is.exp
+++ b/gdb/testsuite/gdb.python/py-caller-is.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-cmd-exception.exp b/gdb/testsuite/gdb.python/py-cmd-exception.exp
index 51c35f32ac9e..789a8b15c3e0 100644
--- a/gdb/testsuite/gdb.python/py-cmd-exception.exp
+++ b/gdb/testsuite/gdb.python/py-cmd-exception.exp
@@ -24,7 +24,7 @@ require !use_gdb_stub allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
diff --git a/gdb/testsuite/gdb.python/py-cmd-prompt.exp b/gdb/testsuite/gdb.python/py-cmd-prompt.exp
index a83c52ae1214..5b81d88bbe71 100644
--- a/gdb/testsuite/gdb.python/py-cmd-prompt.exp
+++ b/gdb/testsuite/gdb.python/py-cmd-prompt.exp
@@ -28,7 +28,7 @@ require allow_python_tests allow_gdbserver_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set bp_line [gdb_get_line_number "break-here"]
diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp
index be5c955e29b1..766a594d2f49 100644
--- a/gdb/testsuite/gdb.python/py-cmd.exp
+++ b/gdb/testsuite/gdb.python/py-cmd.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-commands-breakpoint.exp b/gdb/testsuite/gdb.python/py-commands-breakpoint.exp
index ba2de2f68db7..2b3842c816f6 100644
--- a/gdb/testsuite/gdb.python/py-commands-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-commands-breakpoint.exp
@@ -22,7 +22,7 @@ require allow_python_tests
 standard_testfile .c .py
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.python/py-connection-removed.exp b/gdb/testsuite/gdb.python/py-connection-removed.exp
index f2027043761b..abe3f78d73b1 100644
--- a/gdb/testsuite/gdb.python/py-connection-removed.exp
+++ b/gdb/testsuite/gdb.python/py-connection-removed.exp
@@ -30,7 +30,7 @@ require allow_python_tests
 standard_testfile py-connection.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-connection.exp b/gdb/testsuite/gdb.python/py-connection.exp
index 3045e9817312..e520e91368aa 100644
--- a/gdb/testsuite/gdb.python/py-connection.exp
+++ b/gdb/testsuite/gdb.python/py-connection.exp
@@ -25,7 +25,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-event-load.exp b/gdb/testsuite/gdb.python/py-event-load.exp
index 8e4f8d2992bf..a0ba644a7f67 100644
--- a/gdb/testsuite/gdb.python/py-event-load.exp
+++ b/gdb/testsuite/gdb.python/py-event-load.exp
@@ -24,7 +24,7 @@ standard_testfile .c
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable {debug shlib_load}] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set testfile2 py-events-shlib
@@ -33,7 +33,7 @@ set binfile2 [standard_output_file ${testfile2}.so]
 if {[gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" \
 	 ${binfile2} {debug}] != ""} {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 set binfile2_dlopen [gdb_download_shlib $binfile2]
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 1e0513b997bf..1177dd54e482 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -28,7 +28,7 @@ set exec_opts [list debug shlib=$lib_sl]
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-evsignal.exp b/gdb/testsuite/gdb.python/py-evsignal.exp
index e91f9af8f159..e9d4d2aa442f 100644
--- a/gdb/testsuite/gdb.python/py-evsignal.exp
+++ b/gdb/testsuite/gdb.python/py-evsignal.exp
@@ -16,7 +16,7 @@
 if {[gdb_protocol_is_remote]} {
     # RuntimeError: Could not find event thread
     kfail "python/12966" "Signal Thread 3"
-    return -1
+    return
 }
 
 load_lib gdb-python.exp
@@ -26,7 +26,7 @@ require allow_python_tests
 standard_testfile py-evthreads.c
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 clean_restart $testfile
 
diff --git a/gdb/testsuite/gdb.python/py-evthreads.exp b/gdb/testsuite/gdb.python/py-evthreads.exp
index 1ab5b58c03c2..09efc3adb3a4 100644
--- a/gdb/testsuite/gdb.python/py-evthreads.exp
+++ b/gdb/testsuite/gdb.python/py-evthreads.exp
@@ -20,7 +20,7 @@ load_lib gdb-python.exp
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.python/py-exec-file.exp b/gdb/testsuite/gdb.python/py-exec-file.exp
index 180de990f5ba..6a73efc406ad 100644
--- a/gdb/testsuite/gdb.python/py-exec-file.exp
+++ b/gdb/testsuite/gdb.python/py-exec-file.exp
@@ -26,12 +26,12 @@ set binfile2 [standard_output_file $testfile2]
 
 if {[build_executable "failed to prepare first executable" \
 	 $binfile1 $srcfile]} {
-    return -1
+    return
 }
 
 if {[build_executable "failed to prepare second executable" \
 	 $binfile2 $srcfile]} {
-    return -1
+    return
 }
 
 set binfile1 [gdb_remote_download host $binfile1]
diff --git a/gdb/testsuite/gdb.python/py-explore-cc.exp b/gdb/testsuite/gdb.python/py-explore-cc.exp
index 7c04b227cfc0..772886b931f9 100644
--- a/gdb/testsuite/gdb.python/py-explore-cc.exp
+++ b/gdb/testsuite/gdb.python/py-explore-cc.exp
@@ -21,7 +21,7 @@ require allow_cplus_tests allow_python_tests
 standard_testfile py-explore.cc
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 set int_ptr_ref_desc "The value of 'int_ptr_ref' is of type 'int_ptr' which is a typedef of type 'int \\*'.*\'int_ptr_ref' is a pointer to a value of type 'int'.*"
diff --git a/gdb/testsuite/gdb.python/py-explore.exp b/gdb/testsuite/gdb.python/py-explore.exp
index 78df5b9314fe..276148da8f10 100644
--- a/gdb/testsuite/gdb.python/py-explore.exp
+++ b/gdb/testsuite/gdb.python/py-explore.exp
@@ -18,7 +18,7 @@ standard_testfile
 require allow_python_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set SS "struct SimpleStruct"
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp
index 52be47b68cf7..627c9d0b6ef5 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp
@@ -22,7 +22,7 @@ require allow_python_tests
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
index eb0790523e82..043416c724cc 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
@@ -31,7 +31,7 @@ set exec_opts [list debug shlib=$lib_sl]
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
index 86a876650ee3..d782c577cfc1 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile .cc
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-frame-args.exp b/gdb/testsuite/gdb.python/py-frame-args.exp
index ae688b2cc753..3129c90ae401 100644
--- a/gdb/testsuite/gdb.python/py-frame-args.exp
+++ b/gdb/testsuite/gdb.python/py-frame-args.exp
@@ -18,11 +18,11 @@ standard_testfile
 require allow_python_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp
index f007a2ca4aa1..a44136990c02 100644
--- a/gdb/testsuite/gdb.python/py-frame-inline.exp
+++ b/gdb/testsuite/gdb.python/py-frame-inline.exp
@@ -20,7 +20,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
index dd0b948581c7..92a0ef3f7ebb 100644
--- a/gdb/testsuite/gdb.python/py-frame.exp
+++ b/gdb/testsuite/gdb.python/py-frame.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # The following tests require execution.
@@ -206,7 +206,7 @@ gdb_test "python print(gdb.selected_frame().read_register(bad_object))" \
 # Compile again without debug info.
 gdb_exit
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-framefilter-addr.exp b/gdb/testsuite/gdb.python/py-framefilter-addr.exp
index 087da1b690f9..3c0436ce1972 100644
--- a/gdb/testsuite/gdb.python/py-framefilter-addr.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter-addr.exp
@@ -24,7 +24,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
index 7cd5e2e66536..8a4bf001a694 100644
--- a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
@@ -24,7 +24,7 @@ require is_x86_64_m64_target
 # We cannot use prepare_for_testing as we have to set the safe-patch
 # to check objfile and progspace printers.
 if {[build_executable $testfile.exp $testfile $srcfile {}] == -1} {
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.exp b/gdb/testsuite/gdb.python/py-framefilter-mi.exp
index 7b091b8f3652..3b4cedba0918 100644
--- a/gdb/testsuite/gdb.python/py-framefilter-mi.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter-mi.exp
@@ -25,7 +25,7 @@ set pyfile py-framefilter.py
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
@@ -34,7 +34,7 @@ if {[mi_clean_restart $::testfile]} {
 
 if {[lsearch -exact [mi_get_features] python] < 0} {
     unsupported "python support is disabled"
-    return -1
+    return
 }
 
 mi_runto_main
diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp
index 292b72d66dc7..a993ac5d54fd 100644
--- a/gdb/testsuite/gdb.python/py-framefilter.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter.exp
@@ -25,7 +25,7 @@ standard_testfile
 # We cannot use prepare_for_testing as we have to set the safe-patch
 # to check objfile and progspace printers.
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
@@ -283,7 +283,7 @@ gdb_test "bt 1" "Quit" "bt 1 with KeyboardInterrupt"
 # We cannot use prepare_for_testing as we have to set the safe-patch
 # to check objfile and progspace printers.
 if {[build_executable $testfile.exp $testfile $srcfile {nodebug}] == -1} {
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp
index 0c27da1a7a4e..8479427f726a 100644
--- a/gdb/testsuite/gdb.python/py-inferior.exp
+++ b/gdb/testsuite/gdb.python/py-inferior.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [gdb_compile_pthreads ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] != "" } {
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp
index 5859fff284cd..65ccc8f9a9e8 100644
--- a/gdb/testsuite/gdb.python/py-infthread.exp
+++ b/gdb/testsuite/gdb.python/py-infthread.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 gdb_test_multiline "install new_thread event handler" \
diff --git a/gdb/testsuite/gdb.python/py-label-symbol-value.exp b/gdb/testsuite/gdb.python/py-label-symbol-value.exp
index b4d598773989..c97ae72ec58d 100644
--- a/gdb/testsuite/gdb.python/py-label-symbol-value.exp
+++ b/gdb/testsuite/gdb.python/py-label-symbol-value.exp
@@ -21,7 +21,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-lazy-string.exp b/gdb/testsuite/gdb.python/py-lazy-string.exp
index aabcc3be6e50..87d8eea46546 100644
--- a/gdb/testsuite/gdb.python/py-lazy-string.exp
+++ b/gdb/testsuite/gdb.python/py-lazy-string.exp
@@ -23,11 +23,11 @@ require allow_python_tests
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main ]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here"]
diff --git a/gdb/testsuite/gdb.python/py-linetable-empty.exp b/gdb/testsuite/gdb.python/py-linetable-empty.exp
index 6113d35c1e37..651fe9b6dbf3 100644
--- a/gdb/testsuite/gdb.python/py-linetable-empty.exp
+++ b/gdb/testsuite/gdb.python/py-linetable-empty.exp
@@ -39,7 +39,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-linetable.exp b/gdb/testsuite/gdb.python/py-linetable.exp
index 1e4402a089f2..5290c4a9beac 100644
--- a/gdb/testsuite/gdb.python/py-linetable.exp
+++ b/gdb/testsuite/gdb.python/py-linetable.exp
@@ -27,11 +27,11 @@ if {[info exists COMPILE]} {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_py_test_silent_cmd "python lt = gdb.selected_frame().find_sal().symtab.linetable()" \
diff --git a/gdb/testsuite/gdb.python/py-mi-cmd.exp b/gdb/testsuite/gdb.python/py-mi-cmd.exp
index e13da6a31404..b66a73c331f5 100644
--- a/gdb/testsuite/gdb.python/py-mi-cmd.exp
+++ b/gdb/testsuite/gdb.python/py-mi-cmd.exp
@@ -25,7 +25,7 @@ if {[mi_gdb_start]} {
 
 if {[lsearch -exact [mi_get_features] python] < 0} {
     unsupported "python support is disabled"
-    return -1
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.python/py-mi-events.exp b/gdb/testsuite/gdb.python/py-mi-events.exp
index a6c724e0c4d5..a2314aed3221 100644
--- a/gdb/testsuite/gdb.python/py-mi-events.exp
+++ b/gdb/testsuite/gdb.python/py-mi-events.exp
@@ -26,7 +26,7 @@ set pyfile ${testfile}-gdb.py
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host ${srcdir}/${subdir}/${pyfile}]
diff --git a/gdb/testsuite/gdb.python/py-mi-notify.exp b/gdb/testsuite/gdb.python/py-mi-notify.exp
index 220c5ca0babe..b08a667ae846 100644
--- a/gdb/testsuite/gdb.python/py-mi-notify.exp
+++ b/gdb/testsuite/gdb.python/py-mi-notify.exp
@@ -25,7 +25,7 @@ if {[mi_gdb_start]} {
 
 if {[lsearch -exact [mi_get_features] python] < 0} {
     unsupported "python support is disabled"
-    return -1
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.python/py-mi-objfile.exp b/gdb/testsuite/gdb.python/py-mi-objfile.exp
index 4c8846981eb9..99cd6b750a7c 100644
--- a/gdb/testsuite/gdb.python/py-mi-objfile.exp
+++ b/gdb/testsuite/gdb.python/py-mi-objfile.exp
@@ -25,7 +25,7 @@ set pyfile ${testfile}-gdb.py
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Make the -gdb.py script available to gdb, it is automagically loaded by gdb.
diff --git a/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp b/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
index dd97de3be677..f300efe9caea 100644
--- a/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
+++ b/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
@@ -26,7 +26,7 @@ require allow_python_tests
 standard_testfile
 
 if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" } {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp
index 73b351e58ccb..51025653b620 100644
--- a/gdb/testsuite/gdb.python/py-mi.exp
+++ b/gdb/testsuite/gdb.python/py-mi.exp
@@ -23,7 +23,7 @@ standard_testfile py-prettyprint.c
 set pyfile py-prettyprint.py
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
@@ -32,7 +32,7 @@ if {[mi_clean_restart $::testfile]} {
 
 if {[lsearch -exact [mi_get_features] python] < 0} {
     unsupported "python support is disabled"
-    return -1
+    return
 }
 
 mi_runto_main
@@ -342,7 +342,7 @@ gdb_exit
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" \
 	   executable {debug c++ additional_flags=-DMI}] != "" } {
     untested "failed to compile in C++ mode"
-    return -1
+    return
 }
 
 if {[mi_clean_restart ${::testfile}-cxx]} {
@@ -351,7 +351,7 @@ if {[mi_clean_restart ${::testfile}-cxx]} {
 
 if {[lsearch -exact [mi_get_features] python] < 0} {
     unsupported "python support is disabled"
-    return -1
+    return
 }
 
 with_test_prefix "varobj fake" {
diff --git a/gdb/testsuite/gdb.python/py-missing-debug.exp b/gdb/testsuite/gdb.python/py-missing-debug.exp
index 2aebebd453c7..256e3e955c77 100644
--- a/gdb/testsuite/gdb.python/py-missing-debug.exp
+++ b/gdb/testsuite/gdb.python/py-missing-debug.exp
@@ -21,14 +21,14 @@ standard_testfile
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile} \
     {debug build-id}]} {
-    return -1
+    return
 }
 
 # Remove debug information from BINFILE and place it into
 # BINFILE.debug.
 if {[gdb_gnu_strip_debug $binfile]} {
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
 
 set remote_python_file \
diff --git a/gdb/testsuite/gdb.python/py-nested-maps.exp b/gdb/testsuite/gdb.python/py-nested-maps.exp
index 7869c9138d52..f73829cb09a9 100644
--- a/gdb/testsuite/gdb.python/py-nested-maps.exp
+++ b/gdb/testsuite/gdb.python/py-nested-maps.exp
@@ -24,11 +24,11 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.python/py-objfile-script.exp b/gdb/testsuite/gdb.python/py-objfile-script.exp
index 099a9986cfd7..c22163ae3565 100644
--- a/gdb/testsuite/gdb.python/py-objfile-script.exp
+++ b/gdb/testsuite/gdb.python/py-objfile-script.exp
@@ -21,7 +21,7 @@ standard_testfile
 require allow_python_tests
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-objfile.exp b/gdb/testsuite/gdb.python/py-objfile.exp
index e823efbf3b15..0127b82936cb 100644
--- a/gdb/testsuite/gdb.python/py-objfile.exp
+++ b/gdb/testsuite/gdb.python/py-objfile.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
@@ -116,7 +116,7 @@ gdb_test "python print(objfile.username)" "None" \
 # Now build another copy of the testcase, this time without debug info.
 
 if { [prepare_for_testing "failed to prepare" ${testfile}2 ${srcfile} {nodebug ldflags=-Wl,--strip-debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-pending-frame-level.exp b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
index 8fc1d2653b15..204c7c36c54b 100644
--- a/gdb/testsuite/gdb.python/py-pending-frame-level.exp
+++ b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
@@ -22,7 +22,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-pp-cast.exp b/gdb/testsuite/gdb.python/py-pp-cast.exp
index 0184565872df..fe14a9a430f5 100644
--- a/gdb/testsuite/gdb.python/py-pp-cast.exp
+++ b/gdb/testsuite/gdb.python/py-pp-cast.exp
@@ -22,11 +22,11 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto break_function]} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.python/py-pp-integral.exp b/gdb/testsuite/gdb.python/py-pp-integral.exp
index 73dd86f4ea76..190af2b219d1 100644
--- a/gdb/testsuite/gdb.python/py-pp-integral.exp
+++ b/gdb/testsuite/gdb.python/py-pp-integral.exp
@@ -18,11 +18,11 @@ standard_testfile
 require allow_python_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto tick_tock]} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp
index 7f3659450db6..8bb537c8d0e6 100644
--- a/gdb/testsuite/gdb.python/py-pp-maint.exp
+++ b/gdb/testsuite/gdb.python/py-pp-maint.exp
@@ -25,11 +25,11 @@ require allow_python_tests
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "b [gdb_get_line_number {break to inspect} ${testfile}.c ]" \
diff --git a/gdb/testsuite/gdb.python/py-pp-re-notag.exp b/gdb/testsuite/gdb.python/py-pp-re-notag.exp
index 73dd86f4ea76..190af2b219d1 100644
--- a/gdb/testsuite/gdb.python/py-pp-re-notag.exp
+++ b/gdb/testsuite/gdb.python/py-pp-re-notag.exp
@@ -18,11 +18,11 @@ standard_testfile
 require allow_python_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto tick_tock]} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.python/py-pp-registration.exp b/gdb/testsuite/gdb.python/py-pp-registration.exp
index ed65ed87a281..3d974b2120b6 100644
--- a/gdb/testsuite/gdb.python/py-pp-registration.exp
+++ b/gdb/testsuite/gdb.python/py-pp-registration.exp
@@ -23,14 +23,14 @@ require allow_python_tests
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
 			    ${srcdir}/${subdir}/${testfile}.py]
 
 if {![runto_main ]} {
-    return -1
+    return
 }
 
 proc prepare_test { } {
diff --git a/gdb/testsuite/gdb.python/py-prettyprint-stub.exp b/gdb/testsuite/gdb.python/py-prettyprint-stub.exp
index 49723980a0b1..491e8c369596 100644
--- a/gdb/testsuite/gdb.python/py-prettyprint-stub.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint-stub.exp
@@ -29,7 +29,7 @@ if { [build_executable_from_specs \
 	  $testfile {c++} \
 	  $srcfile {c++ debug} \
 	  $srcfile2 {c++}] == -1 } {
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-progspace-events.exp b/gdb/testsuite/gdb.python/py-progspace-events.exp
index 143fa17126b8..c07a659910fa 100644
--- a/gdb/testsuite/gdb.python/py-progspace-events.exp
+++ b/gdb/testsuite/gdb.python/py-progspace-events.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if {[prepare_for_testing "preparing" $testfile $srcfile] == -1} {
-    return -1
+    return
 }
 
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/py-progspace-events.py]
diff --git a/gdb/testsuite/gdb.python/py-progspace.exp b/gdb/testsuite/gdb.python/py-progspace.exp
index d11bb941acbf..b3fc203c4b98 100644
--- a/gdb/testsuite/gdb.python/py-progspace.exp
+++ b/gdb/testsuite/gdb.python/py-progspace.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.python/py-prompt.exp
index 60186f71db69..cc149ae62303 100644
--- a/gdb/testsuite/gdb.python/py-prompt.exp
+++ b/gdb/testsuite/gdb.python/py-prompt.exp
@@ -24,7 +24,7 @@ load_lib prompt.exp
 require allow_python_tests
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 save_vars { INTERNAL_GDBFLAGS GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.python/py-read-memory-leak.exp b/gdb/testsuite/gdb.python/py-read-memory-leak.exp
index e7fcbf79b37d..58343126e67c 100644
--- a/gdb/testsuite/gdb.python/py-read-memory-leak.exp
+++ b/gdb/testsuite/gdb.python/py-read-memory-leak.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
index 0b3115a5a6dd..995e733a4aab 100644
--- a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
@@ -23,12 +23,12 @@ 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.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp
index ade569c480c7..4e324e71fc09 100644
--- a/gdb/testsuite/gdb.python/py-record-btrace.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace.exp
@@ -26,7 +26,7 @@ standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { return -1 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 with_test_prefix "no or double record" {
diff --git a/gdb/testsuite/gdb.python/py-record-full.exp b/gdb/testsuite/gdb.python/py-record-full.exp
index 125cecebfd25..95640770e9a5 100644
--- a/gdb/testsuite/gdb.python/py-record-full.exp
+++ b/gdb/testsuite/gdb.python/py-record-full.exp
@@ -26,7 +26,7 @@ standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { return -1 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 with_test_prefix "no or double record" {
diff --git a/gdb/testsuite/gdb.python/py-recurse-unwind.exp b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
index fbb538f39064..4df47a6e8b4b 100644
--- a/gdb/testsuite/gdb.python/py-recurse-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
@@ -29,7 +29,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
diff --git a/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp b/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
index 2b2fe112d9e5..576fd5a85d3d 100644
--- a/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
+++ b/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
@@ -23,7 +23,7 @@ standard_testfile .cc
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile \
     {debug c++ additional_flags="-std=c++11"}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-send-packet.exp b/gdb/testsuite/gdb.python/py-send-packet.exp
index b0ca70e61a65..4464c1c5123b 100644
--- a/gdb/testsuite/gdb.python/py-send-packet.exp
+++ b/gdb/testsuite/gdb.python/py-send-packet.exp
@@ -27,7 +27,7 @@ standard_testfile
 require allow_gdbserver_tests allow_python_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # Make sure we're disconnected, in case we're testing with an
diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp
index 6b8f0f0c1bde..0eef359d0b87 100644
--- a/gdb/testsuite/gdb.python/py-shared.exp
+++ b/gdb/testsuite/gdb.python/py-shared.exp
@@ -27,14 +27,14 @@ set library  [standard_output_file ${libfile}.sl]
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 set exec_opts [list debug shlib=${library}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-strfns.exp b/gdb/testsuite/gdb.python/py-strfns.exp
index 79de2c4d8357..539ba984db02 100644
--- a/gdb/testsuite/gdb.python/py-strfns.exp
+++ b/gdb/testsuite/gdb.python/py-strfns.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-sym-artificial.exp b/gdb/testsuite/gdb.python/py-sym-artificial.exp
index e0592bc068b6..1ea2ea4a13fb 100644
--- a/gdb/testsuite/gdb.python/py-sym-artificial.exp
+++ b/gdb/testsuite/gdb.python/py-sym-artificial.exp
@@ -49,11 +49,11 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_py_test_silent_cmd "python v = gdb.lookup_symbol('the_variable')" \
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index 7d172d792e9f..90e724ca0313 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -25,7 +25,7 @@ standard_testfile py-symbol.c py-symbol-2.c py-symbol-3.c
 set opts { debug additional_flags=-DUSE_TWO_FILES }
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2 $srcfile3] $opts]} {
-    return -1
+    return
 }
 
 set readnow_p [readnow]
@@ -196,7 +196,7 @@ set testfile $testfile-cxx
 set binfile [standard_output_file $testfile]
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile $srcfile2] $opts] } {
-    return -1
+    return
 }
 
 gdb_test "python print (gdb.lookup_global_symbol ('(anonymous namespace)::anon') is None)" \
diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index 7a426faf3a57..786bdc75fc4d 100644
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -23,7 +23,7 @@ require allow_python_tests
 standard_testfile py-symbol.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-sync-interp.exp b/gdb/testsuite/gdb.python/py-sync-interp.exp
index 4323ee0443e5..5fb67b1eb5b4 100644
--- a/gdb/testsuite/gdb.python/py-sync-interp.exp
+++ b/gdb/testsuite/gdb.python/py-sync-interp.exp
@@ -25,7 +25,7 @@ require can_spawn_for_attach allow_python_tests
 load_lib gdb-python.exp
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set test_spawn_id [spawn_wait_for_attach $binfile]
diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp
index 1bf3604e98fa..9099e7e32dc0 100644
--- a/gdb/testsuite/gdb.python/py-template.exp
+++ b/gdb/testsuite/gdb.python/py-template.exp
@@ -22,7 +22,7 @@ standard_testfile .cc
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 	  {debug c++}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.python/py-thread-exited.exp b/gdb/testsuite/gdb.python/py-thread-exited.exp
index 862adeb4587d..908af96d9d5b 100644
--- a/gdb/testsuite/gdb.python/py-thread-exited.exp
+++ b/gdb/testsuite/gdb.python/py-thread-exited.exp
@@ -20,7 +20,7 @@ load_lib gdb-python.exp
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
@@ -33,7 +33,7 @@ gdb_test_no_output "source ${pyfile}" "load python file"
 gdb_test "test-events" "Event testers registered."
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.python/py-thrhandle.exp b/gdb/testsuite/gdb.python/py-thrhandle.exp
index 2aeb7777f0d3..3c9effc8d6be 100644
--- a/gdb/testsuite/gdb.python/py-thrhandle.exp
+++ b/gdb/testsuite/gdb.python/py-thrhandle.exp
@@ -26,7 +26,7 @@ require allow_python_tests
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
-    return -1
+    return
 }
 
 clean_restart ${::testfile}
diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp
index f8ccdbf49544..ab53f26d8172 100644
--- a/gdb/testsuite/gdb.python/py-typeprint.exp
+++ b/gdb/testsuite/gdb.python/py-typeprint.exp
@@ -21,7 +21,7 @@ load_lib cp-support.exp
 standard_testfile .cc
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.python/py-unwind-inline.exp b/gdb/testsuite/gdb.python/py-unwind-inline.exp
index 0f63e4310f71..ef9b00eccc8b 100644
--- a/gdb/testsuite/gdb.python/py-unwind-inline.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-inline.exp
@@ -24,7 +24,7 @@ standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  debug] } {
-    return -1
+    return
 }
 
 # The following tests require execution.
diff --git a/gdb/testsuite/gdb.python/py-unwind-maint.exp b/gdb/testsuite/gdb.python/py-unwind-maint.exp
index 10d1f722db2d..e2ec925a0808 100644
--- a/gdb/testsuite/gdb.python/py-unwind-maint.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-maint.exp
@@ -23,13 +23,13 @@ require allow_python_tests
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "source ${pyfile}" "Python script imported" \
diff --git a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
index ac81d98c5826..c594bf74ceef 100644
--- a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
@@ -43,7 +43,7 @@ require allow_python_tests
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-unwind.exp b/gdb/testsuite/gdb.python/py-unwind.exp
index 784d9dfcb64d..058caaf1efc7 100644
--- a/gdb/testsuite/gdb.python/py-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-unwind.exp
@@ -28,7 +28,7 @@ standard_testfile
 set flags "additional_flags=-fno-stack-protector"
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} "debug $flags"] } {
-    return -1
+    return
 }
 
 # This test runs on a specific platform.
diff --git a/gdb/testsuite/gdb.python/py-value-cc.exp b/gdb/testsuite/gdb.python/py-value-cc.exp
index 70135bd7ec76..1d65d617e30d 100644
--- a/gdb/testsuite/gdb.python/py-value-cc.exp
+++ b/gdb/testsuite/gdb.python/py-value-cc.exp
@@ -21,7 +21,7 @@ require allow_cplus_tests allow_python_tests
 standard_testfile .cc
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index a384f4139dd4..3746a6cbc0bc 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -800,7 +800,7 @@ proc test_unavailable {} {
 
 # Build C version of executable.  C++ is built later.
 if { [build_inferior "${binfile}" "c"] < 0 } {
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.python/py-varobj.exp b/gdb/testsuite/gdb.python/py-varobj.exp
index 2b1de110e3b9..e8428e3d0745 100644
--- a/gdb/testsuite/gdb.python/py-varobj.exp
+++ b/gdb/testsuite/gdb.python/py-varobj.exp
@@ -22,7 +22,7 @@ require allow_python_tests
 standard_testfile
 
 if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != ""} {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.python/py-watchpoint.exp b/gdb/testsuite/gdb.python/py-watchpoint.exp
index 50ffaab6594b..2fc366228a14 100644
--- a/gdb/testsuite/gdb.python/py-watchpoint.exp
+++ b/gdb/testsuite/gdb.python/py-watchpoint.exp
@@ -20,7 +20,7 @@ load_lib gdb-python.exp
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 require allow_python_tests
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index 087e93e3a6f4..52f0a7597093 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -23,7 +23,7 @@ require allow_cplus_tests allow_python_tests
 standard_testfile py-xmethods.cc
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 07c51e7ac3fa..f2f32019e4c2 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -22,7 +22,7 @@ standard_testfile python.c python-1.c
 
 if {[build_executable $testfile.exp $testfile \
 	 [list $srcfile $srcfile2] debug] == -1} {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.python/tui-window-disabled.exp b/gdb/testsuite/gdb.python/tui-window-disabled.exp
index b90f95c05ac0..35e94b278215 100644
--- a/gdb/testsuite/gdb.python/tui-window-disabled.exp
+++ b/gdb/testsuite/gdb.python/tui-window-disabled.exp
@@ -32,7 +32,7 @@ lappend flags debug
 lappend_include_file flags $srcdir/lib/attributes.h
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile} $flags] == -1} {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.python/tui-window.exp b/gdb/testsuite/gdb.python/tui-window.exp
index 01f290be6aa0..f813908dba49 100644
--- a/gdb/testsuite/gdb.python/tui-window.exp
+++ b/gdb/testsuite/gdb.python/tui-window.exp
@@ -23,7 +23,7 @@ tuiterm_env
 standard_testfile py-arch.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 clean_restart