[PATCH v2 26/37] GDB: testsuite: MI: 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.mi.
---
 gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp              | 2 +-
 gdb/testsuite/gdb.mi/gdb669.exp                             | 2 +-
 gdb/testsuite/gdb.mi/interrupt-thread-group.exp             | 2 +-
 gdb/testsuite/gdb.mi/list-thread-groups-available.exp       | 2 +-
 gdb/testsuite/gdb.mi/mi-add-inferior.exp                    | 2 +-
 gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp              | 4 ++--
 gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp   | 2 +-
 gdb/testsuite/gdb.mi/mi-breakpoint-script.exp               | 2 +-
 gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp            | 4 ++--
 gdb/testsuite/gdb.mi/mi-catch-load.exp                      | 4 ++--
 gdb/testsuite/gdb.mi/mi-cmd-user-context.exp                | 2 +-
 gdb/testsuite/gdb.mi/mi-condbreak-fail.exp                  | 2 +-
 gdb/testsuite/gdb.mi/mi-condbreak-throw.exp                 | 2 +-
 gdb/testsuite/gdb.mi/mi-corefile.exp                        | 2 +-
 gdb/testsuite/gdb.mi/mi-dprintf-pending.exp                 | 4 ++--
 gdb/testsuite/gdb.mi/mi-dprintf.exp                         | 2 +-
 gdb/testsuite/gdb.mi/mi-exit-code.exp                       | 2 +-
 gdb/testsuite/gdb.mi/mi-file-transfer.exp                   | 2 +-
 gdb/testsuite/gdb.mi/mi-fortran-modules.exp                 | 2 +-
 gdb/testsuite/gdb.mi/mi-fullname-deleted.exp                | 6 +++---
 gdb/testsuite/gdb.mi/mi-info-os.exp                         | 6 +++---
 gdb/testsuite/gdb.mi/mi-info-sources.exp                    | 2 +-
 gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp                 | 2 +-
 gdb/testsuite/gdb.mi/mi-logging.exp                         | 4 ++--
 gdb/testsuite/gdb.mi/mi-memory-changed.exp                  | 2 +-
 gdb/testsuite/gdb.mi/mi-nonstop-exit.exp                    | 2 +-
 gdb/testsuite/gdb.mi/mi-nonstop.exp                         | 2 +-
 gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp               | 2 +-
 gdb/testsuite/gdb.mi/mi-nsintrall.exp                       | 2 +-
 gdb/testsuite/gdb.mi/mi-nsmoribund.exp                      | 2 +-
 gdb/testsuite/gdb.mi/mi-nsthrexec.exp                       | 2 +-
 gdb/testsuite/gdb.mi/mi-pending.exp                         | 4 ++--
 gdb/testsuite/gdb.mi/mi-pthreads.exp                        | 2 +-
 gdb/testsuite/gdb.mi/mi-py-modify-bp.exp                    | 2 +-
 gdb/testsuite/gdb.mi/mi-record-changed.exp                  | 2 +-
 gdb/testsuite/gdb.mi/mi-reg-undefined.exp                   | 2 +-
 gdb/testsuite/gdb.mi/mi-stepn.exp                           | 4 ++--
 gdb/testsuite/gdb.mi/mi-sym-info.exp                        | 2 +-
 gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp               | 2 +-
 gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp              | 2 +-
 gdb/testsuite/gdb.mi/mi-threads-interrupt.exp               | 2 +-
 gdb/testsuite/gdb.mi/mi-var-block.exp                       | 2 +-
 gdb/testsuite/gdb.mi/mi-var-child-f.exp                     | 2 +-
 gdb/testsuite/gdb.mi/mi-var-child.exp                       | 4 ++--
 gdb/testsuite/gdb.mi/mi-var-cmd.exp                         | 2 +-
 gdb/testsuite/gdb.mi/mi-var-create-rtti.exp                 | 4 ++--
 gdb/testsuite/gdb.mi/mi-var-display.exp                     | 2 +-
 gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp            | 4 ++--
 gdb/testsuite/gdb.mi/mi-var-invalidate.exp                  | 6 +++---
 .../gdb.mi/mi-var-list-children-invalid-grandchild.exp      | 2 +-
 gdb/testsuite/gdb.mi/mi-var-rtti.exp                        | 2 +-
 gdb/testsuite/gdb.mi/mi-watch-nonstop.exp                   | 2 +-
 gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp              | 2 +-
 gdb/testsuite/gdb.mi/mi2-cli-display.exp                    | 2 +-
 gdb/testsuite/gdb.mi/mi2-var-child.exp                      | 2 +-
 gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp                  | 2 +-
 gdb/testsuite/gdb.mi/new-ui-mi-sync.exp                     | 2 +-
 gdb/testsuite/gdb.mi/print-simple-values.exp                | 2 +-
 gdb/testsuite/gdb.mi/user-selected-context-sync.exp         | 2 +-
 59 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
