[PATCH 28/36] GDB: testsuite: reverse: 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:

- misaligned line, which is then fixed by this patch;
- return at top level but inside block such as with_test_prefix,
  foreach_with_prefix, with_timeout_factor, gdb_test_multiple.
---
 gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp       | 2 +-
 gdb/testsuite/gdb.reverse/func-map-to-same-line.exp     | 2 +-
 gdb/testsuite/gdb.reverse/i386-sse-reverse.exp          | 6 +++---
 gdb/testsuite/gdb.reverse/maint-print-instruction.exp   | 2 +-
 gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp | 2 +-
 gdb/testsuite/gdb.reverse/sigall-precsave.exp           | 2 +-
 gdb/testsuite/gdb.reverse/sigall-reverse.exp            | 2 +-
 gdb/testsuite/gdb.reverse/singlejmp-reverse.exp         | 4 ++--
 gdb/testsuite/gdb.reverse/solib-precsave.exp            | 2 +-
 gdb/testsuite/gdb.reverse/solib-reverse.exp             | 2 +-
 gdb/testsuite/gdb.reverse/until-precsave.exp            | 2 +-
 gdb/testsuite/gdb.reverse/until-reverse.exp             | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
index 19ebebf6a126..0432dd47cc08 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
@@ -49,7 +49,7 @@ if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } {
 }
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 if {[supports_process_record]} {
diff --git a/gdb/testsuite/gdb.reverse/func-map-to-same-line.exp b/gdb/testsuite/gdb.reverse/func-map-to-same-line.exp
index dd36528eb3ef..76febe312f58 100644
--- a/gdb/testsuite/gdb.reverse/func-map-to-same-line.exp
+++ b/gdb/testsuite/gdb.reverse/func-map-to-same-line.exp
@@ -133,7 +133,7 @@ foreach_with_prefix column_info_flag {column-info no-column-info} {
 
     if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	     $options]} {
-	return -1
+	return
    }
 
     run_tests
diff --git a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
index dc1308861e2c..3ed1d7e6fae2 100644
--- a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp
@@ -64,7 +64,7 @@ gdb_test_multiple "continue" $test {
     }
     -re " Illegal instruction.*\r\n$gdb_prompt $" {
 	untested i386-sse-reverse
-	return -1
+	return
     }
 }
 
@@ -590,7 +590,7 @@ gdb_test_multiple "continue" $test {
     }
     -re " Illegal instruction.*\r\n$gdb_prompt $" {
 	untested i386-ssse3-reverse
-	return -1
+	return
     }
 }
 
@@ -666,7 +666,7 @@ gdb_test_multiple "continue" $test {
     }
     -re " Illegal instruction.*\r\n$gdb_prompt $" {
 	untested i386-sse4-reverse
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.reverse/maint-print-instruction.exp b/gdb/testsuite/gdb.reverse/maint-print-instruction.exp
index ad8009b415a9..edf6ec081cdf 100644
--- a/gdb/testsuite/gdb.reverse/maint-print-instruction.exp
+++ b/gdb/testsuite/gdb.reverse/maint-print-instruction.exp
@@ -46,7 +46,7 @@ proc test_print { has_history level test_name } {
 }
 
 if { ![runto_main] } {
-    return 0
+    return
 }
 
 #confirm that GDB doesn't go crazy if recording isn't enabled
diff --git a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
index d34fe130e8e5..b175774aee4f 100644
--- a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
+++ b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
@@ -49,7 +49,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
 }
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 if {[supports_process_record]} {
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index d8bc6dfaccfa..5ce7de0ea1fe 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -258,7 +258,7 @@ gdb_test_multiple "continue" "run to end of main" {
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
index 2dae1933d818..45bb49ecfebe 100644
--- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
@@ -239,7 +239,7 @@ with_test_prefix "sig-test-1" {
     foreach sig [lrange $signals 1 end] {
 	test_one_sig $sig
 	if { $record_instruction_kfail } {
-	    return -1
+	    return
 	}
     }
 }
diff --git a/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp b/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp
index 830292cd6669..dfa8ac179f07 100644
--- a/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/singlejmp-reverse.exp
@@ -24,13 +24,13 @@ if {[info exists COMPILE]} {
 				      ${testfile}.c {debug optimize=-O2} \
 				      ${testfile}-nodebug.c {optimize=-O2} \
 				      ] == -1 } {
-	return -1
+	return
     }
 } else {
     require is_x86_64_m64_target
     if { [build_executable ${testfile}.exp ${testfile} \
 	      [list ${srcfile} ${srcfile2}] {}] == -1 } {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index ef3229c74927..cad30320048b 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -80,7 +80,7 @@ gdb_test_multiple "continue" "run to end of main" {
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp
index c5a610fcb391..b5f49fb72994 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -77,7 +77,7 @@ gdb_test_multiple "until $end_part_one" "run until end part one" {
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp
index 411fc14fed27..075a87dc2d87 100644
--- a/gdb/testsuite/gdb.reverse/until-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/until-precsave.exp
@@ -52,7 +52,7 @@ with_timeout_factor 20 {
 	}
 	-wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	    kfail "gdb/25038" $gdb_test_name
-	    return -1
+	    return
 	}
     }
 }
diff --git a/gdb/testsuite/gdb.reverse/until-reverse.exp b/gdb/testsuite/gdb.reverse/until-reverse.exp
index 74703223c643..19ec2fee6b05 100644
--- a/gdb/testsuite/gdb.reverse/until-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/until-reverse.exp
@@ -53,7 +53,7 @@ gdb_test_multiple "advance factorial" "" {
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }