[PATCH 30/36] GDB: testsuite: server: Don't return -1 from top-level (manual)

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

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

These return statements fall into one of these criteria:

- return at top level but inside block such as save_vars and
  with_test_prefix;
- procedure whose callers don't use the return value;

I also fixed some cases of top-level "return 0".
---
 gdb/testsuite/gdb.server/abspath.exp                 | 2 +-
 gdb/testsuite/gdb.server/attach-flag.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 | 4 ++--
 gdb/testsuite/gdb.server/multi-ui-errors.exp         | 2 +-
 gdb/testsuite/gdb.server/reconnect-ctrl-c.exp        | 2 +-
 gdb/testsuite/gdb.server/target-exec-file.exp        | 2 +-
 gdb/testsuite/gdb.server/wrapper.exp                 | 2 +-
 10 files changed, 11 insertions(+), 11 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
@@ -38,7 +38,7 @@ save_vars { GDBFLAGS } {
     }
 
     if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.server/attach-flag.exp b/gdb/testsuite/gdb.server/attach-flag.exp
index 29013074459e..f9432048c378 100644
--- a/gdb/testsuite/gdb.server/attach-flag.exp
+++ b/gdb/testsuite/gdb.server/attach-flag.exp
@@ -38,7 +38,7 @@ proc run_one_test { non-stop target-non-stop } {
 
 	if { [prepare_for_testing "failed to prepare" $::testfile $::srcfile \
 		{debug pthreads additional_flags=-std=gnu99}] } {
-	    return -1
+	    return
 	}
     }
 
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
@@ -140,7 +140,7 @@ foreach_with_prefix test { exit signal } {
     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]
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
@@ -31,7 +31,7 @@ save_vars { GDBFLAGS } {
     }
 
     if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-	return -1
+	return
     }
 }
 
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
@@ -33,7 +33,7 @@ save_vars { GDBFLAGS } {
     }
 
     if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp
index f10d2f374c09..ab0be669aeb1 100644
--- a/gdb/testsuite/gdb.server/extended-remote-restart.exp
+++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp
@@ -42,7 +42,7 @@ require {is_any_target "*-*-linux*" "*-*-openbsd*"}
 set gdbserver_reconnect_p 1
 if { [info proc gdb_reconnect] == "" } {
     unsupported "requires gdbserver reconnect"
-    return 0
+    return
 }
 
 standard_testfile
@@ -61,7 +61,7 @@ proc test_reload { do_kill_p follow_child_p } {
     clean_restart ${::testfile}
 
     if {![runto_main]} {
-	return 0
+	return
     }
 
     # Set detach-on-fork off
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
@@ -37,7 +37,7 @@ save_vars { GDBFLAGS } {
     }
 
     if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-	return -1
+	return
     }
 }
 
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
@@ -33,7 +33,7 @@ save_vars { GDBFLAGS } {
     }
 
     if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.server/target-exec-file.exp b/gdb/testsuite/gdb.server/target-exec-file.exp
index a9e6f801165d..e3e2884aa727 100644
--- a/gdb/testsuite/gdb.server/target-exec-file.exp
+++ b/gdb/testsuite/gdb.server/target-exec-file.exp
@@ -156,7 +156,7 @@ proc start_inferior { testname expect_reread } {
     with_test_prefix $testname {
 	if { [gdb_start_cmd] < 0 } {
 	    fail "start command"
-	    return -1
+	    return
 	}
 
 	set saw_reread false
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
@@ -37,7 +37,7 @@ save_vars { GDBFLAGS } {
     }
 
     if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-	return -1
+	return
     }
 }