[PATCH v2 31/37] GDB: testsuite: server: Don't return value from top-level (manual)

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

This patch manually changes "return -1" statements that weren't caught
by the sed command.

These return statements return at top level but inside block such as
save_vars and with_test_prefix.

I also fixed one case of top-level "return 0".
---
 gdb/testsuite/gdb.server/abspath.exp                 | 2 +-
 gdb/testsuite/gdb.server/exit-multiple-threads.exp   | 2 +-
 gdb/testsuite/gdb.server/ext-restart.exp             | 2 +-
 gdb/testsuite/gdb.server/ext-wrapper.exp             | 2 +-
 gdb/testsuite/gdb.server/extended-remote-restart.exp | 2 +-
 gdb/testsuite/gdb.server/multi-ui-errors.exp         | 2 +-
 gdb/testsuite/gdb.server/reconnect-ctrl-c.exp        | 2 +-
 gdb/testsuite/gdb.server/wrapper.exp                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.server/abspath.exp b/gdb/testsuite/gdb.server/abspath.exp
index 5bd7f7e842bb..7c4d43ff474d 100644
--- a/gdb/testsuite/gdb.server/abspath.exp
+++ b/gdb/testsuite/gdb.server/abspath.exp
@@ -36,11 +36,11 @@ save_vars { GDBFLAGS } {
     if { ![is_remote host] } {
 	set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
     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
 # extended-remote board, therefore already connected.
diff --git a/gdb/testsuite/gdb.server/exit-multiple-threads.exp b/gdb/testsuite/gdb.server/exit-multiple-threads.exp
index 1b0941eb3c78..c6e19f8dfb44 100644
--- a/gdb/testsuite/gdb.server/exit-multiple-threads.exp
+++ b/gdb/testsuite/gdb.server/exit-multiple-threads.exp
@@ -138,11 +138,11 @@ foreach_with_prefix test { exit signal } {
     set func "run_${test}_test"
 
     set executable "$binfile-${test}"
     if {[build_executable "failed to prepare" $executable $srcfile \
 	     [list debug pthreads additional_flags=-D${def}]]} {
-	return -1
+	return
     }
 
     set target_executable [gdb_remote_download target $executable]
 
     foreach_with_prefix multi_process { 0 1 } {
diff --git a/gdb/testsuite/gdb.server/ext-restart.exp b/gdb/testsuite/gdb.server/ext-restart.exp
index 39d42d7a4416..031aaeb5db85 100644
--- a/gdb/testsuite/gdb.server/ext-restart.exp
+++ b/gdb/testsuite/gdb.server/ext-restart.exp
@@ -29,11 +29,11 @@ save_vars { GDBFLAGS } {
     if { ![is_remote host] && ![is_remote target] } {
 	set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
     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
 # extended-remote board, therefore already connected.
diff --git a/gdb/testsuite/gdb.server/ext-wrapper.exp b/gdb/testsuite/gdb.server/ext-wrapper.exp
index 912a8ce37708..757127b15488 100644
--- a/gdb/testsuite/gdb.server/ext-wrapper.exp
+++ b/gdb/testsuite/gdb.server/ext-wrapper.exp
@@ -31,11 +31,11 @@ save_vars { GDBFLAGS } {
     if { ![is_remote host] && ![is_remote target] } {
 	set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
     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
 # extended-remote board, therefore already connected.
diff --git a/gdb/testsuite/gdb.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp
index f10d2f374c09..a592dba79ed5 100644
--- a/gdb/testsuite/gdb.server/extended-remote-restart.exp
+++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp
@@ -40,11 +40,11 @@ require {is_any_target "*-*-linux*" "*-*-openbsd*"}
 
 # And we need to be able to reconnect to gdbserver.
 set gdbserver_reconnect_p 1
 if { [info proc gdb_reconnect] == "" } {
     unsupported "requires gdbserver reconnect"
-    return 0
+    return
 }
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
diff --git a/gdb/testsuite/gdb.server/multi-ui-errors.exp b/gdb/testsuite/gdb.server/multi-ui-errors.exp
index c17de8bf2e48..dde936c1a455 100644
--- a/gdb/testsuite/gdb.server/multi-ui-errors.exp
+++ b/gdb/testsuite/gdb.server/multi-ui-errors.exp
@@ -35,11 +35,11 @@ save_vars { GDBFLAGS } {
     if { ![is_remote host] && ![is_remote target] } {
 	set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
     if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-	return -1
+	return
     }
 }
 
 # Make sure we're disconnected, in case we're testing with an
 # extended-remote board, therefore already connected.
diff --git a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp
index 63502887bf55..c0e129db76d5 100644
--- a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp
+++ b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp
@@ -31,11 +31,11 @@ save_vars { GDBFLAGS } {
     if { ![is_remote host] && ![is_remote target] } {
 	set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
     if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-	return -1
+	return
     }
 }
 
 set target_binfile [gdb_remote_download target $binfile]
 
diff --git a/gdb/testsuite/gdb.server/wrapper.exp b/gdb/testsuite/gdb.server/wrapper.exp
index 15643fb92a7c..40c29c441fab 100644
--- a/gdb/testsuite/gdb.server/wrapper.exp
+++ b/gdb/testsuite/gdb.server/wrapper.exp
@@ -35,11 +35,11 @@ save_vars { GDBFLAGS } {
     if { ![is_remote host] && ![is_remote target] } {
 	set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
     }
 
     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
 # extended-remote board, therefore already connected.