[PATCH 29/36] GDB: testsuite: server: 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.server.
---
 gdb/testsuite/gdb.server/build-id-seqno.exp                | 4 ++--
 gdb/testsuite/gdb.server/connect-stopped-target.exp        | 2 +-
 gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp   | 2 +-
 gdb/testsuite/gdb.server/connect-without-multi-process.exp | 2 +-
 gdb/testsuite/gdb.server/ext-attach.exp                    | 2 +-
 gdb/testsuite/gdb.server/ext-run.exp                       | 2 +-
 gdb/testsuite/gdb.server/ext-wrapper.exp                   | 2 +-
 gdb/testsuite/gdb.server/extended-remote-restart.exp       | 2 +-
 gdb/testsuite/gdb.server/file-transfer.exp                 | 2 +-
 gdb/testsuite/gdb.server/inferior-args.exp                 | 2 +-
 gdb/testsuite/gdb.server/monitor-exit-quit.exp             | 2 +-
 gdb/testsuite/gdb.server/no-thread-db.exp                  | 2 +-
 gdb/testsuite/gdb.server/pread-offset-size.exp             | 2 +-
 gdb/testsuite/gdb.server/remote-read-msgs.exp              | 4 ++--
 gdb/testsuite/gdb.server/run-without-local-binary.exp      | 2 +-
 gdb/testsuite/gdb.server/server-connect.exp                | 2 +-
 gdb/testsuite/gdb.server/server-exec-info.exp              | 2 +-
 gdb/testsuite/gdb.server/server-kill-python.exp            | 2 +-
 gdb/testsuite/gdb.server/server-kill.exp                   | 2 +-
 gdb/testsuite/gdb.server/server-mon.exp                    | 2 +-
 gdb/testsuite/gdb.server/server-pipe.exp                   | 2 +-
 gdb/testsuite/gdb.server/server-run.exp                    | 2 +-
 gdb/testsuite/gdb.server/solib-list.exp                    | 2 +-
 gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp    | 2 +-
 gdb/testsuite/gdb.server/stop-reply-no-thread.exp          | 2 +-
 gdb/testsuite/gdb.server/sysroot.exp                       | 2 +-
 gdb/testsuite/gdb.server/target-exec-file.exp              | 4 ++--
 gdb/testsuite/gdb.server/twice-connect.exp                 | 2 +-
 gdb/testsuite/gdb.server/wrapper.exp                       | 2 +-
 29 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/gdb/testsuite/gdb.server/build-id-seqno.exp b/gdb/testsuite/gdb.server/build-id-seqno.exp
index 44bdb09b60ad..1fa27e80aa0f 100644
--- a/gdb/testsuite/gdb.server/build-id-seqno.exp
+++ b/gdb/testsuite/gdb.server/build-id-seqno.exp
@@ -36,12 +36,12 @@ require allow_gdbserver_tests
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile] == -1} {
-    return -1
+    return
 }
 
 # Split out BINFILE.debug.  Remove debug from BINFILE.
 if {[gdb_gnu_strip_debug $binfile] != 0} {
-    return -1
+    return
 }
 
 # Get the '.build-id/xx/xxx...xxx' part of the filename.
