[PATCH 06/36] GDB: testsuite: powerpc: 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;
- procedure whose callers don't use the return value;

There were also a few top-level "return 0" fixed opportunistically.
---
 gdb/testsuite/gdb.arch/altivec-abi.exp              | 4 ++--
 gdb/testsuite/gdb.arch/altivec-regs.exp             | 6 +++---
 gdb/testsuite/gdb.arch/e500-abi.exp                 | 6 +++---
 gdb/testsuite/gdb.arch/e500-regs.exp                | 8 ++++----
 gdb/testsuite/gdb.arch/powerpc-d128-regs.exp        | 4 ++--
 gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp   | 4 ++--
 gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp        | 2 +-
 gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp | 4 ++--
 gdb/testsuite/gdb.arch/vsx-regs.exp                 | 8 ++++----
 gdb/testsuite/gdb.arch/vsx-vsr-float28.exp          | 6 +++---
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
index f7bea3de4ced..1c2da2791083 100644
--- a/gdb/testsuite/gdb.arch/altivec-abi.exp
+++ b/gdb/testsuite/gdb.arch/altivec-abi.exp
@@ -33,7 +33,7 @@ proc altivec_abi_tests { extra_flags force_abi } {
 
     if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
 	untested "failed to compile"
-	return -1
+	return
     }
 
     if { "$force_abi" == "auto" } {
@@ -52,7 +52,7 @@ proc altivec_abi_tests { extra_flags force_abi } {
 
     # Run to `main' where we begin our tests.
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test "set print frame-arguments all"
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
index 55d245d92981..04dc342de6d4 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
@@ -36,8 +36,8 @@ if {[test_compiler_info gcc*]} {
 }
 
 if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
-     untested "failed to compile"
-     return -1
+    untested "failed to compile"
+    return
 }
 
 gdb_start
@@ -49,7 +49,7 @@ gdb_load ${binfile}
 #
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "start here"]
diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp
index 1c074f10aa7e..e0223fd67888 100644
--- a/gdb/testsuite/gdb.arch/e500-abi.exp
+++ b/gdb/testsuite/gdb.arch/e500-abi.exp
@@ -29,8 +29,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 set src1 ${srcdir}/${subdir}/${testfile}.c
 
 if  { [gdb_compile ${src1} ${binfile} executable {debug nowarnings}] != "" } {
-     untested "failed to compile"
-     return -1
+    untested "failed to compile"
+    return
 }
 
 gdb_start
@@ -42,7 +42,7 @@ gdb_load ${binfile}
 #
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 gdb_test "b marker" "Breakpoint 2 at.*file.*e500-abi.c, line ${::decimal}." "break marker"
diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp
index 2dc1ade4b448..03d6f42b5332 100644
--- a/gdb/testsuite/gdb.arch/e500-regs.exp
+++ b/gdb/testsuite/gdb.arch/e500-regs.exp
@@ -28,8 +28,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 set src1 ${srcdir}/${subdir}/${testfile}.c
 
 if  { [gdb_compile ${src1} ${binfile} executable {debug nowarnings}] != "" } {
-     untested "failed to compile"
-     return -1
+    untested "failed to compile"
+    return
 }
 
 gdb_start
@@ -41,7 +41,7 @@ gdb_load ${binfile}
 #
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 # set all the registers integer portions to 1
@@ -139,7 +139,7 @@ gdb_expect_list "info vector" ".*$gdb_prompt $" {
 clean_restart
 gdb_load $binfile
 if {![runto_main]} {
-    return 0
+    return
 }
 
 gdb_test "break vector_fun" \
diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
index 10c77ef29489..7043fac5e568 100644
--- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
@@ -25,8 +25,8 @@ require {istarget "powerpc64*-*"}
 standard_testfile
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {quiet debug}] != "" } {
-     untested "failed to compile"
-     return -1
+    untested "failed to compile"
+    return
 }
 
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp
index 1f41f3aaaa3f..3899121f9341 100644
--- a/gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-prologue-frame.exp
@@ -29,8 +29,8 @@ if {[gdb_compile \
 clean_restart $testfile
 
 if {![runto bar]} {
-  untested "could not run to bar"
-  return -1
+    untested "could not run to bar"
+    return
 }
 
 gdb_test "bt" \
diff --git a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
index 56854c75394d..2bd631429c0a 100644
--- a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
@@ -33,7 +33,7 @@ proc do_test { displaced } {
     global decimal hex
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set displaced-stepping $displaced"
diff --git a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
index db8c7582d0c3..7f7c9a01fc9c 100644
--- a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
@@ -38,7 +38,7 @@ proc do_test { displaced } {
     global gdb_prompt inferior_exited_re srcfile srcfile2
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test_no_output "set displaced-stepping $displaced"
@@ -49,7 +49,7 @@ proc do_test { displaced } {
     gdb_test_multiple "continue" "Continue until lbarx/stbcx start breakpoint" {
       -re "$inferior_exited_re with code 01.\[\r\n\]+$gdb_prompt $" {
 	unsupported "POWER8/ISA 2.07 atomic instructions not supported."
-	return -1
+	return
       }
       -re "Continuing.*Breakpoint $decimal.*$gdb_prompt $" {
 	pass "continue until test_atomic_sequences function"
diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp
index 2c31935135da..87f749f93b12 100644
--- a/gdb/testsuite/gdb.arch/vsx-regs.exp
+++ b/gdb/testsuite/gdb.arch/vsx-regs.exp
@@ -34,8 +34,8 @@ if {[test_compiler_info gcc*]} {
 }
 
 if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
-     untested "failed to compile"
-     return -1
+    untested "failed to compile"
+    return
 }
 
 gdb_start
@@ -45,7 +45,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set endianness [get_endianness]
@@ -181,7 +181,7 @@ for {set i 0} {$i < 32} {incr i 1} {
 # Test reading the core file.
 
 if {!$core_supported} {
-  return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
index ad6050bd4c8c..436076f10038 100644
--- a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
+++ b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
@@ -33,8 +33,8 @@ if {[test_compiler_info gcc*]} {
 }
 
 if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
-     untested "failed to compile"
-     return -1
+    untested "failed to compile"
+    return
 }
 
 gdb_start
@@ -44,7 +44,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 set endianness [get_endianness]