[PATCH v2 01/37] GDB: testsuite: aarch64, arm: Don't return value 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/' \
      aarch64-*.exp* arm-*.exp* thumb*.exp* iwmmxt-regs.exp pr25124.exp

and

$ sed -i 's/^    return 0/    return/' \
      aarch64-*.exp* arm-*.exp* thumb*.exp* iwmmxt-regs.exp pr25124.exp

inside gdb/testsuite/gdb.arch.

I didn't include changes made to return statements inside procedures.
---
 gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp       |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp      |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-fp.exp                |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-fpmr-core.exp         |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-fpmr-sighandler.exp   |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-fpmr.exp              |  4 ++--
 .../gdb.arch/aarch64-frameptr-vecreg-unwind.exp      |  2 +-
 gdb/testsuite/gdb.arch/aarch64-mops-single-step.exp  |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-mops-watchpoint.exp   |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-mte.exp               | 12 ++++++------
 gdb/testsuite/gdb.arch/aarch64-non-address-bits.exp  |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-pauth.exp             |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-prologue.exp          |  2 +-
 gdb/testsuite/gdb.arch/aarch64-pseudo-unwind.exp     |  2 +-
 gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp   |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-sme-sanity.exp        |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp    |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp         |  4 ++--
 gdb/testsuite/gdb.arch/aarch64-w-registers.exp       |  4 ++--
 gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp        |  4 ++--
 gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp          |  2 +-
 gdb/testsuite/gdb.arch/arm-disp-step.exp             |  4 ++--
 gdb/testsuite/gdb.arch/arm-neon.exp                  |  4 ++--
 gdb/testsuite/gdb.arch/arm-pseudo-unwind-legacy.exp  |  2 +-
 gdb/testsuite/gdb.arch/arm-pseudo-unwind.exp         |  2 +-
 .../gdb.arch/arm-single-step-kernel-helper.exp       |  6 +++---
 gdb/testsuite/gdb.arch/iwmmxt-regs.exp               |  2 +-
 gdb/testsuite/gdb.arch/pr25124.exp                   |  2 +-
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp               |  4 ++--
 gdb/testsuite/gdb.arch/thumb-prologue.exp            |  4 ++--
 gdb/testsuite/gdb.arch/thumb-singlestep.exp          |  4 ++--
 gdb/testsuite/gdb.arch/thumb2-it.exp                 |  4 ++--
 32 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
index 269e32cecc74..38c83d67dc44 100644
--- a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
@@ -20,15 +20,15 @@
 
 require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "[gdb_get_line_number "ldxr"]" \
   "Breakpoint $decimal at $hex" \
   "Set the breakpoint at the start of the sequence"
diff --git a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
index f3abd842d0ea..b23d36b8e2bb 100644
--- a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
@@ -20,15 +20,15 @@
 
 require is_aarch64_target
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Number of expected SIGTRAP's to get.  This needs to be kept in sync
 # with the source file.
 set expected_traps 3
diff --git a/gdb/testsuite/gdb.arch/aarch64-fp.exp b/gdb/testsuite/gdb.arch/aarch64-fp.exp
index e2e3777a7289..7d8c323ba2a4 100644
--- a/gdb/testsuite/gdb.arch/aarch64-fp.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-fp.exp
@@ -20,15 +20,15 @@
 
 require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set endianness [get_endianness]
 
 gdb_test "break ${srcfile}:[gdb_get_line_number "return"]" \
