[PATCH 19/36] GDB: testsuite: DWARF: 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 save_vars,
  with_test_prefix, foreach, gdb_test_multiple.
- procedure whose callers don't use the return value;

Some weren't changed because they didn't meet the criteria above, or
weren't trivial to check.
---
 gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp          |  4 ++--
 .../debug-aranges-duplicate-offset-warning.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp             |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp        |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp     |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp        |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-lines.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp       |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp        |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp         | 12 ++++++------
 gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp |  4 ++--
 gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp   |  4 ++--
 gdb/testsuite/gdb.dwarf2/gdb-index.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/implptr-64bit.exp           |  4 ++--
 gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp   |  2 +-
 gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp     |  2 +-
 gdb/testsuite/gdb.dwarf2/loclists-start-end.exp      |  2 +-
 gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp   |  2 +-
 gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp     |  2 +-
 gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp       |  2 +-
 21 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp b/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp
index e4c9177575e5..7bf8bf17bbde 100644
--- a/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp
+++ b/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp
@@ -56,11 +56,11 @@ proc do_test {cu_lang gdb_lang} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if {![runto func]} {
-	return -1
+	return
     }
 
     gdb_test "show language" "\"auto; currently $gdb_lang\".*"
diff --git a/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp
index 250f479e0274..9432415fdd0d 100644
--- a/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp
+++ b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp
@@ -61,7 +61,7 @@ save_vars { GDBFLAGS } {
     append GDBFLAGS " -iex \"maint set dwarf synchronous on\""
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp
index b148ae0e005c..b31beb3f46a4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp
@@ -174,7 +174,7 @@ proc run_test { goto_main } {
 
     if { $goto_main } {
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
     }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp
index fa3bf5f4b3e0..1be466f513c7 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp
@@ -25,7 +25,7 @@ require dwarf2_support
 standard_testfile .c -dw.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-	return -1
+    return
 }
 
 # Make some DWARF for the test.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
index c76864f125d5..5e49bc0fc96b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
@@ -154,11 +154,11 @@ proc do_test { start_label func_name tag } {
 
     if { [prepare_for_testing "failed to prepare" ${testfile}-${tag} \
 	      [list $srcfile $asm_file] $build_options] } {
-	return -1
+	return
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
index 7f9f9464aaf5..e6859159c291 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
@@ -46,7 +46,7 @@ set result [catch {exec {*}$command} output]
 verbose "result is $result"
 verbose "output is $output"
 if {$result != 0} {
-  return -1
+    return
 }
 
 gdb_load ${binfile_stripped}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
index 12eb4a70373b..5dc4fd0ac629 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
@@ -116,11 +116,11 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile}.[prefix_id] \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_breakpoint "bar_label"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
index 7951d2514445..86d22425ebfd 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
@@ -140,11 +140,11 @@ proc do_console_test {} {
 	gdb_test_no_output "set print object on"
 
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
 
 	if {![runto func01]} {
-	    return -1
+	    return
 	}
 
 	gdb_test "info addr ptr" "Symbol \"ptr\" is optimized out."
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp
index 294e7c8bf45f..8032f71c7d9c 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp
@@ -95,7 +95,7 @@ with_test_prefix "ignore-prologue-end" {
     gdb_test_no_output "maintenance set ignore-prologue-end-flag on"
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     # If we ignore the prologue-end flag, we should stop at the first statement
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp
index 032b39912c79..01433c031c35 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp
@@ -40,7 +40,7 @@ proc do_test {suffix} {
     # testcase, might as well use that.
 
     if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-	return -1
+	return
     }
 
     set asm_file [standard_output_file $srcfile2]
@@ -202,11 +202,11 @@ proc do_test {suffix} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     set main_prologue_line_num [gdb_get_line_number "main prologue"]
@@ -237,7 +237,7 @@ proc do_test {suffix} {
     with_test_prefix "step-test-2" {
 	clean_restart ${testfile}
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
 
 	# Note that the RE used for the following test will fail when the
@@ -274,7 +274,7 @@ proc do_test {suffix} {
 
     clean_restart ${testfile}
     if {![runto_main]} {
-	return -1
+	return
     }
 
     # Disassembly of foo should have multiple address ranges.
@@ -366,7 +366,7 @@ proc do_test {suffix} {
     with_test_prefix "step-test-3" {
 	clean_restart ${testfile}
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
 
 	gdb_test "step" \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp b/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp
index b3bb1ed0f8c9..ea96b9f2e120 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp
@@ -109,11 +109,11 @@ proc run_test { field_name } {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test "p obj.$field_name" " = 0" \
diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp
index 6d3bf29c1b10..94afa35f5588 100644
--- a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp
+++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp
@@ -27,12 +27,12 @@ standard_testfile main.c
 with_test_prefix non-symlink {
     if { [prepare_for_testing "failed to prepare" "${testfile}" \
 	      [list ${srcfile}]] } {
-	return -1
+	return
     }
 
     if { [ensure_gdb_index $binfile] == -1 } {
 	untested "error adding gdb index"
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
index 456d7266c599..6ff1209ad1b6 100644
--- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp
+++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
@@ -117,7 +117,7 @@ gdb_test_multiple $cmd $test {
 	lassign [local_add_gdb_index $binfile] binfile_with_index host_binfile_with_index
 	set testfile_with_index [file tail $binfile_with_index]
 	if { ${binfile_with_index} == "" } {
-	    return -1
+	    return
 	}
     }
     -re ".*${gdb_prompt} $" {
diff --git a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
index 59b91fad6fae..2cbb00cde8ba 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
+++ b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
@@ -126,11 +126,11 @@ proc test_1 { name dwarf_version offset_size addr_size ref_addr_size two_cu } {
     set opts {quiet}
     set executable ${testfile}-${name}
     if {[prepare_for_testing "failed to prepare" $executable "${asm_file} ${srcfile}" $opts]} {
-	return -1
+	return
     }
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     gdb_test "p/x p->f" " = 0x1010101"
diff --git a/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp
index f2a244791d16..edfcb8842d10 100644
--- a/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp
+++ b/gdb/testsuite/gdb.dwarf2/loc-sec-offset.exp
@@ -97,7 +97,7 @@ foreach_with_prefix is_64 {false true} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
index a822f0c2f2e9..e2bacbcb8dc0 100644
--- a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
+++ b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
@@ -124,7 +124,7 @@ foreach_with_prefix is_64 {false true} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
index b80639b32ddd..bc64b7adabd4 100644
--- a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
+++ b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
@@ -212,7 +212,7 @@ foreach_with_prefix is_64 {false true} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
index f40d6fd8ec5c..c8d9f123625f 100644
--- a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
+++ b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
@@ -115,7 +115,7 @@ foreach_with_prefix is_64 {false true} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp b/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp
index d005c8b907cc..e48eb39f3a59 100644
--- a/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp
+++ b/gdb/testsuite/gdb.dwarf2/rnglists-multiple-cus.exp
@@ -92,7 +92,7 @@ foreach_with_prefix is_64 {false true} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     # Sanity checks to make sure GDB slurped the symbols correctly.
diff --git a/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp
index bbfc9e35c646..6207e31b9d0f 100644
--- a/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp
+++ b/gdb/testsuite/gdb.dwarf2/rnglists-sec-offset.exp
@@ -131,7 +131,7 @@ foreach_with_prefix is_64 {false true} {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 
     # Sanity checks to make sure GDB slurped the symbols correctly.
diff --git a/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp b/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
index 4218dd119470..28a2fd7ad58c 100644
--- a/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
@@ -124,7 +124,7 @@ save_vars { GDBFLAGS } {
 
     if { [prepare_for_testing "failed to prepare" ${testfile} \
 	      [list $srcfile $asm_file] {nodebug}] } {
-	return -1
+	return
     }
 }