From: Tom Tromey <tom@tromey.com>
Date: Wed, 25 Jan 2023 16:36:25 +0000 (-0700)
Subject: Eliminate spurious returns from the test suite
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=879ebc530082ac9a90a48c0d02c073b39d98a1cc;p=binutils-gdb.git

Eliminate spurious returns from the test suite

A number of tests end with "return".  However, this is unnecessary.
This patch removes all of these.
---

diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
index d699f5fa30b..82c7b2a300a 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
@@ -135,4 +135,3 @@ mi_send_resuming_command "exec-continue" "continuing to inferior exit"
 mi_expect_stop "exited-normally" "" "" "" "" "" "exit normally"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index 03214885082..95b330b72d9 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -650,5 +650,3 @@ do_command_attach_tests
 
 
 test_command_line_attach_run
-
-return 0
diff --git a/gdb/testsuite/gdb.base/bfd-errors.exp b/gdb/testsuite/gdb.base/bfd-errors.exp
index 08de1141336..7edb9d8d879 100644
--- a/gdb/testsuite/gdb.base/bfd-errors.exp
+++ b/gdb/testsuite/gdb.base/bfd-errors.exp
@@ -180,4 +180,3 @@ gdb_assert { $more_than_one == 0 } "consolidated bfd errors"
 gdb_assert { [array size bfd_error_count] >= 2 } "print all unique bfd errors"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index 37b817ae279..7e2aee6a4aa 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -627,5 +627,3 @@ if ![gdb_skip_stdio_test "print print_one_large_struct(...)"] {
 }
 
 set timeout $oldtimeout
-return
-
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index 16ecb9288b7..a84c1671e3a 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -175,5 +175,3 @@ if ![gdb_skip_stdio_test "print print_int_char_combo(*int_char_combo)"] {
 	".*Contents of int_char_combo_t:\[ \r\n\]+13\[ \t\]+!\[ \r\n\]+" \
 	".\[0-9\]+ = \\{int1 = 13, ch1 = 33 '!'\\}"
 }