diff --git a/gdb/testsuite/gdb.arch/aarch64-fpmr-core.exp b/gdb/testsuite/gdb.arch/aarch64-fpmr-core.exp
index dea9f82bd4a1..81ebd4892aa9 100644
--- a/gdb/testsuite/gdb.arch/aarch64-fpmr-core.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-fpmr-core.exp
@@ -40,17 +40,17 @@ proc check_fpmr_core_file {core_filename} {
 require is_aarch64_target
 require allow_aarch64_fpmr_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 set binfile [standard_output_file ${testfile}]
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set crash_breakpoint "crash point"
 gdb_breakpoint [gdb_get_line_number $crash_breakpoint]
 gdb_continue_to_breakpoint $crash_breakpoint
diff --git a/gdb/testsuite/gdb.arch/aarch64-fpmr-sighandler.exp b/gdb/testsuite/gdb.arch/aarch64-fpmr-sighandler.exp
index d0c23ca2861a..19c28c70c50d 100644
--- a/gdb/testsuite/gdb.arch/aarch64-fpmr-sighandler.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-fpmr-sighandler.exp
@@ -20,15 +20,15 @@
 require is_aarch64_target
 require allow_aarch64_fpmr_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set reg_main_value "0x3fff7fc049"
 set reg_handler_value "0xff008041"
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-fpmr.exp b/gdb/testsuite/gdb.arch/aarch64-fpmr.exp
index bbaf2bf3eed9..72fd977fc673 100644
--- a/gdb/testsuite/gdb.arch/aarch64-fpmr.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-fpmr.exp
@@ -18,15 +18,15 @@
 require is_aarch64_target
 require allow_aarch64_fpmr_tests
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_multiple "info register \$fpmr" "Test FPMR SRC1 E5M2" {
     -re ".*\r\n.*\[ \
 	F8S1=E5M2 \
diff --git a/gdb/testsuite/gdb.arch/aarch64-frameptr-vecreg-unwind.exp b/gdb/testsuite/gdb.arch/aarch64-frameptr-vecreg-unwind.exp
index 784868651b8d..29c44a657adb 100644
--- a/gdb/testsuite/gdb.arch/aarch64-frameptr-vecreg-unwind.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-frameptr-vecreg-unwind.exp
@@ -17,11 +17,11 @@ require is_aarch64_target
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	"${srcfile}" {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.arch/aarch64-mops-single-step.exp b/gdb/testsuite/gdb.arch/aarch64-mops-single-step.exp
index 3671d3fdaa35..b489723b9869 100644
--- a/gdb/testsuite/gdb.arch/aarch64-mops-single-step.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-mops-single-step.exp
@@ -20,11 +20,11 @@
 require allow_aarch64_mops_tests
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  [list debug additional_flags=-march=armv9.3-a]] } {
-    return -1
+    return
 }
 
 # If the inferior is rescheduled to another CPU while a main or epilogue
 # instruction is executed, the OS resets the inferior back to the prologue
 # instruction, so we need to allow for that possibility.
@@ -70,11 +70,11 @@ proc step_through_sequence { prefix } {
     fail "step through $prefix sequence"
     return 0
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint ${srcfile}:[gdb_get_line_number "Break memset"]
 gdb_breakpoint ${srcfile}:[gdb_get_line_number "Break memcpy"]
 gdb_breakpoint ${srcfile}:[gdb_get_line_number "Break memmove"]
diff --git a/gdb/testsuite/gdb.arch/aarch64-mops-watchpoint.exp b/gdb/testsuite/gdb.arch/aarch64-mops-watchpoint.exp
index da80fa2fe8ed..35d15d2588a0 100644
--- a/gdb/testsuite/gdb.arch/aarch64-mops-watchpoint.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-mops-watchpoint.exp
@@ -22,16 +22,16 @@ require allow_hw_watchpoint_tests allow_aarch64_mops_tests
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  [list debug additional_flags=-march=armv9.3-a]] } {
-    return -1
+    return
 }
 
 set linespec ${srcfile}:[gdb_get_line_number "Break here"]
 if {![runto ${linespec}]} {
-    return -1
+    return
 }
 
 gdb_test "watch -location a\[28\]" \
     "(Hardware w|W)atchpoint ${decimal}: -location a\\\[28\\\]" \
     "set watch on a"
diff --git a/gdb/testsuite/gdb.arch/aarch64-mte.exp b/gdb/testsuite/gdb.arch/aarch64-mte.exp
index 4da381095739..4826041e330a 100644
--- a/gdb/testsuite/gdb.arch/aarch64-mte.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-mte.exp
@@ -45,46 +45,46 @@ proc get_ltag_from_ptr { ptr } {
 
 require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Targets that don't support memory tagging should not execute the
 # runtime memory tagging tests.
 if {![supports_memtag]} {
     unsupported "memory tagging unsupported"
-    return -1
+    return
 }
 
 gdb_breakpoint "access_memory"
 
 if {[gdb_continue "access_memory"]} {
-    return -1
+    return
 }
 
 # Fetch a known pointer to an area mapped with PROT_MTE.
 set tagged_ptr_symbol "tagged_ptr"
 set tagged_ptr_addr [get_hexadecimal_valueof $tagged_ptr_symbol -1]
 
 if {$tagged_ptr_addr == -1} {
     unresolved "unexpected pointer or tag value"
-    return -1
+    return
 }
 
 # Fetch a known pointer to an area not mapped with PROT_MTE.
 set untagged_ptr_symbol "untagged_ptr"
 set untagged_ptr_addr [get_hexadecimal_valueof $untagged_ptr_symbol -1]
 
 if {$untagged_ptr_addr == -1} {
     unresolved "unexpected pointer or tag value"
-    return -1
+    return
 }
 
 with_test_prefix "literals" {
     # Test inspecting an allocation tag from a pointer to a memory area that
     # is not mapped with PROT_MTE.
diff --git a/gdb/testsuite/gdb.arch/aarch64-non-address-bits.exp b/gdb/testsuite/gdb.arch/aarch64-non-address-bits.exp
index 2f90b518fcb6..8066b2035e1b 100644
--- a/gdb/testsuite/gdb.arch/aarch64-non-address-bits.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-non-address-bits.exp
@@ -21,15 +21,15 @@
 
 require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # We need to iterate over two distinct ranges, separated by a single bit.
 # This bit is 55 (VA_RANGE_SELECT) which tells us if we have a kernel-space
 # address or a user-space address.
diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.exp b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
index e89ec701342a..6f363097f030 100644
--- a/gdb/testsuite/gdb.arch/aarch64-pauth.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
@@ -40,15 +40,15 @@ foreach pauth_flag "-mbranch-protection=pac-ret+leaf -msign-return-address=all"
     }
 }
 
 # If we couldn't compile, just bail out.
 if {!$compilation_ok} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [ gdb_get_line_number "break here" ]
 gdb_continue_to_breakpoint "break here" ".*break here.*"
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-prologue.exp b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
index 98583e84aa9f..c6fe2e262a5e 100644
--- a/gdb/testsuite/gdb.arch/aarch64-prologue.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
@@ -17,11 +17,11 @@
 
 require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
    return -1
 }
diff --git a/gdb/testsuite/gdb.arch/aarch64-pseudo-unwind.exp b/gdb/testsuite/gdb.arch/aarch64-pseudo-unwind.exp
index f2bf2236a9b1..d43ab468cabe 100644
--- a/gdb/testsuite/gdb.arch/aarch64-pseudo-unwind.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-pseudo-unwind.exp
@@ -24,11 +24,11 @@ if { ![istarget aarch64-*-* ] } {
 
 standard_testfile aarch64-pseudo-unwind.c aarch64-pseudo-unwind-asm.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	"${srcfile} ${srcfile2}" {debug}] } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