index ad0dd162c495..94f42fe77ab8 100644
--- a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
+++ b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
@@ -37,11 +37,11 @@ set objmainfile [standard_output_file ${testfile}-main.o]
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $objsfile object {}] != ""
      || [gdb_compile "${srcdir}/${subdir}/${srcfile2}" $objfuncfile object {}] != ""
      || [gdb_compile "${srcdir}/${subdir}/${srcfile3}" $objmainfile object {debug}] != ""
      || [gdb_compile "$objfuncfile $objsfile $objmainfile" $binfile executable {}] != "" } {
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/gdb669.exp b/gdb/testsuite/gdb.mi/gdb669.exp
index a07117a3804c..b03577d85748 100644
--- a/gdb/testsuite/gdb.mi/gdb669.exp
+++ b/gdb/testsuite/gdb.mi/gdb669.exp
@@ -25,11 +25,11 @@ set MIFLAGS "-i=mi"
 #
 standard_testfile pthreads.c
 
 set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 mi_runto_main
 check_mi_and_console_threads "at main"
diff --git a/gdb/testsuite/gdb.mi/interrupt-thread-group.exp b/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
index 17a2a42c5e6c..f2c45a9dc27e 100644
--- a/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
+++ b/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
@@ -23,11 +23,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile .c
 
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 	 executable {debug additional_flags=-std=gnu99}] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\" -ex \"set mi-async\""
     mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
index 426e39ff2b63..77f932cd167e 100644
--- a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
+++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
@@ -24,11 +24,11 @@ standard_testfile
 require allow_xml_test
 require can_spawn_for_attach
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_gdb_start]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-add-inferior.exp b/gdb/testsuite/gdb.mi/mi-add-inferior.exp
index fc9002bd6279..607eaacdf22d 100644
--- a/gdb/testsuite/gdb.mi/mi-add-inferior.exp
+++ b/gdb/testsuite/gdb.mi/mi-add-inferior.exp
@@ -21,11 +21,11 @@ set MIFLAGS "-i=mi"
 standard_testfile basics.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 mi_clean_restart ${::testfile}
 
 # Start execution to establish a connection.
diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
index 78e2ebc3ea88..688ad46f1b39 100644
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
@@ -30,19 +30,19 @@ set lib_sl2  [standard_output_file pendshr2.sl]
 set lib_opts "debug"
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 set MIFLAGS "-i=mi"
 
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 proc test_insert_delete_modify { } {
     global mi_gdb_prompt
     global lib_sl1 lib_sl2
diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp
index eb20460f7594..95097568624e 100644
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-multiple-locations.exp
@@ -17,11 +17,11 @@
 
 load_lib mi-support.exp
 standard_testfile .cc
 
 if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug c++}] != "" } {
-    return -1
+    return
 }
 
 # Generate the regexp pattern used to match the breakpoint description emitted
 # in the various breakpoint command results/events.
 #
diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp
index 70a03d9e0a08..0ec3b4d1abca 100644
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-script.exp
@@ -18,11 +18,11 @@
 
 load_lib mi-support.exp
 standard_testfile .c
 
 if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" } {
-    return -1
+    return
 }
 
 # Generate the regexp pattern used to match the breakpoint description emitted
 # in the various breakpoint command results/events.
 #
diff --git a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp
index ef3164034e79..3581bbe8d794 100644
--- a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp
+++ b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp
@@ -22,16 +22,16 @@ set MIFLAGS "-i=mi"
 
 standard_testfile .cc
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 if {[mi_runto_main] < 0} {
-    return -1
+    return
 }
 set libstdcxx_probe_tests_supported [expr {![mi_skip_libstdcxx_probe_tests]}]
 
 # Grab some line numbers we'll need.
 set catch_1_lineno [gdb_get_line_number "Catch 1"]
diff --git a/gdb/testsuite/gdb.mi/mi-catch-load.exp b/gdb/testsuite/gdb.mi/mi-catch-load.exp
index 4afd9154eb39..e42f9c075ab0 100644
--- a/gdb/testsuite/gdb.mi/mi-catch-load.exp
+++ b/gdb/testsuite/gdb.mi/mi-catch-load.exp
@@ -18,20 +18,20 @@ require allow_shlib_tests
 
 standard_testfile mi-catch-load.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set testfile2 mi-catch-load-so
 set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}.so]
 set binfile2_dlopen [shlib_target_file ${testfile2}.so]
 if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] != "" } {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 gdb_download_shlib $binfile2
 
 # test -catch-load
diff --git a/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp b/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp
index 6e5be0d27764..7ee1949e4405 100644
--- a/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp
+++ b/gdb/testsuite/gdb.mi/mi-cmd-user-context.exp
@@ -20,11 +20,11 @@ load_lib mi-support.exp
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile ${srcfile} "debug pthreads"] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set main_break_line [gdb_get_line_number "main break line"]
 
 set any "\[^\r\n\]*"
diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp b/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp
index db3b61e320fd..99629840e04e 100644
--- a/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp
+++ b/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp
@@ -21,11 +21,11 @@ load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
 standard_testfile
 
 if {[build_executable ${testfile}.exp ${binfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 # Create a breakpoint with a condition that invokes an inferior
 # function call, that will segfault.  Run until GDB hits the
 # breakpoint and check how GDB reports the failed condition check.
diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp b/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp
index 97e671cd2dab..e367f7a24200 100644
--- a/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp
+++ b/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp
@@ -24,11 +24,11 @@ load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
 standard_testfile .cc
 
 if {[build_executable ${testfile}.exp ${binfile} ${srcfile} {debug c++}]} {
-    return -1
+    return
 }
 
 # Create a breakpoint with a condition that invokes an inferior
 # function call, that will segfault.  Run until GDB hits the
 # breakpoint and check how GDB reports the failed condition check.
diff --git a/gdb/testsuite/gdb.mi/mi-corefile.exp b/gdb/testsuite/gdb.mi/mi-corefile.exp
index d3fd841abf40..67c6183f3867 100644
--- a/gdb/testsuite/gdb.mi/mi-corefile.exp
+++ b/gdb/testsuite/gdb.mi/mi-corefile.exp
@@ -22,11 +22,11 @@ require isnative
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set corefile [core_find $binfile {}]
 if {$corefile == ""} {
     untested "unable to create or find corefile"
diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
index f9767fb8c27c..b2e1cc3438cb 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp
@@ -29,16 +29,16 @@ set lib_sl1  [standard_output_file $libfile1.sl]
 set lib_opts debug
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 
 if {[gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""} {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.exp b/gdb/testsuite/gdb.mi/mi-dprintf.exp
index 3f0e4dba1d99..9b2c192e5041 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp
@@ -23,11 +23,11 @@ set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if {[build_executable $testfile.exp $testfile $srcfile $flags] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set dp_location1 [gdb_get_line_number "set dprintf 1 here"]
 
diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.exp b/gdb/testsuite/gdb.mi/mi-exit-code.exp
index c12d1158c07b..2e48c7ce028d 100644
--- a/gdb/testsuite/gdb.mi/mi-exit-code.exp
+++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp
@@ -18,11 +18,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 proc test_list_thread_groups { } {
     global hex
     global decimal
diff --git a/gdb/testsuite/gdb.mi/mi-file-transfer.exp b/gdb/testsuite/gdb.mi/mi-file-transfer.exp
index 7a42766964e7..5fc137ba5a05 100644
--- a/gdb/testsuite/gdb.mi/mi-file-transfer.exp
+++ b/gdb/testsuite/gdb.mi/mi-file-transfer.exp
@@ -24,11 +24,11 @@ require allow_gdbserver_tests
 
 standard_testfile basics.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
index 2d874612e05d..c08d5c2038a7 100644
--- a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
+++ b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
@@ -23,11 +23,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile "mi-fortran-modules.f90" "mi-fortran-modules-2.f90"
 
 if {[build_executable "failed to prepare" ${testfile} \
 	 [list $srcfile2 $srcfile] {debug f90}]} {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 
 mi_runto_main
diff --git a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
index 803c07b3ea03..9f56e03d747a 100644
--- a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
+++ b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp
@@ -30,17 +30,17 @@ set srcfileabs [standard_output_file $srcfile]
 # storing it in the executable's debug info, removing the double
 # slash.  This nullifies the "compare_filenames_for_search does
 # not match" test when using Clang (it can never fail).
 if { [regsub {/[^/]+$} $srcfileabs {/\0} srcfileabs] != 1 } {
     xfail "cannot double the last slash separator"
-    return -1
+    return
 }
 
 if { [regsub {^(/[^/]+)/} $srcfileabs {\1subst/} srcfileabssubst] != 1
      || [regsub {^(/[^/]+)/.*$} $srcfileabs {\1} initdir] != 1 } {
     xfail "missing root subdirectory"
-    return -1
+    return
 }
 
 # Generate a regular expression which to match $srcfileabs with
 # or without the doubled slash.  This is used by the substituted
 # fullname test.
@@ -51,11 +51,11 @@ set f [open $srcfileabs "w"]
 puts $f "int main (void) { return 0; }"
 close $f
 
 if { [gdb_compile "$srcfileabs" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 file delete -- $srcfileabs
 
 if {[mi_clean_restart $::testfile]} {
diff --git a/gdb/testsuite/gdb.mi/mi-info-os.exp b/gdb/testsuite/gdb.mi/mi-info-os.exp
index 9adc8d31c4ed..f802d8cfd92e 100644
--- a/gdb/testsuite/gdb.mi/mi-info-os.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-os.exp
@@ -17,21 +17,21 @@ load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
 # This test is Linux-only.
 if {![istarget *-*-linux*]} {
     unsupported "mi-info-os.exp"
-    return -1
+    return
 }
 
 # Support for XML-output is needed to run this test.
 require allow_xml_test
 
 standard_testfile basics.c
 
 if {[build_executable "Failed to build $testfile" $testfile $srcfile \
 	 debug]} {
-    return -1;
+    return;
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
@@ -42,11 +42,11 @@ if {[mi_clean_restart $::testfile]} {
 # that and cover all targets is to run to main, with mi_runto_main.
 # However, with native configurations, -info-os should work before
 # running any program, so we want to avoid "run".  Using
 # mi_gdb_target_load directly instead achieves this.
 if {[mi_gdb_target_load] < 0} {
-    return -1
+    return
 }
 
 # Try the argument-less form that lists all the types in a table.
 
 mi_gdb_test "-info-os" ".*\\^done,OSDataTable=.*" "-info-os"
diff --git a/gdb/testsuite/gdb.mi/mi-info-sources.exp b/gdb/testsuite/gdb.mi/mi-info-sources.exp
index ab92fff197c0..0b3016c0b55d 100644
--- a/gdb/testsuite/gdb.mi/mi-info-sources.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-sources.exp
@@ -21,11 +21,11 @@ set MIFLAGS "-i=mi"
 standard_testfile .c -base.c
 
 if {[build_executable $testfile.exp $testfile \
 	 [list $srcfile $srcfile2] debug]} {
     untested $testfile.exp
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 
 set readnow_p [mi_readnow]
diff --git a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
index b06f4686e082..91261597fa91 100644
--- a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
+++ b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
@@ -24,11 +24,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile .cc
 set exefile $testfile
 
 if {[build_executable "failed to prepare" $exefile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 
 # Turn off the pending breakpoint queries.
diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp
index 6cff709cfc5c..1ed0d229bae0 100644
--- a/gdb/testsuite/gdb.mi/mi-logging.exp
+++ b/gdb/testsuite/gdb.mi/mi-logging.exp
@@ -19,17 +19,17 @@ set MIFLAGS "-i=mi"
 standard_testfile basics.c
 set opts {debug}
 
 if {[build_executable $testfile.exp $testfile $srcfile $opts]} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-    return -1
+    return
 }
 
 set milogfile [standard_output_file "milog.txt"]
 
 mi_gdb_test "-gdb-set logging file $milogfile" "\\^done" \
diff --git a/gdb/testsuite/gdb.mi/mi-memory-changed.exp b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
index 6f41ecd8ad32..916d240b09bc 100644
--- a/gdb/testsuite/gdb.mi/mi-memory-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
@@ -15,11 +15,11 @@
 
 standard_testfile basics.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 load_lib mi-support.exp
 
 if {[mi_clean_restart $::testfile]} {
diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
index 8958755c57a4..ba62f74bf015 100644
--- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
+++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
@@ -23,11 +23,11 @@ set MIFLAGS "-i=mi"
 #
 standard_testfile non-stop-exit.c
 
 set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp
index e85049191583..970b11a2f8e2 100644
--- a/gdb/testsuite/gdb.mi/mi-nonstop.exp
+++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp
@@ -33,11 +33,11 @@ proc mi_nonstop_resume { command test } {
 #
 standard_testfile non-stop.c
 
 set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
diff --git a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
index 34257ee5c776..d5f6a1ec16bf 100644
--- a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
+++ b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
@@ -36,11 +36,11 @@ proc mi_nonstop_resume { command test } {
 standard_testfile ns-stale-regcache.c
 
 set options [list debug]
 if {[gdb_compile "$srcdir/$subdir/$srcfile" \
 	 $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
index 84319b142a51..7850b5ad98f3 100644
--- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
@@ -23,11 +23,11 @@ set MIFLAGS "-i=mi"
 #
 standard_testfile nsintrall.c
 
 set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
index 04c6162d87ba..b82996b72b94 100644
--- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
@@ -23,11 +23,11 @@ set MIFLAGS "-i=mi"
 #
 standard_testfile nsmoribund.c
 
 set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
index 9446d6f3c6cf..64b27eacf91f 100644
--- a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
@@ -28,11 +28,11 @@ set MIFLAGS "-i=mi"
 #
 standard_testfile nsthrexec.c
 
 set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 99719be76a12..1ad9aecdc8b4 100644
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -34,16 +34,16 @@ set lib_opts debug
 set exec_opts [list debug shlib=$lib_sl1 shlib_load]
 
 if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
      || [gdb_compile_shlib $libsrc2 $lib_sl2 $lib_opts] != ""} {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 if { [gdb_compile_pthreads $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Start with a fresh gdb.
 if {[mi_clean_restart $::testfile]} {
     return
diff --git a/gdb/testsuite/gdb.mi/mi-pthreads.exp b/gdb/testsuite/gdb.mi/mi-pthreads.exp
index 7e1d0123500b..1db1aba5afad 100644
--- a/gdb/testsuite/gdb.mi/mi-pthreads.exp
+++ b/gdb/testsuite/gdb.mi/mi-pthreads.exp
@@ -58,11 +58,11 @@ proc check_mi_thread_command_set {} {
 #
 standard_testfile pthreads.c
 
 set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
index 022f6761362c..5b4ba362ef0f 100644
--- a/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
+++ b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
@@ -23,11 +23,11 @@ set MIFLAGS "-i=mi"
 standard_testfile
 
 require allow_python_tests
 
 if {[build_executable $testfile.exp $testfile $srcfile] == -1} {
-    return -1
+    return
 }
 
 set remote_python_file [gdb_remote_download host \
 			    ${srcdir}/${subdir}/${testfile}.py]
 
diff --git a/gdb/testsuite/gdb.mi/mi-record-changed.exp b/gdb/testsuite/gdb.mi/mi-record-changed.exp
index e4e54f1adf1e..1f4dbf7b686b 100644
--- a/gdb/testsuite/gdb.mi/mi-record-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-record-changed.exp
@@ -17,11 +17,11 @@ require supports_process_record
 
 standard_testfile basics.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 load_lib mi-support.exp
 
 mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp
index 5b6e998d7d72..dd7b2961b03f 100644
--- a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp
+++ b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp
@@ -33,11 +33,11 @@ if {[mi_clean_restart $::testfile]} {
     return
 }
 
 if {![mi_runto stop_frame]} {
     perror "Failed to stop in stop_frame"
-    return -1
+    return
 }
 
 mi_gdb_test "111-stack-list-frames" \
     "111\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"stop_frame\",.*\},frame=\{level=\"1\",addr=\"$hex\",func=\"first_frame\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",.*\}\\\]" \
     "stack frame listing"
diff --git a/gdb/testsuite/gdb.mi/mi-stepn.exp b/gdb/testsuite/gdb.mi/mi-stepn.exp
index 42255de20b3d..77a32060203b 100644
--- a/gdb/testsuite/gdb.mi/mi-stepn.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepn.exp
@@ -21,17 +21,17 @@ set MIFLAGS "-i=mi"
 
 standard_testfile
 
 set opts {debug}
 if {[build_executable ${testfile}.exp ${testfile} ${srcfile} $opts]} {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-    return -1
+    return
 }
 
 mi_create_breakpoint do_nothing \
     "breakpoint at do_nothing" \
     -number 2 -func do_nothing
diff --git a/gdb/testsuite/gdb.mi/mi-sym-info.exp b/gdb/testsuite/gdb.mi/mi-sym-info.exp
index 96d261ded404..e129d5746a32 100644
--- a/gdb/testsuite/gdb.mi/mi-sym-info.exp
+++ b/gdb/testsuite/gdb.mi/mi-sym-info.exp
@@ -28,11 +28,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile mi-sym-info-1.c mi-sym-info-2.c
 
 if {[build_executable "failed to prepare" ${testfile} \
 	 [list $srcfile $srcfile2] {debug}]} {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 
 # Don't run to main to avoid increasing the search scope to include
diff --git a/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp b/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp
index bd7b606b87cd..e80475911fcf 100644
--- a/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp
+++ b/gdb/testsuite/gdb.mi/mi-thread-bp-deleted.exp
@@ -30,11 +30,11 @@ set is_remote \
 
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile \
 	  {debug pthreads}] } {
-    return -1
+    return
 }
 
 foreach_mi_ui_mode mode {
     if {$mode eq "separate"} {
 	set start_ops "separate-mi-tty"
diff --git a/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp b/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
index 9f250912b2ce..ac76a5579c0c 100644
--- a/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
+++ b/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
@@ -24,11 +24,11 @@ if {[mi_clean_restart]} {
 }
 
 standard_testfile
 
 if {[build_executable ${testfile}.exp ${binfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 proc make_loc {num} {
     return [mi_make_breakpoint_loc -thread "1" -number "$::decimal\\.$num"]
 }
diff --git a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp
index 0d8b091d0ac9..5de4fc06c80f 100644
--- a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp
+++ b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp
@@ -19,11 +19,11 @@ load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
 standard_testfile
 
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" } {
-    return -1
+    return
 }
 
 # This tests the resolution of PR 20039.
 #
 # With a multi-threaded inferior and with MI/all-stop, it was not possible
diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
index e2450527de60..27836717ef8d 100644
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-block.exp
@@ -24,11 +24,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile var-cmd.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
index cb249364b68f..ad81441db057 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
@@ -23,11 +23,11 @@ require allow_fortran_tests
 
 standard_testfile array.f90
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable {debug f90}] != ""} {
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index cbc672a14c2c..8c0b8472272b 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -24,11 +24,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
@@ -1199,10 +1199,10 @@ mi_varobj_update * {psnp->ptrs.0.next.next.long_ptr} \
 	"update all vars psnp->next->next->long_ptr (and 2.long_ptr) changed"
 
 mi_prepare_inline_tests $srcfile
 
 if { [mi_run_inline_test child_deletion] < 0 } {
-    return -1
+    return
 }
 
 
 mi_gdb_exit
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index d95c9847e96e..bf207dad255e 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -24,11 +24,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile var-cmd.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
index 918d0497806d..08b6076dea05 100644
--- a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
@@ -18,17 +18,17 @@ set MIFLAGS "-i=mi"
 
 standard_testfile .c
 set opts {debug}
 
 if {[build_executable $testfile.exp $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-    return -1
+    return
 }
 
 # Test creating a register-based variable.  We pick
 # register SP since it is a pointer to data.  This checks
 # for a regression when creating MI variables from pointers
diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index 2efbd2903a13..325291efe500 100644
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -24,11 +24,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile var-cmd.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp
index 45e64bcc2c51..80a97fbcbf2a 100644
--- a/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp
@@ -25,11 +25,11 @@ require allow_shlib_tests
 standard_testfile .c -lib.c
 set shlib_path [standard_output_file ${testfile}-lib.so]
 
 if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $shlib_path {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set shlib_path_target [gdb_download_shlib $shlib_path]
 
 set opts {}
@@ -37,11 +37,11 @@ lappend opts shlib_load
 lappend opts debug
 lappend opts additional_flags=-DSHLIB_PATH=[quote_for_host $shlib_path_target]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 proc do_test { separate_debuginfo } {
     if { [mi_clean_restart] } {
 	unsupported "failed to start GDB"
diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
index 693db9977913..0edb5b6b1881 100644
--- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
@@ -25,25 +25,25 @@ set MIFLAGS "-i=mi"
 
 standard_testfile var-cmd.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 # Just change the output binary.
 set binfile_bis [standard_output_file mi-var-invalidate_bis]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set testfile2 "basics"
 set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp
index 42495401702c..366e15aa676c 100644
--- a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp
@@ -21,11 +21,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-var-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
index b254de20c1e9..9a98e2adfa9c 100644
--- a/gdb/testsuite/gdb.mi/mi-var-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
@@ -20,11 +20,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile .cc
 set opts {debug c++}
 
 if {[build_executable $testfile.exp $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
index 856a1a370080..7f972ea6ea6a 100644
--- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
@@ -31,11 +31,11 @@ proc mi_nonstop_resume { command test } {
 # Start here
 #
 standard_testfile watch-nonstop.c
 
 if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     mi_clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
index 16a45d00265f..fcea890d78af 100644
--- a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
@@ -26,11 +26,11 @@ if {[info exists COMPILE]} {
 } else {
     require is_x86_64_m64_target
 }
 
 if {[build_executable ${testfile}.exp ${binfile} ${srcfile} $opts]} {
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi2-cli-display.exp b/gdb/testsuite/gdb.mi/mi2-cli-display.exp
index 263568c39665..f339f3fbebf5 100644
--- a/gdb/testsuite/gdb.mi/mi2-cli-display.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli-display.exp
@@ -20,11 +20,11 @@ set MIFLAGS "-i=mi2"
 
 standard_testfile
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp
index e5b4adada38d..def9faf36d5b 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp
@@ -24,11 +24,11 @@ set MIFLAGS "-i=mi2"
 
 standard_testfile var-cmd.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp b/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp
index ea81a9ab2f6b..910dd2636847 100644
--- a/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp
+++ b/gdb/testsuite/gdb.mi/new-ui-bp-deleted.exp
@@ -29,11 +29,11 @@ load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 # Helper proc to create a breakpoint location regexp.  NUM is the
 # regexp to match the number field of this location.
 proc make_bp_loc { num } {
diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
index 915f40571e15..fe679b09f976 100644
--- a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
+++ b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
@@ -27,11 +27,11 @@ load_lib mi-support.exp
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile ${srcfile} "debug"] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # The test driver.  SYNC_COMMAND specifies which command is used to
 # synchronously start the program running.
 
diff --git a/gdb/testsuite/gdb.mi/print-simple-values.exp b/gdb/testsuite/gdb.mi/print-simple-values.exp
index 4de81c4cbd4c..875da82ff7cc 100644
--- a/gdb/testsuite/gdb.mi/print-simple-values.exp
+++ b/gdb/testsuite/gdb.mi/print-simple-values.exp
@@ -29,11 +29,11 @@ set opts {}
 lappend opts debug
 lappend opts c++
 lappend opts additional_flags=-std=c++11
 
 if {[build_executable "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {[mi_clean_restart $::testfile]} {
     return
 }
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index 844206f75116..fea284b70125 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -43,11 +43,11 @@ require !use_gdb_stub
 require allow_multi_inferior_tests
 
 set compile_options "debug pthreads"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set main_break_line [gdb_get_line_number "main break line"]
 set thread_loop_line [gdb_get_line_number "thread loop line"]
 set thread_caller_line [gdb_get_line_number "thread caller line"]