diff --git a/gdb/testsuite/gdb.server/connect-stopped-target.exp b/gdb/testsuite/gdb.server/connect-stopped-target.exp
index cfe38fcbfc6a..74ccd774561e 100644
--- a/gdb/testsuite/gdb.server/connect-stopped-target.exp
+++ b/gdb/testsuite/gdb.server/connect-stopped-target.exp
@@ -26,7 +26,7 @@ standard_testfile
 set executable ${testfile}
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc do_test {nonstop} {
diff --git a/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp b/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp
index fcdc6978d618..7e2b33e09a98 100644
--- a/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp
+++ b/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp
@@ -28,7 +28,7 @@ standard_testfile
 require allow_gdbserver_tests
 
 if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 # Test connecting GDB to GDBserver without loading a symbol file.
diff --git a/gdb/testsuite/gdb.server/connect-without-multi-process.exp b/gdb/testsuite/gdb.server/connect-without-multi-process.exp
index 4b41f461a79d..33787acded51 100644
--- a/gdb/testsuite/gdb.server/connect-without-multi-process.exp
+++ b/gdb/testsuite/gdb.server/connect-without-multi-process.exp
@@ -23,7 +23,7 @@ require allow_gdbserver_tests
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Test spawning gdbserver with a program, connect to it and run to
diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp
index 0dd02c145ac4..cb4c12772289 100644
--- a/gdb/testsuite/gdb.server/ext-attach.exp
+++ b/gdb/testsuite/gdb.server/ext-attach.exp
@@ -27,7 +27,7 @@ require allow_gdbserver_tests
 require can_spawn_for_attach
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Run the test.  TARGET_NON_STOP and TARGET_ASYNC should be 'on'
diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp
index 83de771902b4..4fb2fe004f26 100644
--- a/gdb/testsuite/gdb.server/ext-run.exp
+++ b/gdb/testsuite/gdb.server/ext-run.exp
@@ -24,7 +24,7 @@ standard_testfile server.c
 require allow_gdbserver_tests
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 # allow_xml_test must be called while gdb is not running.
diff --git a/gdb/testsuite/gdb.server/ext-wrapper.exp b/gdb/testsuite/gdb.server/ext-wrapper.exp
index 836c32a75745..912a8ce37708 100644
--- a/gdb/testsuite/gdb.server/ext-wrapper.exp
+++ b/gdb/testsuite/gdb.server/ext-wrapper.exp
@@ -22,7 +22,7 @@ standard_testfile wrapper.c
 require allow_gdbserver_tests
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp
index 5fe4ebd57297..f10d2f374c09 100644
--- a/gdb/testsuite/gdb.server/extended-remote-restart.exp
+++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp
@@ -48,7 +48,7 @@ if { [info proc gdb_reconnect] == "" } {
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Core of the test.  DO_KILL_P controls whether we kill one of the
diff --git a/gdb/testsuite/gdb.server/file-transfer.exp b/gdb/testsuite/gdb.server/file-transfer.exp
index f33c589c961e..a4517582b257 100644
--- a/gdb/testsuite/gdb.server/file-transfer.exp
+++ b/gdb/testsuite/gdb.server/file-transfer.exp
@@ -23,7 +23,7 @@ standard_testfile server.c
 require allow_gdbserver_tests
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Make sure we're disconnected, in case we're testing with an
diff --git a/gdb/testsuite/gdb.server/inferior-args.exp b/gdb/testsuite/gdb.server/inferior-args.exp
index 312e756f0d80..f6ad3e69b407 100644
--- a/gdb/testsuite/gdb.server/inferior-args.exp
+++ b/gdb/testsuite/gdb.server/inferior-args.exp
@@ -35,7 +35,7 @@ if { $gdbserver == "" } {
 
 standard_testfile
 if {[build_executable "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 # EXTENDED_P is a boolean, when true gdbserver is started with --multi, and
diff --git a/gdb/testsuite/gdb.server/monitor-exit-quit.exp b/gdb/testsuite/gdb.server/monitor-exit-quit.exp
index c5f8426cb5de..cb90169ef0cc 100644
--- a/gdb/testsuite/gdb.server/monitor-exit-quit.exp
+++ b/gdb/testsuite/gdb.server/monitor-exit-quit.exp
@@ -24,7 +24,7 @@ standard_testfile server.c
 require allow_gdbserver_tests
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.server/no-thread-db.exp b/gdb/testsuite/gdb.server/no-thread-db.exp
index e04e43c78a3c..9cbe962bc3c0 100644
--- a/gdb/testsuite/gdb.server/no-thread-db.exp
+++ b/gdb/testsuite/gdb.server/no-thread-db.exp
@@ -28,7 +28,7 @@ set unresolvable_thread_db_path "/foo/bar"
 require allow_gdbserver_tests
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.server/pread-offset-size.exp b/gdb/testsuite/gdb.server/pread-offset-size.exp
index 4362878c8e6e..68f938d42c67 100644
--- a/gdb/testsuite/gdb.server/pread-offset-size.exp
+++ b/gdb/testsuite/gdb.server/pread-offset-size.exp
@@ -24,7 +24,7 @@ standard_testfile .S
 
 if { [prepare_for_testing ${testfile}.exp $testfile \
 	$srcfile {debug additional_flags=-nostdlib} ] } {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.server/remote-read-msgs.exp b/gdb/testsuite/gdb.server/remote-read-msgs.exp
index 86c2d610c00b..e9d03388e398 100644
--- a/gdb/testsuite/gdb.server/remote-read-msgs.exp
+++ b/gdb/testsuite/gdb.server/remote-read-msgs.exp
@@ -32,12 +32,12 @@ standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
     {debug build-id}] == -1} {
-    return -1
+    return
 }
 
 # Split out BINFILE.debug.  Remove debug from BINFILE.
 if {[gdb_gnu_strip_debug $binfile] != 0} {
-    return -1
+    return
 }
 
 # Get the '.build-id/xx/xxx...xxx' part of the filename.
diff --git a/gdb/testsuite/gdb.server/run-without-local-binary.exp b/gdb/testsuite/gdb.server/run-without-local-binary.exp
index 3aa9eba2d05d..24521f21b0f9 100644
--- a/gdb/testsuite/gdb.server/run-without-local-binary.exp
+++ b/gdb/testsuite/gdb.server/run-without-local-binary.exp
@@ -20,7 +20,7 @@ require allow_gdbserver_tests
 standard_testfile normal.c
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 set target_binfile [gdb_remote_download target $binfile]
diff --git a/gdb/testsuite/gdb.server/server-connect.exp b/gdb/testsuite/gdb.server/server-connect.exp
index bb6a5758d359..3c8dd114166a 100644
--- a/gdb/testsuite/gdb.server/server-connect.exp
+++ b/gdb/testsuite/gdb.server/server-connect.exp
@@ -28,7 +28,7 @@ require allow_gdbserver_tests
 require {!is_remote target}
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 # Make sure we're disconnected, in case we're testing with an
diff --git a/gdb/testsuite/gdb.server/server-exec-info.exp b/gdb/testsuite/gdb.server/server-exec-info.exp
index 7163785348d9..4ef9ede9cec0 100644
--- a/gdb/testsuite/gdb.server/server-exec-info.exp
+++ b/gdb/testsuite/gdb.server/server-exec-info.exp
@@ -22,7 +22,7 @@ require allow_gdbserver_tests allow_shlib_tests
 
 standard_testfile server.c
 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.server/server-kill-python.exp b/gdb/testsuite/gdb.server/server-kill-python.exp
index 09e4d561bee9..7c08090c1656 100644
--- a/gdb/testsuite/gdb.server/server-kill-python.exp
+++ b/gdb/testsuite/gdb.server/server-kill-python.exp
@@ -27,7 +27,7 @@ require allow_gdbserver_tests allow_python_tests
 
 if {[build_executable "failed to prepare" ${testfile} \
 	 ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 set target_binfile [gdb_remote_download target $binfile]
diff --git a/gdb/testsuite/gdb.server/server-kill.exp b/gdb/testsuite/gdb.server/server-kill.exp
index 9a92ef2a6c75..d4bbb466f04c 100644
--- a/gdb/testsuite/gdb.server/server-kill.exp
+++ b/gdb/testsuite/gdb.server/server-kill.exp
@@ -25,7 +25,7 @@ standard_testfile
 require allow_gdbserver_tests
 
 if { [build_executable "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 # Spawn GDBserver, run to main, extract GDBserver's PID and save it in
diff --git a/gdb/testsuite/gdb.server/server-mon.exp b/gdb/testsuite/gdb.server/server-mon.exp
index 8811a0c8afa7..ef054059faf8 100644
--- a/gdb/testsuite/gdb.server/server-mon.exp
+++ b/gdb/testsuite/gdb.server/server-mon.exp
@@ -24,7 +24,7 @@ standard_testfile server.c
 require allow_gdbserver_tests
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Make sure we're disconnected, in case we're testing with an
diff --git a/gdb/testsuite/gdb.server/server-pipe.exp b/gdb/testsuite/gdb.server/server-pipe.exp
index ca9d9cab8b67..724e5a047b1e 100644
--- a/gdb/testsuite/gdb.server/server-pipe.exp
+++ b/gdb/testsuite/gdb.server/server-pipe.exp
@@ -42,7 +42,7 @@ standard_testfile normal.c
 set executable ${testfile}
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Start GDB using remote type TARGET, which should be either "remote"
diff --git a/gdb/testsuite/gdb.server/server-run.exp b/gdb/testsuite/gdb.server/server-run.exp
index 776851b36955..a20ef0a5a1fc 100644
--- a/gdb/testsuite/gdb.server/server-run.exp
+++ b/gdb/testsuite/gdb.server/server-run.exp
@@ -24,7 +24,7 @@ standard_testfile server.c
 require allow_gdbserver_tests
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp
index ab0fd1586cb1..c529bb6edd06 100644
--- a/gdb/testsuite/gdb.server/solib-list.exp
+++ b/gdb/testsuite/gdb.server/solib-list.exp
@@ -32,7 +32,7 @@ set binlibfile [standard_output_file ${testfile}.so]
 if { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" {debug}] != ""
      || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "shlib=${binlibfile} build-id"] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set interp_system [section_get ${binfile} .interp]
diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp
index 01bf3ef67dca..a7eda3f76f06 100644
--- a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp
+++ b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp
@@ -34,7 +34,7 @@ require allow_gdbserver_tests
 
 standard_testfile
 if { [build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1 } {
-    return -1
+    return
 }
 
 set target_binfile [gdb_remote_download target $binfile]
diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp b/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
index fec2246b4791..700b70224151 100644
--- a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
+++ b/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
@@ -26,7 +26,7 @@ require allow_gdbserver_tests
 
 standard_testfile
 if { [build_executable "failed to prepare" $testfile $srcfile] == -1 } {
-    return -1
+    return
 }
 
 set target_binfile [gdb_remote_download target $binfile]
diff --git a/gdb/testsuite/gdb.server/sysroot.exp b/gdb/testsuite/gdb.server/sysroot.exp
index 634168db4693..7e4a796e8791 100644
--- a/gdb/testsuite/gdb.server/sysroot.exp
+++ b/gdb/testsuite/gdb.server/sysroot.exp
@@ -24,7 +24,7 @@ require allow_gdbserver_tests
 
 standard_testfile
 if {[build_executable "failed to prepare" $testfile $srcfile "additional_flags=--no-builtin"] == -1} {
-    return -1
+    return
 }
 
 set target_binfile [gdb_remote_download target $binfile]
diff --git a/gdb/testsuite/gdb.server/target-exec-file.exp b/gdb/testsuite/gdb.server/target-exec-file.exp
index 7c204cc9abde..a9e6f801165d 100644
--- a/gdb/testsuite/gdb.server/target-exec-file.exp
+++ b/gdb/testsuite/gdb.server/target-exec-file.exp
@@ -26,7 +26,7 @@ require allow_gdbserver_tests !use_gdb_stub
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 clean_restart
@@ -223,7 +223,7 @@ set res [remote_exec target "touch $target_exec"]
 set status [lindex $res 0]
 if { $status != 0 } {
     fail "touching executable on target"
-    return -1
+    return
 }
 
 # Start the inferior again, we expect to see the symbols being re-read
diff --git a/gdb/testsuite/gdb.server/twice-connect.exp b/gdb/testsuite/gdb.server/twice-connect.exp
index eaf910179f7f..45f2eb5aa596 100644
--- a/gdb/testsuite/gdb.server/twice-connect.exp
+++ b/gdb/testsuite/gdb.server/twice-connect.exp
@@ -23,7 +23,7 @@ require allow_gdbserver_tests
 
 if { [build_executable "failed to prepare" $::testfile $::srcfile \
 	  {debug}] } {
-    return -1
+    return
 }
 
 # Don't use $binfile arg, to make sure we use the remote file target:$binfile.
diff --git a/gdb/testsuite/gdb.server/wrapper.exp b/gdb/testsuite/gdb.server/wrapper.exp
index 9478640c40e2..15643fb92a7c 100644
--- a/gdb/testsuite/gdb.server/wrapper.exp
+++ b/gdb/testsuite/gdb.server/wrapper.exp
@@ -26,7 +26,7 @@ require allow_gdbserver_tests
 if { [istarget *-*-mingw*]
      || [istarget *-*-cygwin*] } {
     unsupported "gdbserver does not support --wrapper on this target (PR server/15967)"
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {