[PATCH v2 29/37] GDB: testsuite: reverse: 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.  It also changes a few "return 0" statements.

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
@@ -47,11 +47,11 @@ standard_testfile
 if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } {
     return
 }
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 if {[supports_process_record]} {
     # Activate process record/replay
     gdb_test_no_output "record" "turn on 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
@@ -131,10 +131,10 @@ standard_testfile  .c
 foreach_with_prefix column_info_flag {column-info no-column-info} {
     set options [list debug $column_info_flag]
 
     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
@@ -62,11 +62,11 @@ gdb_test_multiple "continue" $test {
     -re " end sse_test .*\r\n$gdb_prompt $" {
 	pass $test
     }
     -re " Illegal instruction.*\r\n$gdb_prompt $" {
 	untested i386-sse-reverse
-	return -1
+	return
     }
 }
 
 gdb_test "reverse-step" "xorps.*" "reverse-step to xorps"
 
@@ -588,11 +588,11 @@ gdb_test_multiple "continue" $test {
     -re " end ssse3_test .*\r\n$gdb_prompt $" {
 	pass $test
     }
     -re " Illegal instruction.*\r\n$gdb_prompt $" {
 	untested i386-ssse3-reverse
-	return -1
+	return
     }
 }
 
 gdb_test "info register xmm0" \
     "xmm0 .*uint128 = 0x1f1e1d1c1b1a19181716151413121110.*" \
@@ -664,11 +664,11 @@ gdb_test_multiple "continue" $test {
     -re " end sse4_test .*\r\n$gdb_prompt $" {
 	pass $test
     }
     -re " Illegal instruction.*\r\n$gdb_prompt $" {
 	untested i386-sse4-reverse
-	return -1
+	return
     }
 }
 
 gdb_test "reverse-step" "blendvps.*" "reverse-step to blendvps"
 
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
@@ -44,11 +44,11 @@ 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
 test_print false "" "print before starting to record"
 
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
@@ -47,11 +47,11 @@ standard_testfile
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
     return
 }
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 if {[supports_process_record]} {
     # Activate process record/replay
     gdb_test_no_output "record" "turn on 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
@@ -256,11 +256,11 @@ gdb_test_multiple "continue" "run to end of main" {
 	send_gdb "continue\n"
 	exp_continue
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }
 
 delete_breakpoints
 
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
@@ -237,11 +237,11 @@ set thissig "ABRT"
 with_test_prefix "sig-test-1" {
     set record_instruction_kfail 0
     foreach sig [lrange $signals 1 end] {
 	test_one_sig $sig
 	if { $record_instruction_kfail } {
-	    return -1
+	    return
 	}
     }
 }
 
 # The last signal (SIGTERM) gets handled slightly differently because
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
@@ -22,17 +22,17 @@ if {[info exists COMPILE]} {
     # make check RUNTESTFLAGS="gdb.reverse/singlejmp-reverse.exp COMPILE=1"
     if { [build_executable_from_specs ${testfile}.exp $executable {} \
 				      ${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
     }
 }
 
 clean_restart $executable
 
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
@@ -78,11 +78,11 @@ gdb_test_multiple "continue" "run to end of main" {
     -wrap -re "Breakpoint .* end of main .*" {
 	pass $gdb_test_name
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }
 
 gdb_test "record save $precsave" \
     "Saved core file $precsave with execution log\."  \
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
@@ -75,11 +75,11 @@ gdb_test_multiple "until $end_part_one" "run until end part one" {
     -wrap -re " end part one.*" {
 	pass $gdb_test_name
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }
 
 gdb_test "reverse-step" " shr1 three .*" "reverse-step third shr1"
 gdb_test "reverse-step" " shr1 two .*"   "reverse-step second shr1"
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
@@ -50,11 +50,11 @@ with_timeout_factor 20 {
 	-wrap -re "Breakpoint .* set breakpoint 10a here .*" {
 	    pass $gdb_test_name
 	}
 	-wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	    kfail "gdb/25038" $gdb_test_name
-	    return -1
+	    return
 	}
     }
 }
 
 # So can this, against gdbserver, for example.
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
@@ -51,11 +51,11 @@ gdb_test_multiple "advance factorial" "" {
     -wrap -re "factorial .value=6..*$srcfile:$bp_location7.*" {
 	pass $gdb_test_name
     }
     -wrap -re "Process record does not support instruction 0xfae64 at.*" {
 	kfail "gdb/25038" $gdb_test_name
-	return -1
+	return
     }
 }
 
 # At this point, 'until' should continue the inferior up to when all the
 # inner invocations of factorial() are completed and we are back at this