index aff80020cd33..740b807e7078 100644
--- a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
@@ -27,15 +27,15 @@ if { ![allow_aarch64_sve_tests] } {
     lappend compile_flags "additional_flags=-DSVE"
 }
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${compile_flags}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set endianness [get_endianness]
 
 if {$endianness == "little"} {
diff --git a/gdb/testsuite/gdb.arch/aarch64-sme-sanity.exp b/gdb/testsuite/gdb.arch/aarch64-sme-sanity.exp
index f3ded57969d2..c0c4af53a4f9 100644
--- a/gdb/testsuite/gdb.arch/aarch64-sme-sanity.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-sme-sanity.exp
@@ -45,15 +45,15 @@ require allow_aarch64_sme_tests
 require !gdb_protocol_is_remote
 
 set compile_flags {"debug" "macros" "additional_flags=-march=armv8.5-a+sve"}
 standard_testfile
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${compile_flags}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Adjust the repeat count for the test.
 gdb_test_no_output "set print repeats 1" "adjust repeat count"
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
index 21242a698cc1..12cede6e2eb2 100644
--- a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
@@ -17,15 +17,15 @@
 
 require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "breakpoint here"]
 gdb_continue_to_breakpoint "breakpoint here"
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
index 7ee2eec43b81..e08b4d1f90ee 100644
--- a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
@@ -20,15 +20,15 @@
 require is_aarch64_target
 
 standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 proc test_reg_vals {} {
     gdb_test "p \$pc - &main" "= 8" "p \$pc"
     gdb_test "p/x \$x30" "= 0x1234" "p \$x30"
diff --git a/gdb/testsuite/gdb.arch/aarch64-w-registers.exp b/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
index 31de299c7f16..c2685b302012 100644
--- a/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
@@ -18,16 +18,16 @@
 
 require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
 
 array set w_values {
     0 0x0
     1 0x10
diff --git a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp
index c0516313ee30..703d5d66f4e1 100644
--- a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp
+++ b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp
@@ -22,13 +22,13 @@ standard_testfile
 # on ARM, causing the PC to acquire a wrong value.  That's why we use
 # the "-Wl,-Ttext-segment" option compile the binary.
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     [list debug text_segment=0xb0000000]] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_test "next" "${::decimal}\\s+return 0;"
diff --git a/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp b/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
index cb6d9e60b0bf..c2ecaffd1d2c 100644
--- a/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
+++ b/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
@@ -17,11 +17,11 @@
 
 require {istarget "arm*-*-*"}
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile ]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
    return -1
 }
diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
index 8bf9da42a59d..d68c7c85e279 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
@@ -20,11 +20,11 @@
 require is_aarch32_target
 
 standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 
 #########################################
 # Test ldm/stm related to PC.
@@ -405,11 +405,11 @@ proc test_add_rn_pc {} {
 # is on, and we type 'run', GDB will first try to single step on _dl_debug_state,
 # which is in library might be compiled in Thumb.
 gdb_test_no_output "set displaced-stepping off"
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 gdb_test_no_output "set displaced-stepping on"
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
diff --git a/gdb/testsuite/gdb.arch/arm-neon.exp b/gdb/testsuite/gdb.arch/arm-neon.exp
index e15c04420c72..3ef346150d65 100644
--- a/gdb/testsuite/gdb.arch/arm-neon.exp
+++ b/gdb/testsuite/gdb.arch/arm-neon.exp
@@ -20,15 +20,15 @@ require {is_any_target "aarch64*-*-*" "arm*-*-*"}
 require allow_float_test
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug quiet}] } {
     unsupported "ARM NEON is not supported"
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Test passing vectors in function argument in the inferior call.
 
 for {set i 1} {$i <= 18} {incr i} {
diff --git a/gdb/testsuite/gdb.arch/arm-pseudo-unwind-legacy.exp b/gdb/testsuite/gdb.arch/arm-pseudo-unwind-legacy.exp
index bdfe665ee70b..06a9ba3a74ed 100644
--- a/gdb/testsuite/gdb.arch/arm-pseudo-unwind-legacy.exp
+++ b/gdb/testsuite/gdb.arch/arm-pseudo-unwind-legacy.exp
@@ -29,11 +29,11 @@ if { ![istarget arm*-*-* ] } {
 
 standard_testfile arm-pseudo-unwind-legacy.c arm-pseudo-unwind-legacy-asm.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	"${srcfile} ${srcfile2}" {debug additional_flags=-marm}] } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.arch/arm-pseudo-unwind.exp b/gdb/testsuite/gdb.arch/arm-pseudo-unwind.exp
index af637d639757..d2d65f792d59 100644
--- a/gdb/testsuite/gdb.arch/arm-pseudo-unwind.exp
+++ b/gdb/testsuite/gdb.arch/arm-pseudo-unwind.exp
@@ -24,11 +24,11 @@ if { ![istarget arm*-*-* ] } {
 
 standard_testfile arm-pseudo-unwind.c arm-pseudo-unwind-asm.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	"${srcfile} ${srcfile2}" {debug additional_flags=-marm}] } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp b/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp
