[PATCH v2 35/37] GDB: testsuite: TUI: Don't return -1 from top-level (sed)

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

This patch is purely the result of running:

$ sed -i 's/^    return -1/    return/' *.exp*

inside gdb/testsuite/gdb.tui.
---
 gdb/testsuite/gdb.tui/basic.exp                     | 2 +-
 gdb/testsuite/gdb.tui/break.exp                     | 2 +-
 gdb/testsuite/gdb.tui/compact-source.exp            | 2 +-
 gdb/testsuite/gdb.tui/corefile-run.exp              | 6 +++---
 gdb/testsuite/gdb.tui/flush-after-run.exp           | 2 +-
 gdb/testsuite/gdb.tui/list-before.exp               | 2 +-
 gdb/testsuite/gdb.tui/list.exp                      | 2 +-
 gdb/testsuite/gdb.tui/main-2.exp                    | 2 +-
 gdb/testsuite/gdb.tui/main.exp                      | 2 +-
 gdb/testsuite/gdb.tui/new-layout.exp                | 2 +-
 gdb/testsuite/gdb.tui/regs.exp                      | 2 +-
 gdb/testsuite/gdb.tui/reread.exp                    | 2 +-
 gdb/testsuite/gdb.tui/resize-3.exp                  | 2 +-
 gdb/testsuite/gdb.tui/resize-one-line.exp           | 2 +-
 gdb/testsuite/gdb.tui/resize.exp                    | 2 +-
 gdb/testsuite/gdb.tui/scroll.exp                    | 2 +-
 gdb/testsuite/gdb.tui/tui-focus.exp                 | 2 +-
 gdb/testsuite/gdb.tui/tui-init-source.exp           | 2 +-
 gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp | 2 +-
 gdb/testsuite/gdb.tui/tui-layout-asm.exp            | 2 +-
 gdb/testsuite/gdb.tui/tui-layout.exp                | 2 +-
 gdb/testsuite/gdb.tui/winheight.exp                 | 2 +-
 gdb/testsuite/gdb.tui/winwidth.exp                  | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/gdb/testsuite/gdb.tui/basic.exp b/gdb/testsuite/gdb.tui/basic.exp