-
-return
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index dc78308d42e..cda6f618472 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -438,5 +438,3 @@ if {$allow_float_test} {
 
 # Approx size: 4, 8, ...
 test te
-
-return 0
diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index 4941188aac4..2388b9459d4 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -138,5 +138,3 @@ gdb_test "continue" "Breakpoint \[0-9\]*, handle_signal.*" \
 
 gdb_test "continue" "$inferior_exited_re normally." \
     "continue to program exit"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp
index a8d14ef59da..4ed68936ae4 100644
--- a/gdb/testsuite/gdb.base/callexit.exp
+++ b/gdb/testsuite/gdb.base/callexit.exp
@@ -48,5 +48,3 @@ gdb_test_no_output "set may-call-functions on"
 gdb_test "call callexit()" \
 	"The program being debugged exited.*" \
 	"inferior function call terminated program"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/chng-syms.exp b/gdb/testsuite/gdb.base/chng-syms.exp
index d085d9c1366..eee51023537 100644
--- a/gdb/testsuite/gdb.base/chng-syms.exp
+++ b/gdb/testsuite/gdb.base/chng-syms.exp
@@ -83,4 +83,3 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 
 set timeout $oldtimeout
 verbose "Timeout is now $timeout seconds" 2
-return 0
diff --git a/gdb/testsuite/gdb.base/complex.exp b/gdb/testsuite/gdb.base/complex.exp
index 73538df866f..6507beb24b8 100644
--- a/gdb/testsuite/gdb.base/complex.exp
+++ b/gdb/testsuite/gdb.base/complex.exp
@@ -33,5 +33,3 @@ if {[runto f4]} {
     gdb_test "p *y" "\\\$\[0-9\]* = \{c = 42 '\\*', f = 1 \\+ 0i\}" \
 	    "print complex value in C"
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index a4e3e3edeff..59cb1a28adc 100644
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -65,5 +65,3 @@ if {! [runto_main]} {
 gdb_test "list" \
     "func1 \\(\\);" \
     "list size 3"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp
index d57f2aaeb21..9ed5101e6ed 100644
--- a/gdb/testsuite/gdb.base/define.exp
+++ b/gdb/testsuite/gdb.base/define.exp
@@ -343,4 +343,3 @@ gdb_test_no_output "do-define" "invoke do-define"
 gdb_test "do-printit" "here" "invoke do-printit"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/detach.exp b/gdb/testsuite/gdb.base/detach.exp
index c602052b1de..d4427c13087 100644
--- a/gdb/testsuite/gdb.base/detach.exp
+++ b/gdb/testsuite/gdb.base/detach.exp
@@ -57,5 +57,3 @@ exec sleep 1
 
 set pass "two"
 do_detach_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index cacd6f530d4..a349fc8a97d 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -223,5 +223,3 @@ gdb_exit
 # Restore the preserved old timeout value.
 set timeout $oldtimeout
 verbose "Timeout is now $timeout seconds" 2
-
-return 0
diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
index d0c46b08117..b6a8a3a4a7f 100644
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ b/gdb/testsuite/gdb.base/ena-dis-br.exp
@@ -461,4 +461,3 @@ test_ena_dis_br "disable"
 test_ena_dis_br "enable"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 4eda7579679..b2cfc03e3bf 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -296,7 +296,7 @@ if {!$use_gdb_stub
 set timeout $old_timeout
 
 #remote_exec build "rm -f ${binfile}"
-return 0
+
 
 
 
diff --git a/gdb/testsuite/gdb.base/environ.exp b/gdb/testsuite/gdb.base/environ.exp
index 2944f826480..ad0291d9bbb 100644
--- a/gdb/testsuite/gdb.base/environ.exp
+++ b/gdb/testsuite/gdb.base/environ.exp
@@ -107,4 +107,3 @@ gdb_test "show paths" \
     "show paths works properly"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp
index 44433063d36..7936c42ae93 100644
--- a/gdb/testsuite/gdb.base/eval-skip.exp
+++ b/gdb/testsuite/gdb.base/eval-skip.exp
@@ -137,11 +137,3 @@ gdb_test "print (0 && (x=y))" ".$decimal = $false" \
 
 
 gdb_exit
-return 0
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index d19a8c4dde6..fd2eab5c6fc 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -273,4 +273,3 @@ if {[file exists $dir2] && ![file writable $dir2]} {
 }
 
 set timeout $oldtimeout
-return 0
diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp
index 73b1827b1fa..0846441eac7 100644
--- a/gdb/testsuite/gdb.base/foll-exec-mode.exp
+++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp
@@ -208,5 +208,3 @@ foreach cmd {"next" "continue"} {
 	}
     }
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp
index f4957c34a66..83ccb54e60e 100644
--- a/gdb/testsuite/gdb.base/foll-exec.exp
+++ b/gdb/testsuite/gdb.base/foll-exec.exp
@@ -385,5 +385,3 @@ gdb_exit
 clean_restart $binfile
 
 do_exec_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp
index 5093ee3aab8..313afa06324 100644
--- a/gdb/testsuite/gdb.base/foll-vfork.exp
+++ b/gdb/testsuite/gdb.base/foll-vfork.exp
@@ -502,4 +502,3 @@ with_test_prefix "exit" {
 }
 
 set timeout $oldtimeout
-return 0
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index 3952b6444c5..815994287d4 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -225,4 +225,3 @@ if {![file exists $binfile]} {
 	gdb_assert { $saw_end_of_file && $saw_inferior_exit } $msg
     }
 }
-return 0
diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
index a456698c380..032c4a6279d 100644
--- a/gdb/testsuite/gdb.base/jump.exp
+++ b/gdb/testsuite/gdb.base/jump.exp
@@ -114,4 +114,3 @@ gdb_test "jump $out_line" \
     "y"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp
index a882aadae7e..19830dc422d 100644
--- a/gdb/testsuite/gdb.base/langs.exp
+++ b/gdb/testsuite/gdb.base/langs.exp
@@ -124,4 +124,3 @@ if {[runto csub]} {
 }
 
 set timeout $oldtimeout
-return 0
diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp
index 3f6f751bf11..357f7cc8063 100644
--- a/gdb/testsuite/gdb.base/long_long.exp
+++ b/gdb/testsuite/gdb.base/long_long.exp
@@ -282,4 +282,3 @@ send_gdb "\n"
 gdb_test "" "0x00.*0x00" "repeat x command"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index d73ff569ad6..98e23b40ef6 100644
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -515,4 +515,3 @@ gdb_test_no_output "maint print msymbols"
 gdb_test_no_output "maint print psymbols"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp
index 12627bd0aea..59f6ddfc6e7 100644
--- a/gdb/testsuite/gdb.base/mips_pro.exp
+++ b/gdb/testsuite/gdb.base/mips_pro.exp
@@ -39,4 +39,3 @@ if {[runto middle]} {
     # or main -> middle.
     gdb_test "backtrace" "#0.*middle.*#\[12\].*main.*"
 }
-return 0
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index c1ee2a98108..542d36efec7 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -197,5 +197,3 @@ for {set i 6} { $i <= 16} {incr i} {
     gdb_test_no_output "kill inferior $i" "kill $i"
     gdb_test "info inferior $i" "<null>.*" "did kill $i"
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.base/range-stepping.exp b/gdb/testsuite/gdb.base/range-stepping.exp
index fd2eeda010b..ff4107610ac 100644
--- a/gdb/testsuite/gdb.base/range-stepping.exp
+++ b/gdb/testsuite/gdb.base/range-stepping.exp
@@ -221,5 +221,3 @@ with_test_prefix "software watchpoint" {
     gdb_test "watch \$pc" ".*" "set watchpoint"
     gdb_test "step" "soft-watch.*" "step still in same line"
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
index a619d2897b8..65dab15ad92 100644
--- a/gdb/testsuite/gdb.base/reread.exp
+++ b/gdb/testsuite/gdb.base/reread.exp
@@ -132,5 +132,3 @@ foreach_with_prefix opts { "" "pie" } {
 
     }
 # End of tests.
-
-return 0
diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
index e5553f208ba..7f78d24e1ec 100644
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ b/gdb/testsuite/gdb.base/sigall.exp
@@ -184,5 +184,3 @@ gdb_test "continue" \
     "get signal TERM"
 gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM"
 gdb_continue_to_end "continue to sigall exit"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index 60b5891c624..6c41739348f 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -270,5 +270,3 @@ The program being debugged stopped while in a function called from GDB.*" \
 	"#0  handler .*#1  .signal handler called.*\#2 .*main.*" \
 	"backtrace for SIGUSR1"
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp
index e3052cbc6ae..fb4ef85221e 100644
--- a/gdb/testsuite/gdb.base/so-impl-ld.exp
+++ b/gdb/testsuite/gdb.base/so-impl-ld.exp
@@ -62,10 +62,3 @@ gdb_test "next" "${decimal}\[ \t\]*return ans;.* STEP .*" "step in solib call"
 gdb_step_until ".*main .. at.*return 0;.*" "step out of solib call"
 
 gdb_exit
-return 0
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
index dfc32c66e96..302981a64ad 100644
--- a/gdb/testsuite/gdb.base/solib-symbol.exp
+++ b/gdb/testsuite/gdb.base/solib-symbol.exp
@@ -65,7 +65,3 @@ gdb_test "br foo2" \
 	 "foo2 in mdlib"
 
 gdb_exit
-
-return 0
-
-
diff --git a/gdb/testsuite/gdb.base/step-break.exp b/gdb/testsuite/gdb.base/step-break.exp
index 9920e7ac5f5..ea1f8f6cd57 100644
--- a/gdb/testsuite/gdb.base/step-break.exp
+++ b/gdb/testsuite/gdb.base/step-break.exp
@@ -40,5 +40,3 @@ gdb_test "next 2" ".*place2.*" "next 2 (3)"
 gdb_test "next 2" ".*place3.*" "next 2 (4)"
 gdb_test "next 2" ".*place2.*" "next 2 (5)"
 gdb_test "next 2" ".*place3.*" "next 2 (6)"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp
index 6cd9115744d..89b5bd1e1eb 100644
--- a/gdb/testsuite/gdb.base/step-line.exp
+++ b/gdb/testsuite/gdb.base/step-line.exp
@@ -79,5 +79,3 @@ gdb_test "next" \
 gdb_test "next" \
          ".*RETURN \\(j\\);.*" \
 	 "next over dummy 10"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp
index 6d2a5603396..faf172043fd 100644
--- a/gdb/testsuite/gdb.base/step-test.exp
+++ b/gdb/testsuite/gdb.base/step-test.exp
@@ -202,5 +202,3 @@ gdb_test_multiple "step" "$test" {
 }
 
 gdb_continue_to_end
-
-return 0
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 31b58cf8bdf..0a1920501c4 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -603,4 +603,3 @@ if { $allow_float_test } {
     # Approx size: (4+4)+8=16, 32, ...
     test { tf td } {2} {2}
 }
-return 0
diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp
index d5849256f53..4ddf4d3b8a3 100644
--- a/gdb/testsuite/gdb.base/twice.exp
+++ b/gdb/testsuite/gdb.base/twice.exp
@@ -48,4 +48,3 @@ if {[runto_main]} {
     gdb_test "step" "nothing \\(\\) at.*"
 }
 remote_exec build "rm -f twice.c" 
-return 0
diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp
index 8470634e502..d10d1fe244d 100644
--- a/gdb/testsuite/gdb.base/unwindonsignal.exp
+++ b/gdb/testsuite/gdb.base/unwindonsignal.exp
@@ -71,5 +71,3 @@ gdb_test_multiple "maint print dummy-frames" \
 	pass "unwindonsignal, dummy frame removed"
     }
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp
index f8ddd3046f4..7a40d0de32b 100644
--- a/gdb/testsuite/gdb.base/whatis-exp.exp
+++ b/gdb/testsuite/gdb.base/whatis-exp.exp
@@ -69,4 +69,3 @@ gdb_test "whatis x++" "type = int" "whatis value of  x++"
 gdb_test "whatis x--" "type = int" "whatis value of  x--"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/anon-ns.exp b/gdb/testsuite/gdb.cp/anon-ns.exp
index 35bef8d8267..68a49617e44 100644
--- a/gdb/testsuite/gdb.cp/anon-ns.exp
+++ b/gdb/testsuite/gdb.cp/anon-ns.exp
@@ -68,4 +68,3 @@ gdb_test "ptype '(anonymous namespace)'" \
     "type = namespace \\\(anonymous namespace\\\)"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/breakpoint.exp b/gdb/testsuite/gdb.cp/breakpoint.exp
index 7a244c7bdf8..ec03277801d 100644
--- a/gdb/testsuite/gdb.cp/breakpoint.exp
+++ b/gdb/testsuite/gdb.cp/breakpoint.exp
@@ -53,4 +53,3 @@ gdb_test "print i_" "\\\$2 = 3" "check the member variable from within C1::bar"
 
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp
index c5cb7af8366..274b315905c 100644
--- a/gdb/testsuite/gdb.cp/m-data.exp
+++ b/gdb/testsuite/gdb.cp/m-data.exp
@@ -96,4 +96,3 @@ gdb_test "print shadow" "\\$\[0-9]\* = 1" "shadowing member"
 gdb_test "print ::shadow" "\\$\[0-9]\* = 0" "shadowed global variable"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
index c57aee10160..56c4cdad95e 100644
--- a/gdb/testsuite/gdb.cp/m-static.exp
+++ b/gdb/testsuite/gdb.cp/m-static.exp
@@ -194,4 +194,3 @@ gdb_test "step" "gnu_obj_1::method.*"
 gdb_test "print svar" " = true"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/maint.exp b/gdb/testsuite/gdb.cp/maint.exp
index d5319f43f61..59dccfbb3bd 100644
--- a/gdb/testsuite/gdb.cp/maint.exp
+++ b/gdb/testsuite/gdb.cp/maint.exp
@@ -118,4 +118,3 @@ test_first_component
 test_namespace
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/meth-typedefs.exp b/gdb/testsuite/gdb.cp/meth-typedefs.exp
index b484545d93e..27e76f53be6 100644
--- a/gdb/testsuite/gdb.cp/meth-typedefs.exp
+++ b/gdb/testsuite/gdb.cp/meth-typedefs.exp
@@ -187,4 +187,3 @@ foreach f [list "$func" "'$func'"] {
 }
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp
index 122ff26b760..31a8abf7793 100644
--- a/gdb/testsuite/gdb.cp/ovsrch.exp
+++ b/gdb/testsuite/gdb.cp/ovsrch.exp
@@ -91,4 +91,3 @@ gdb_continue_to_breakpoint "stop_here_too"
 test_class A::B::inner
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp
index 6eeab8efff7..dfc406000d7 100644
--- a/gdb/testsuite/gdb.cp/pr-1023.exp
+++ b/gdb/testsuite/gdb.cp/pr-1023.exp
@@ -50,4 +50,3 @@ gdb_test \
   "Breakpoint $decimal at $hex: file .*$srcfile, line 10.*"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp
index 30b9bd1eee6..f639e4eba92 100644
--- a/gdb/testsuite/gdb.cp/pr-1210.exp
+++ b/gdb/testsuite/gdb.cp/pr-1210.exp
@@ -54,4 +54,3 @@ gdb_test_multiple "print obj->myB" "print obj->myB" {
 }
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp
index 4854ba20a1b..762d32168a6 100644
--- a/gdb/testsuite/gdb.cp/pr-574.exp
+++ b/gdb/testsuite/gdb.cp/pr-574.exp
@@ -55,4 +55,3 @@ gdb_continue_to_breakpoint "end of constructors"
 gdb_test "print *theB" "\\$\[0-9\]* = {<A> = {\[^}\]*}, static b = <optimized out>}" "PR gdb/574"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp
index 6432ca32896..b860fb7c3ae 100644
--- a/gdb/testsuite/gdb.cp/pr10728.exp
+++ b/gdb/testsuite/gdb.cp/pr10728.exp
@@ -54,6 +54,3 @@ gdb_continue_to_breakpoint "marker 1"
 gdb_test "print x->y2 - x->y1" "warning: Type size unknown, assuming 1\. Try casting to a known type, or void \*\.\[^=\]*= 1"
 
 gdb_exit
-return 0
-
-
diff --git a/gdb/testsuite/gdb.cp/pr9067.exp b/gdb/testsuite/gdb.cp/pr9067.exp
index 388cf00a478..bd430f595a7 100644
--- a/gdb/testsuite/gdb.cp/pr9067.exp
+++ b/gdb/testsuite/gdb.cp/pr9067.exp
@@ -33,5 +33,3 @@ gdb_test "print b"  ".*same as static member.*"
 
 
 gdb_exit
-return 0
-
diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp
index 4ab8b60ffe3..7a0150b5841 100644
--- a/gdb/testsuite/gdb.cp/printmethod.exp
+++ b/gdb/testsuite/gdb.cp/printmethod.exp
@@ -50,4 +50,3 @@ gdb_test "print theA->nonvirt" \
     "print nonvirtual method."
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/punctuator.exp b/gdb/testsuite/gdb.cp/punctuator.exp
index d1d7ab1be19..d853e7cecaf 100644
--- a/gdb/testsuite/gdb.cp/punctuator.exp
+++ b/gdb/testsuite/gdb.cp/punctuator.exp
@@ -45,4 +45,3 @@ gdb_test_no_output "set \$v = 0x5a5a" "set \$v 3"
 gdb_test "print (\$u xor_eq 0xaaaa) == (\$v ^= 0xaaaa)" "= true"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp
index a6944b4f919..8ad7683ee40 100644
--- a/gdb/testsuite/gdb.cp/rtti.exp
+++ b/gdb/testsuite/gdb.cp/rtti.exp
@@ -112,4 +112,3 @@ gdb_continue_to_breakpoint "end of constructors in func3"
 gdb_test "print *obj3" "\\$\[0-9\]* = {<n2::C2> = .*}"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/static-method.exp b/gdb/testsuite/gdb.cp/static-method.exp
index 775867579dc..b9e83b37e2e 100644
--- a/gdb/testsuite/gdb.cp/static-method.exp
+++ b/gdb/testsuite/gdb.cp/static-method.exp
@@ -110,4 +110,3 @@ foreach test $methods {
 }
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp
index 58ab88220e4..9c74fad98a0 100644
--- a/gdb/testsuite/gdb.cp/try_catch.exp
+++ b/gdb/testsuite/gdb.cp/try_catch.exp
@@ -63,4 +63,3 @@ gdb_continue_to_breakpoint "marker test-complete"
 gdb_test "p test" "= true"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
index 9b5a6f11f96..f04a441c54d 100644
--- a/gdb/testsuite/gdb.cp/userdef.exp
+++ b/gdb/testsuite/gdb.cp/userdef.exp
@@ -133,4 +133,3 @@ gdb_test "print operator== (mem1, mem2)" " = false"
 gdb_test "print operator== (mem1, mem1)" " = true"
 
 gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/virtfunc2.exp b/gdb/testsuite/gdb.cp/virtfunc2.exp
index a7b96ae40bf..b02f3d645c3 100644
--- a/gdb/testsuite/gdb.cp/virtfunc2.exp
+++ b/gdb/testsuite/gdb.cp/virtfunc2.exp
@@ -47,5 +47,3 @@ gdb_test "print o2.do_print3()"  "\\$\[0-9\]+ = 111111"
 gdb_test "print o" " = {<interface> = {.*_vptr.interface = $hex <vtable for Obj.*>}, <No data fields>}"
 
 gdb_exit
-return 0
-
diff --git a/gdb/testsuite/gdb.mi/gdb2549.exp b/gdb/testsuite/gdb.mi/gdb2549.exp
index 4d91bc35406..b9611c531cb 100644
--- a/gdb/testsuite/gdb.mi/gdb2549.exp
+++ b/gdb/testsuite/gdb.mi/gdb2549.exp
@@ -103,4 +103,3 @@ mi_runto_main
 register_tests
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/gdb680.exp b/gdb/testsuite/gdb.mi/gdb680.exp
index cf968b94e46..fb9d865f6f4 100644
--- a/gdb/testsuite/gdb.mi/gdb680.exp
+++ b/gdb/testsuite/gdb.mi/gdb680.exp
@@ -49,4 +49,3 @@ for {set i 0} {$i < 4} {incr i} {
 do_test $i
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
index d5ed24e2106..5a90bf505c5 100644
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ b/gdb/testsuite/gdb.mi/gdb701.exp
@@ -54,4 +54,3 @@ foreach i [list x y z] {
 }
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index 2001f11b6fa..5805fb1c1db 100644
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -78,4 +78,3 @@ mi_list_varobj_children "var2" {
 } "list children of class C"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-async.exp
index 5ca7c5dccc3..f970fc772ca 100644
--- a/gdb/testsuite/gdb.mi/mi-async.exp
+++ b/gdb/testsuite/gdb.mi/mi-async.exp
@@ -82,5 +82,3 @@ linux_async_tests
 mi_gdb_exit
 
 set GDBFLAGS $saved_gdbflags
-
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
index 3a40e58f5a8..086ce74eae5 100644
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi-basics.exp
@@ -270,4 +270,3 @@ if { [test_mi_interpreter_selection]
 }
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index 408fb0ff535..04b3096d2ed 100644
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -255,4 +255,3 @@ mi_gdb_test "888-interpreter-exec console \"set \$pc=0x0\"" \
   "-interpreter-exec console \"\""
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
index 552d7cd6cb1..7de92b7786f 100644
--- a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp
@@ -117,5 +117,3 @@ proc test_command_param_changed { } {
 }
 
 test_command_param_changed
-
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index 5fc8e1d2c2f..738960739f7 100644
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -96,4 +96,3 @@ mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" $line "" \
     "finished step over hello"
     
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
index 0b4f4bcc219..2cd7df73acf 100644
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp
@@ -357,4 +357,3 @@ test_disassembly_mixed_lines_limit
 test_disassembly_opcode_format
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp
index a446539bffe..1611b15c8f2 100644
--- a/gdb/testsuite/gdb.mi/mi-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi-eval.exp
@@ -58,4 +58,3 @@ mi_gdb_test "511-data-evaluate-expression \"A + 3\"" "511\\^done,value=\"4\"" "e
 
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.exp b/gdb/testsuite/gdb.mi/mi-exit-code.exp
index 366132c98e0..d98839e67d7 100644
--- a/gdb/testsuite/gdb.mi/mi-exit-code.exp
+++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp
@@ -85,4 +85,3 @@ proc test_list_thread_groups { } {
 test_list_thread_groups
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp
index 3d43868d9f4..811744e556f 100644
--- a/gdb/testsuite/gdb.mi/mi-file.exp
+++ b/gdb/testsuite/gdb.mi/mi-file.exp
@@ -76,4 +76,3 @@ test_file_list_exec_source_file
 test_file_list_exec_source_files
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-hack-cli.exp b/gdb/testsuite/gdb.mi/mi-hack-cli.exp
index 5d575f50e6d..3013d87462a 100644
--- a/gdb/testsuite/gdb.mi/mi-hack-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-hack-cli.exp
@@ -33,4 +33,3 @@ mi_gdb_test "47show architecture" \
 	"47show architecture"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
index a0976c071a7..d3523b07d00 100644
--- a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
+++ b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
@@ -63,4 +63,3 @@ mi_gdb_test "-data-evaluate-expression \"$path\"" \
     "-data-evaluate-expression $path"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-memory-changed.exp b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
index b992c3e4bbe..846415d6267 100644
--- a/gdb/testsuite/gdb.mi/mi-memory-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-memory-changed.exp
@@ -79,4 +79,3 @@ regsub ^0x0* $main_addr "" main_addr
 mi_gdb_test "set var *(unsigned int *) 0x${main_addr} = ${main_insn}" \
     ".*=memory-changed,thread-group=\"i${decimal}\".addr=\"0x0*${main_addr}\",len=\"0x4\",type=\"code\".*\\^done"
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.exp b/gdb/testsuite/gdb.mi/mi-read-memory.exp
index 77dec2c1888..0871f2f47ea 100644
--- a/gdb/testsuite/gdb.mi/mi-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi-read-memory.exp
@@ -65,4 +65,3 @@ mi_gdb_test "6-data-read-memory shorts+64 o 2 1 1" \
 
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-record-changed.exp b/gdb/testsuite/gdb.mi/mi-record-changed.exp
index c5fb6355a6c..427023a107d 100644
--- a/gdb/testsuite/gdb.mi/mi-record-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-record-changed.exp
@@ -37,5 +37,3 @@ mi_gdb_test "record stop" \
 mi_gdb_test "target record" \
     ".*=record-started,thread-group=\"i${decimal}\",method=\"full\".*\\^done" \
     "target record"
-
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp
index bda27d086d9..afc52c7a4c1 100644
--- a/gdb/testsuite/gdb.mi/mi-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi-regs.exp
@@ -113,4 +113,3 @@ mi_runto_main
 sparc_register_tests
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
index cffb11c8e9a..6254711bdec 100644
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -62,4 +62,3 @@ mi_gdb_test "205-break-delete" \
 test_return_simple
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-reverse.exp b/gdb/testsuite/gdb.mi/mi-reverse.exp
index 020b6feb448..baa53a495d7 100644
--- a/gdb/testsuite/gdb.mi/mi-reverse.exp
+++ b/gdb/testsuite/gdb.mi/mi-reverse.exp
@@ -165,4 +165,3 @@ proc test_controlled_execution_reverse {} {
 test_controlled_execution_reverse
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index 829136b7cd0..99b729d5df3 100644
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -187,4 +187,3 @@ test_controlling_breakpoints
 test_program_termination
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
index f0424fc0c88..3359a877a6a 100644
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi-stack.exp
@@ -208,4 +208,3 @@ test_stack_info_depth
 
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp
index 17a73233a76..9fe8ada58f4 100644
--- a/gdb/testsuite/gdb.mi/mi-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepi.exp
@@ -68,4 +68,3 @@ mi_runto_main
 test_stepi_nexti
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
index 409fac623a7..5b3e60f4f34 100644
--- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
@@ -103,5 +103,3 @@ mi_gdb_test "410-data-evaluate-expression bar()" \
 mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"}.*\\\]" "backtrace from inferior function at exception"
 
 mi_gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
index d6e757df829..be87d2c5474 100644
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ b/gdb/testsuite/gdb.mi/mi-until.exp
@@ -81,4 +81,3 @@ test_running_to_foo
 test_until
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
index 2a8590d6574..3638dfd7ed5 100644
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-block.exp
@@ -175,4 +175,3 @@ mi_gdb_test "-var-delete cb" \
 	"delete var cb"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index 811398d811e..e64bde94959 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -1211,4 +1211,3 @@ if { [mi_run_inline_test child_deletion] < 0 } {
 
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 432177ed603..9bd1f7cd1a8 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -688,4 +688,3 @@ mi_gdb_test "-var-update L" \
     "in-and-out-of-scope: in scope now, not changed"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-cp.exp b/gdb/testsuite/gdb.mi/mi-var-cp.exp
index fa28e58f801..3ce48db6c2b 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cp.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cp.exp
@@ -123,4 +123,3 @@ proc verify_everything {variable_name} {
 mi_walk_varobj_tree c++ $tree verify_everything
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index 7c23aa91404..b889d197051 100644
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -661,4 +661,3 @@ if { [info exists fp] } {
 
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
index 3ee35306d96..dfaff33b9a2 100644
--- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
@@ -122,4 +122,3 @@ mi_gdb_test "-var-info-type global_simple" \
 	"no type for invalid variable global_simple"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
index c724078a5cb..fb8e4923f82 100644
--- a/gdb/testsuite/gdb.mi/mi-var-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
@@ -126,4 +126,3 @@ foreach_with_prefix inline_test $inline_tests {
 }
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-vla-c99.exp b/gdb/testsuite/gdb.mi/mi-vla-c99.exp
index 48595fee4db..ddfe6076213 100644
--- a/gdb/testsuite/gdb.mi/mi-vla-c99.exp
+++ b/gdb/testsuite/gdb.mi/mi-vla-c99.exp
@@ -80,4 +80,3 @@ mi_list_array_varobj_children "vla" "5" "int" \
     "get children of vla"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
index 9020f89e117..a240fb36d61 100644
--- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
+++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp
@@ -209,4 +209,3 @@ mi_gdb_test "600-data-evaluate-expression pvla2" \
   "600\\^done,value=\"<not associated>\"" "evaluate vla pointer set to null"
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp
index 9b7fd10b4ef..47cfeb860e3 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp
@@ -1321,4 +1321,3 @@ set tree "
 mi_walk_varobj_tree c $tree verify_everything
 
 mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
index 9ab1ef18559..3fe77b2f7de 100644
--- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
+++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
@@ -76,5 +76,3 @@ gdb_test "inferior 1"
 # Now run to the breakpoint.  This should cross the exec, and stop at
 # the breakpoint before the crash.
 gdb_test "run" "${srcfile2}:${bp_location}.*set breakpoint here.*"
-
-return 0
diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.python/py-prompt.exp
index b5628933e0f..35e8144d3f9 100644
--- a/gdb/testsuite/gdb.python/py-prompt.exp
+++ b/gdb/testsuite/gdb.python/py-prompt.exp
@@ -116,4 +116,3 @@ with_test_prefix "sync_execution = 1, is_running = 0" {
 
 set GDBFLAGS $saved_gdbflags
 kill_wait_spawned_process $test_spawn_id
-return 0
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 70355b40734..f89595b0789 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -311,5 +311,3 @@ gdb_expect 60 {
 }
 
 do_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
index 25d63b37090..a3080c054af 100644
--- a/gdb/testsuite/gdb.threads/attach-stopped.exp
+++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
@@ -96,5 +96,3 @@ if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" execut
 }
 
 corefunc threaded
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
index 1309ef82bc6..336199112b0 100644
--- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -159,5 +159,3 @@ gdb_test "show scheduler-locking" ".* locking scheduler .* is \"off\"." "show sc
 #gdb_test "thread 1" ".*" "set thread to 1, prepare to resume"
 #
 #gdb_continue_to_end "hand-call-in-threads"
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
index 478e29722b3..ed1ea9fe64d 100644
--- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
+++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
@@ -76,5 +76,3 @@ gdb_test_multiple "maint print dummy-frames" "dummy frame popped" {
 # Continue one last time, the program should exit normally.
 
 gdb_continue_to_end "" continue 1
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
index 49a0535bfc5..c0913025e87 100644
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -108,5 +108,3 @@ gdb_breakpoint "kill"
 set timeout [expr $oldtimeout + 120]
 test_all_threads "slow with kill breakpoint" 1
 set timeout $oldtimeout
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp
index 3c3055e5dbc..9ba98ec6290 100644
--- a/gdb/testsuite/gdb.threads/thread-specific.exp
+++ b/gdb/testsuite/gdb.threads/thread-specific.exp
@@ -128,5 +128,3 @@ if { $this_thread != -1 } {
 } else {
     untested "thread var at break"
 }
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
index 0b08723fffa..b3e3288ba69 100644
--- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
+++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
@@ -100,5 +100,3 @@ gdb_test_multiple "maint print dummy-frames" "dummy frame popped" {
 # Continue one last time, the program should exit normally.
 
 gdb_continue_to_end "" continue 1
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/threxit-hop-specific.exp b/gdb/testsuite/gdb.threads/threxit-hop-specific.exp
index 0b7bd257234..24055db0b8c 100644
--- a/gdb/testsuite/gdb.threads/threxit-hop-specific.exp
+++ b/gdb/testsuite/gdb.threads/threxit-hop-specific.exp
@@ -47,5 +47,3 @@ gdb_breakpoint "$bpexitline"
 gdb_test "continue" \
     ".*set exit breakpoint here.*" \
     "get past the thread specific breakpoint"
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/tls-nodebug.exp b/gdb/testsuite/gdb.threads/tls-nodebug.exp
index 3dcf5f4a1d1..41a2f2719d8 100644
--- a/gdb/testsuite/gdb.threads/tls-nodebug.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug.exp
@@ -40,5 +40,3 @@ gdb_test "p (int) thread_local" "= 42" \
 # Done!
 #
 gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 99e9951f1f6..89f6fb89bac 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -321,5 +321,3 @@ gdb_test "info address a_thread_local" "Symbol \"a_thread_local\" is a thread-lo
 # Done!
 #
 gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp
index 0c1542f82c8..54d9918888a 100644
--- a/gdb/testsuite/gdb.trace/actions-changed.exp
+++ b/gdb/testsuite/gdb.trace/actions-changed.exp
@@ -171,5 +171,3 @@ if ![gdb_target_supports_trace] {
 }
 
 test_actions_changed
-
-return 0
diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
index 9d736a4ae01..e6ca7faa9d2 100644
--- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
@@ -152,5 +152,3 @@ proc test_tfind_remote { } {
 }
 
 test_tfind_remote
-
-return 0
diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index cdd28cb6f96..6dc5e38d1b2 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -258,5 +258,3 @@ gdb_exit
 test_reconnect
 
 test_pending_resolved
-
-return 0
diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index 57bedd686f6..ea7fcf31a30 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -245,5 +245,3 @@ if ![gdb_target_supports_trace] {
 gdb_exit
 
 test_upload_tsv
-
-return 0