index 78d7c2fbb3af..be1e123d265e 100644
--- a/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp
+++ b/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp
@@ -17,15 +17,15 @@ require is_aarch32_target
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     [list debug]] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Initialize kernel_user_helper_version.
 gdb_test "next" "for .*"
 
@@ -41,11 +41,11 @@ gdb_test_multiple "p kernel_user_helper_version" \
 	}
     }
 
 if { !$kernel_helper_supported } {
     unsupported "kernel doesn't have helpers"
-    return 0
+    return
 }
 
 # Get the instruction branching to kernel helper, they can be
 # blx rN or bx rN.
 set branch_to_kernel_helper 0
diff --git a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
index 6c1848593b21..5317c9bfae35 100644
--- a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
+++ b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
@@ -36,11 +36,11 @@ gdb_load ${binfile}
 #
 # Run to `main' where we begin our tests.
 #
 
 if {![runto_main]} {
-    return 0
+    return
 }
 
 # Set all the registers to arbitrary values.
 for {set i 0} {$i < 16} {incr i 1} {
     gdb_test "set \$wR$i.u64 = ((${i}LL << 32) | ${i})" "" "set reg wR$i"
diff --git a/gdb/testsuite/gdb.arch/pr25124.exp b/gdb/testsuite/gdb.arch/pr25124.exp
index 6086790bc568..b543812a50a4 100644
--- a/gdb/testsuite/gdb.arch/pr25124.exp
+++ b/gdb/testsuite/gdb.arch/pr25124.exp
@@ -20,11 +20,11 @@ require is_aarch32_target
 
 standard_testfile .S
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 # Check if the disassemble ouput is correct.
diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
index 3a86ea2e2922..29dbfb348931 100644
--- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
+++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
@@ -20,15 +20,15 @@ require is_aarch32_target
 set testfile "thumb-bx-pc"
 set srcfile ${testfile}.S
 set opts {}
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "stepi" "$hex in main \\(\\)" "stepi for bx pc"
 
 gdb_test "x /i \$pc" \
diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.exp b/gdb/testsuite/gdb.arch/thumb-prologue.exp
index ccf7a235cd73..d0eb17927746 100644
--- a/gdb/testsuite/gdb.arch/thumb-prologue.exp
+++ b/gdb/testsuite/gdb.arch/thumb-prologue.exp
@@ -21,22 +21,22 @@ standard_testfile
 
 # Don't use "debug", so that we don't have line information for the assembly
 # fragments.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-mthumb"}] != "" } {
     untested "ARM prologue tests"
-    return -1
+    return
 }
 
 
 clean_restart $testfile
 
 #
 # Run to `main' where we begin our tests.
 #
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Testcase for TPCS prologue.
 
 gdb_breakpoint "* *(int *)tpcs_offset + (int) &tpcs_frame_1"
diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
index 53fce5770a94..cb9f77f4ee76 100644
--- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp
+++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
@@ -20,15 +20,15 @@ require is_aarch32_target
 set testfile "thumb-singlestep"
 set srcfile ${testfile}.S
 
 set additional_flags "additional_flags=-mthumb"
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} [list debug $additional_flags]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # GDB doesn't skip prologue for asm files, so do one single step to
 # pass instruction "push".
 gdb_test "si" "blx	foo.*" "single step"
diff --git a/gdb/testsuite/gdb.arch/thumb2-it.exp b/gdb/testsuite/gdb.arch/thumb2-it.exp
index d100a34acc1c..0c9246b2131e 100644
--- a/gdb/testsuite/gdb.arch/thumb2-it.exp
+++ b/gdb/testsuite/gdb.arch/thumb2-it.exp
@@ -19,17 +19,17 @@ require {istarget arm*-*eabi*}
 
 standard_testfile .S
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Make sure that the compiler options allow Thumb-2.
 gdb_test_multiple "list" "list main" {
     -re ".*@ No Thumb-2.*$gdb_prompt $" {