index 7909cea674d6..26264082a163 100644
--- a/gdb/testsuite/gdb.tui/basic.exp
+++ b/gdb/testsuite/gdb.tui/basic.exp
@@ -22,11 +22,11 @@ tuiterm_env
 standard_testfile main-one-line.c
 
 set main_line [gdb_get_line_number "int main"]
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 if {![Term::enter_tui]} {
     unsupported "TUI not supported"
diff --git a/gdb/testsuite/gdb.tui/break.exp b/gdb/testsuite/gdb.tui/break.exp
index 4e07a0c0b691..154ca40b69fa 100644
--- a/gdb/testsuite/gdb.tui/break.exp
+++ b/gdb/testsuite/gdb.tui/break.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 if {![Term::enter_tui]} {
     unsupported "TUI not supported"
diff --git a/gdb/testsuite/gdb.tui/compact-source.exp b/gdb/testsuite/gdb.tui/compact-source.exp
index 9f41a160b3f4..e9478bbeb863 100644
--- a/gdb/testsuite/gdb.tui/compact-source.exp
+++ b/gdb/testsuite/gdb.tui/compact-source.exp
@@ -36,11 +36,11 @@ set srcfile [standard_output_file $srcfile]
 set fd [open $srcfile w]
 puts $fd $src_txt
 close $fd
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 gdb_test_no_output "maint set tui-left-margin-verbose on"
diff --git a/gdb/testsuite/gdb.tui/corefile-run.exp b/gdb/testsuite/gdb.tui/corefile-run.exp
index 7e1184ecf040..1361e4a7f6de 100644
--- a/gdb/testsuite/gdb.tui/corefile-run.exp
+++ b/gdb/testsuite/gdb.tui/corefile-run.exp
@@ -25,23 +25,23 @@ tuiterm_env
 standard_testfile tui-layout.c
 
 set core [standard_output_file "${testfile}.core"]
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 # Only run on native boards.
 require {target_can_use_run_cmd core}
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 if { ![gdb_gcore_cmd "$core" "save a corefile"] } {
     untested "could not generate a corefile"
-    return -1
+    return
 }
 
 set src_line "return 0;"
 set src_line_nr [gdb_get_line_number $src_line]
 
diff --git a/gdb/testsuite/gdb.tui/flush-after-run.exp b/gdb/testsuite/gdb.tui/flush-after-run.exp
index ecc2caafc33d..db20b8cee80b 100644
--- a/gdb/testsuite/gdb.tui/flush-after-run.exp
+++ b/gdb/testsuite/gdb.tui/flush-after-run.exp
@@ -22,11 +22,11 @@ require target_can_use_run_cmd
 tuiterm_env
 
 standard_testfile
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 if {![Term::enter_tui]} {
diff --git a/gdb/testsuite/gdb.tui/list-before.exp b/gdb/testsuite/gdb.tui/list-before.exp
index 55485aa5629c..5d3cef954d49 100644
--- a/gdb/testsuite/gdb.tui/list-before.exp
+++ b/gdb/testsuite/gdb.tui/list-before.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 gdb_test "list -q main"
diff --git a/gdb/testsuite/gdb.tui/list.exp b/gdb/testsuite/gdb.tui/list.exp
index de58afa53e1a..5cefebc7e016 100644
--- a/gdb/testsuite/gdb.tui/list.exp
+++ b/gdb/testsuite/gdb.tui/list.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 if {![Term::enter_tui]} {
     unsupported "TUI not supported"
diff --git a/gdb/testsuite/gdb.tui/main-2.exp b/gdb/testsuite/gdb.tui/main-2.exp
index 1b8068e3a361..9b3b38645b0f 100644
--- a/gdb/testsuite/gdb.tui/main-2.exp
+++ b/gdb/testsuite/gdb.tui/main-2.exp
@@ -21,11 +21,11 @@ require allow_tui_tests
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if { [build_executable "failed to prepare" $testfile $srcfile ] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.tui/main.exp b/gdb/testsuite/gdb.tui/main.exp
index 5bc6b91cdee4..d8a9c8eebe85 100644
--- a/gdb/testsuite/gdb.tui/main.exp
+++ b/gdb/testsuite/gdb.tui/main.exp
@@ -20,11 +20,11 @@ require allow_tui_tests
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 # Note: don't pass the executable here
 Term::clean_restart 24 80
 
diff --git a/gdb/testsuite/gdb.tui/new-layout.exp b/gdb/testsuite/gdb.tui/new-layout.exp
index f293773f9d15..e544ef6fd90a 100644
--- a/gdb/testsuite/gdb.tui/new-layout.exp
+++ b/gdb/testsuite/gdb.tui/new-layout.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 # Make sure TUI is supported before continuing.
 with_test_prefix "initial check" {
     Term::clean_restart 24 80 $testfile
diff --git a/gdb/testsuite/gdb.tui/regs.exp b/gdb/testsuite/gdb.tui/regs.exp
index 3c524ad49a70..8169538da85c 100644
--- a/gdb/testsuite/gdb.tui/regs.exp
+++ b/gdb/testsuite/gdb.tui/regs.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.tui/reread.exp b/gdb/testsuite/gdb.tui/reread.exp
index de35fef744cd..3ed0839e1c83 100644
--- a/gdb/testsuite/gdb.tui/reread.exp
+++ b/gdb/testsuite/gdb.tui/reread.exp
@@ -21,11 +21,11 @@ tuiterm_env
 # Use main-one-line.c to get the line info at a predictable location without
 # resorting to a dwarf assembly test-case.
 standard_testfile main-one-line.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 if {![Term::enter_tui]} {
diff --git a/gdb/testsuite/gdb.tui/resize-3.exp b/gdb/testsuite/gdb.tui/resize-3.exp
index d9e0948a9a80..fdaffe006419 100644
--- a/gdb/testsuite/gdb.tui/resize-3.exp
+++ b/gdb/testsuite/gdb.tui/resize-3.exp
@@ -21,11 +21,11 @@ standard_testfile -main.c -foo.c
 
 if { [build_executable_from_specs "failed to prepare" \
 	  $testfile {debug} \
 	  $srcfile {debug} \
 	  $srcfile2 {nodebug}] == -1 } {
-    return -1
+    return
 }
 
 tuiterm_env
 
 Term::clean_restart 24 80 $testfile
diff --git a/gdb/testsuite/gdb.tui/resize-one-line.exp b/gdb/testsuite/gdb.tui/resize-one-line.exp
index f5e2858b05d2..0a47dcf0e7f8 100644
--- a/gdb/testsuite/gdb.tui/resize-one-line.exp
+++ b/gdb/testsuite/gdb.tui/resize-one-line.exp
@@ -20,11 +20,11 @@
 tuiterm_env
 
 standard_testfile main-one-line.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 if {![Term::enter_tui]} {
diff --git a/gdb/testsuite/gdb.tui/resize.exp b/gdb/testsuite/gdb.tui/resize.exp
index 93918f3b3560..25f52c6a5b8e 100644
--- a/gdb/testsuite/gdb.tui/resize.exp
+++ b/gdb/testsuite/gdb.tui/resize.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.tui/scroll.exp b/gdb/testsuite/gdb.tui/scroll.exp
index e9fa829f40ec..0162cfd8db7b 100644
--- a/gdb/testsuite/gdb.tui/scroll.exp
+++ b/gdb/testsuite/gdb.tui/scroll.exp
@@ -22,11 +22,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 if {![Term::enter_tui]} {
     unsupported "TUI not supported"
diff --git a/gdb/testsuite/gdb.tui/tui-focus.exp b/gdb/testsuite/gdb.tui/tui-focus.exp
index 5df76b59b864..310b3a473206 100644
--- a/gdb/testsuite/gdb.tui/tui-focus.exp
+++ b/gdb/testsuite/gdb.tui/tui-focus.exp
@@ -21,11 +21,11 @@ tuiterm_env
 load_lib gdb-python.exp
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 # Run a series of tests based on various test specifications.
 #
 # Each test specification is a tuple where the first item is the name of a
diff --git a/gdb/testsuite/gdb.tui/tui-init-source.exp b/gdb/testsuite/gdb.tui/tui-init-source.exp
index edd364e05b12..f49b0ecdcbdb 100644
--- a/gdb/testsuite/gdb.tui/tui-init-source.exp
+++ b/gdb/testsuite/gdb.tui/tui-init-source.exp
@@ -21,11 +21,11 @@ require allow_tui_tests
 tuiterm_env
 
 standard_testfile
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 
 if {![Term::enter_tui]} {
diff --git a/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp b/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp
index e54ae69997ed..b3dd72ce1ceb 100644
--- a/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp
+++ b/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp
@@ -25,11 +25,11 @@ lappend opts debug
 lappend opts additional_flags=-static
 lappend opts additional_flags=-nostdlib
 lappend opts ldflags=-nostartfiles
 
 if { [build_executable "failed to prepare" $testfile $srcfile $opts] == -1 } {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 if {![Term::prepare_for_tui]} {
     unsupported "TUI not supported"
diff --git a/gdb/testsuite/gdb.tui/tui-layout-asm.exp b/gdb/testsuite/gdb.tui/tui-layout-asm.exp
index bbaa4f9b846f..01193b6fb44b 100644
--- a/gdb/testsuite/gdb.tui/tui-layout-asm.exp
+++ b/gdb/testsuite/gdb.tui/tui-layout-asm.exp
@@ -19,11 +19,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 # The wider the window is, the less line truncation happens, so matching
 # pre-scroll to post-scroll lines is more accurate.  But 100% accurate line
 # matching isn't a goal of the test-case.
diff --git a/gdb/testsuite/gdb.tui/tui-layout.exp b/gdb/testsuite/gdb.tui/tui-layout.exp
index 05ca3b450290..1cb70504e3f8 100644
--- a/gdb/testsuite/gdb.tui/tui-layout.exp
+++ b/gdb/testsuite/gdb.tui/tui-layout.exp
@@ -21,11 +21,11 @@ require allow_tui_tests
 tuiterm_env
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 # Run one test of the 'layout' command, selecting LAYOUT_NAME.
 #
 # TERMINAL should be either 'dumb' or 'ansi'.  When TERMINAL is 'dumb'
diff --git a/gdb/testsuite/gdb.tui/winheight.exp b/gdb/testsuite/gdb.tui/winheight.exp
index 758f23d8f723..9daf08916af8 100644
--- a/gdb/testsuite/gdb.tui/winheight.exp
+++ b/gdb/testsuite/gdb.tui/winheight.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 if {![Term::enter_tui]} {
     unsupported "TUI not supported"
diff --git a/gdb/testsuite/gdb.tui/winwidth.exp b/gdb/testsuite/gdb.tui/winwidth.exp
index a18ff4edba1f..cc6c7dcd1536 100644
--- a/gdb/testsuite/gdb.tui/winwidth.exp
+++ b/gdb/testsuite/gdb.tui/winwidth.exp
@@ -18,11 +18,11 @@
 tuiterm_env
 
 standard_testfile tui-layout.c
 
 if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
-    return -1
+    return
 }
 
 Term::clean_restart 24 80 $testfile
 if {![Term::enter_tui]} {
     unsupported "TUI not supported"