From: Bruno Larsen Date: Fri, 13 May 2022 16:23:57 +0000 (-0300) Subject: gdb/testsuite: fix "continue outside of loop" TCL errors X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cdd4206647d0ef8d54d0fa66b3dfa57a4ec07db9;p=binutils-gdb.git gdb/testsuite: fix "continue outside of loop" TCL errors Many test cases had a few lines in the beginning that look like: if { condition } { continue } Where conditions varied, but were mostly in the form of ![runto_main] or [skip_*_tests], making it quite clear that this code block was supposed to finish the test if it entered the code block. This generates TCL errors, as most of these tests are not inside loops. All cases on which this was an obvious mistake are changed in this patch. --- diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp index 5d6785e2eb0..4de08dc6592 100644 --- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp +++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp @@ -59,7 +59,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } mi_delete_breakpoints diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp index 79ce41d3332..4713fda62fd 100644 --- a/gdb/testsuite/gdb.ada/mi_task_arg.exp +++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp @@ -28,7 +28,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } mi_delete_breakpoints diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp index f44a8b5af3f..2a2a91d537e 100644 --- a/gdb/testsuite/gdb.ada/mi_task_info.exp +++ b/gdb/testsuite/gdb.ada/mi_task_info.exp @@ -28,7 +28,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } mi_delete_breakpoints diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp index fe6f76b1bed..5d493e6d6fc 100644 --- a/gdb/testsuite/gdb.base/all-bin.exp +++ b/gdb/testsuite/gdb.base/all-bin.exp @@ -43,7 +43,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "next" "return 0;" "continuing after dummy()" diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp index 5feea05810b..b6009a36235 100644 --- a/gdb/testsuite/gdb.base/arithmet.exp +++ b/gdb/testsuite/gdb.base/arithmet.exp @@ -39,7 +39,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp index c904a777f8a..7df03346045 100644 --- a/gdb/testsuite/gdb.base/arrayidx.exp +++ b/gdb/testsuite/gdb.base/arrayidx.exp @@ -28,7 +28,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # First, print the array without the indexes diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp index c78868ac8ef..a0dd46d7bb2 100644 --- a/gdb/testsuite/gdb.base/assign.exp +++ b/gdb/testsuite/gdb.base/assign.exp @@ -42,7 +42,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "next" "return 0;" "continuing after dummy()" diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp index bdf1a263212..83e56e71580 100644 --- a/gdb/testsuite/gdb.base/async.exp +++ b/gdb/testsuite/gdb.base/async.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "break baz" ".*" "" diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp index 3bbbbf826a5..a97a69c0a0b 100644 --- a/gdb/testsuite/gdb.base/attach-pie-misread.exp +++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp @@ -16,7 +16,7 @@ # This test only works on GNU/Linux. if { ![isnative] || [is_remote host] || [use_gdb_stub] || ![istarget *-linux*] || [skip_shlib_tests]} { - continue + return } load_lib prelink-support.exp diff --git a/gdb/testsuite/gdb.base/bfp-test.exp b/gdb/testsuite/gdb.base/bfp-test.exp index 40ace16258b..07282595b44 100644 --- a/gdb/testsuite/gdb.base/bfp-test.exp +++ b/gdb/testsuite/gdb.base/bfp-test.exp @@ -27,7 +27,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Run to the breakpoint at return. diff --git a/gdb/testsuite/gdb.base/bitshift.exp b/gdb/testsuite/gdb.base/bitshift.exp index 03f18b9ebe5..118a36e968e 100644 --- a/gdb/testsuite/gdb.base/bitshift.exp +++ b/gdb/testsuite/gdb.base/bitshift.exp @@ -180,7 +180,7 @@ proc test_shifts {} { "unknown" "ada" "modula-2" "pascal" "fortran" } if {[lsearch -exact $skip_langs $lang] >= 0} { - continue + return } gdb_test_no_output "set language $lang" diff --git a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp index 0dd2686b2ef..33f8cc1786f 100644 --- a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp +++ b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp @@ -21,7 +21,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping because of nosignals." - continue + return } # This test requires sending ^C to interrupt the running target. diff --git a/gdb/testsuite/gdb.base/branch-to-self.exp b/gdb/testsuite/gdb.base/branch-to-self.exp index a0521e38e79..25934784f17 100644 --- a/gdb/testsuite/gdb.base/branch-to-self.exp +++ b/gdb/testsuite/gdb.base/branch-to-self.exp @@ -17,7 +17,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping branch-to-self.exp because of nosignals." - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index be1a212ec72..f6533e99ac8 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -16,7 +16,7 @@ # This test only works on GNU/Linux. if { ![isnative] || [is_remote host] || [use_gdb_stub] || ![istarget *-linux*] || [skip_shlib_tests]} { - continue + return } load_lib prelink-support.exp diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp index d1fb3ac9ec1..239cfa4c518 100644 --- a/gdb/testsuite/gdb.base/call-ar-st.exp +++ b/gdb/testsuite/gdb.base/call-ar-st.exp @@ -23,7 +23,7 @@ standard_testfile # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } # Create and source the file that provides information about the compiler @@ -50,7 +50,7 @@ gdb_test_no_output "set width 0" if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } get_debug_format diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp index 5d380db4a8f..fee192d7d02 100644 --- a/gdb/testsuite/gdb.base/call-rt-st.exp +++ b/gdb/testsuite/gdb.base/call-rt-st.exp @@ -41,7 +41,7 @@ if [get_compiler_info] { # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } set skip_float_test [gdb_skip_float_test] @@ -56,7 +56,7 @@ gdb_test_no_output "set width 0" if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp index 701056e7a1e..af9495fe94f 100644 --- a/gdb/testsuite/gdb.base/call-sc.exp +++ b/gdb/testsuite/gdb.base/call-sc.exp @@ -24,7 +24,7 @@ if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } standard_testfile .c diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp index 5b3f10504a2..31e675c960c 100644 --- a/gdb/testsuite/gdb.base/call-signal-resume.exp +++ b/gdb/testsuite/gdb.base/call-signal-resume.exp @@ -22,7 +22,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping call-signal-resume.exp because of nosignals." - continue + return } @@ -37,7 +37,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } proc get_dummy_frame_number { } { diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp index 61ff7ab3619..58cb3cda38d 100644 --- a/gdb/testsuite/gdb.base/call-strs.exp +++ b/gdb/testsuite/gdb.base/call-strs.exp @@ -29,7 +29,7 @@ standard_testfile # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } @@ -44,7 +44,7 @@ gdb_test_no_output "set width 0" if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } set prev_timeout $timeout diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp index 9d1a0839ba1..b9b0498a1bb 100644 --- a/gdb/testsuite/gdb.base/callexit.exp +++ b/gdb/testsuite/gdb.base/callexit.exp @@ -25,7 +25,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } # Start with a fresh gdb. diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index 2752cdb5a8e..4448cc127ba 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -27,7 +27,7 @@ if [support_complex_tests] { # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } set skip_float_test [gdb_skip_float_test] diff --git a/gdb/testsuite/gdb.base/cast-call.exp b/gdb/testsuite/gdb.base/cast-call.exp index d3d99880902..0f878657dcb 100644 --- a/gdb/testsuite/gdb.base/cast-call.exp +++ b/gdb/testsuite/gdb.base/cast-call.exp @@ -18,7 +18,7 @@ if {[target_info exists gdb,cannot_call_functions]} { unsupported "this target can not call functions" - continue + return } standard_testfile .c diff --git a/gdb/testsuite/gdb.base/catch-fork-static.exp b/gdb/testsuite/gdb.base/catch-fork-static.exp index 82336b64944..51031a84fbd 100644 --- a/gdb/testsuite/gdb.base/catch-fork-static.exp +++ b/gdb/testsuite/gdb.base/catch-fork-static.exp @@ -24,7 +24,7 @@ # Until "catch fork" is implemented on other targets... # if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then { - continue + return } # Reusing foll-fork.c since it's a simple forking program. diff --git a/gdb/testsuite/gdb.base/catch-signal-fork.exp b/gdb/testsuite/gdb.base/catch-signal-fork.exp index 9a2da7ad21f..05229377fda 100644 --- a/gdb/testsuite/gdb.base/catch-signal-fork.exp +++ b/gdb/testsuite/gdb.base/catch-signal-fork.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping catch-signal-fork.exp because of nosignals." - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp index 8c73fdbc085..d910c043f36 100644 --- a/gdb/testsuite/gdb.base/catch-signal.exp +++ b/gdb/testsuite/gdb.base/catch-signal.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping catch-signal.exp because of nosignals." - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index 97d15cf7008..edb1c422c0e 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -17,13 +17,13 @@ # other targets... # if {![istarget "*-*-linux*"]} then { - continue + return } # Checkpoint support is currently implemented in the Linux native # target, so only works with "target native". if { [target_info gdb_protocol] != "" } { - continue + return } # Must name the source file explicitly, otherwise when driven by diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp index d383d3b4458..f0c4c328594 100644 --- a/gdb/testsuite/gdb.base/cond-expr.exp +++ b/gdb/testsuite/gdb.base/cond-expr.exp @@ -44,7 +44,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "print (2 ? 3 : 4)" "\[0-9\]* = 3" \ diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp index 6850c877bcb..cd5c6f321a0 100644 --- a/gdb/testsuite/gdb.base/consecutive.exp +++ b/gdb/testsuite/gdb.base/consecutive.exp @@ -32,7 +32,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } set is_stmt [is_stmt_addresses $srcfile] diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp index 0a926bc4866..fd15743c521 100644 --- a/gdb/testsuite/gdb.base/constvars.exp +++ b/gdb/testsuite/gdb.base/constvars.exp @@ -48,7 +48,7 @@ clean_restart ${binfile} # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } get_debug_format diff --git a/gdb/testsuite/gdb.base/ctf-constvars.exp b/gdb/testsuite/gdb.base/ctf-constvars.exp index 66936d284c3..6255e9ed02b 100644 --- a/gdb/testsuite/gdb.base/ctf-constvars.exp +++ b/gdb/testsuite/gdb.base/ctf-constvars.exp @@ -43,7 +43,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # test vars and pointers diff --git a/gdb/testsuite/gdb.base/ctf-ptype.exp b/gdb/testsuite/gdb.base/ctf-ptype.exp index 6b3afb4fb11..c8d91814f0e 100644 --- a/gdb/testsuite/gdb.base/ctf-ptype.exp +++ b/gdb/testsuite/gdb.base/ctf-ptype.exp @@ -281,7 +281,7 @@ if [runto_main] then { if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } # We need to up this because this can be really slow on some boards. diff --git a/gdb/testsuite/gdb.base/dfp-test.exp b/gdb/testsuite/gdb.base/dfp-test.exp index 6c3de2863ea..30795212291 100644 --- a/gdb/testsuite/gdb.base/dfp-test.exp +++ b/gdb/testsuite/gdb.base/dfp-test.exp @@ -32,7 +32,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } set sizeof_long [get_sizeof "long" 4] diff --git a/gdb/testsuite/gdb.base/disasm-optim.exp b/gdb/testsuite/gdb.base/disasm-optim.exp index 48fd3d96202..aa7150815ff 100644 --- a/gdb/testsuite/gdb.base/disasm-optim.exp +++ b/gdb/testsuite/gdb.base/disasm-optim.exp @@ -16,7 +16,7 @@ # This test exercises disassemble /s with optimized and inlined code. if { ![is_amd64_regs_target] } { - continue + return } standard_testfile .S diff --git a/gdb/testsuite/gdb.base/enum_cond.exp b/gdb/testsuite/gdb.base/enum_cond.exp index 38296ca3526..0f03f0296d9 100644 --- a/gdb/testsuite/gdb.base/enum_cond.exp +++ b/gdb/testsuite/gdb.base/enum_cond.exp @@ -29,7 +29,7 @@ clean_restart $testfile if ![runto_main] then { perror "could not run to main" - continue + return } gdb_test "break call_me if param.e == 1" \ diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp index 932a76d3893..218aaab476c 100644 --- a/gdb/testsuite/gdb.base/eval-skip.exp +++ b/gdb/testsuite/gdb.base/eval-skip.exp @@ -48,7 +48,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test_no_output "set variable x=14" "set variable x=14" diff --git a/gdb/testsuite/gdb.base/exe-lock.exp b/gdb/testsuite/gdb.base/exe-lock.exp index 1700396bfde..19b4e1a8732 100644 --- a/gdb/testsuite/gdb.base/exe-lock.exp +++ b/gdb/testsuite/gdb.base/exe-lock.exp @@ -39,7 +39,7 @@ if { ! [file exists $binfile] } { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_continue_to_end diff --git a/gdb/testsuite/gdb.base/exitsignal.exp b/gdb/testsuite/gdb.base/exitsignal.exp index fc1267ee745..27eb6c5d263 100644 --- a/gdb/testsuite/gdb.base/exitsignal.exp +++ b/gdb/testsuite/gdb.base/exitsignal.exp @@ -23,7 +23,7 @@ if { [target_info exists gdb,nosignals] } { verbose "Skipping exitsignal.exp because of nosignals." - continue + return } standard_testfile segv.c diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp index c67647a67db..83bc60aa610 100644 --- a/gdb/testsuite/gdb.base/exprs.exp +++ b/gdb/testsuite/gdb.base/exprs.exp @@ -38,7 +38,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } proc test_expr { args } { diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp index c1f274701ce..7d0d85fccca 100644 --- a/gdb/testsuite/gdb.base/fileio.exp +++ b/gdb/testsuite/gdb.base/fileio.exp @@ -17,7 +17,7 @@ if [target_info exists gdb,nofileio] { verbose "Skipping fileio.exp because of no fileio capabilities." - continue + return } @@ -64,7 +64,7 @@ gdb_test_no_output "set width 0" if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "break stop" "Breakpoint .*$srcfile.*" diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp index c50193e5cd3..62e8346928b 100644 --- a/gdb/testsuite/gdb.base/float.exp +++ b/gdb/testsuite/gdb.base/float.exp @@ -31,7 +31,7 @@ if { [prepare_for_testing "failed to prepare" float float.c] } { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Test "info float". diff --git a/gdb/testsuite/gdb.base/float128.exp b/gdb/testsuite/gdb.base/float128.exp index 3590f88b187..5e471b39d22 100644 --- a/gdb/testsuite/gdb.base/float128.exp +++ b/gdb/testsuite/gdb.base/float128.exp @@ -34,7 +34,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Run to the breakpoint at return. diff --git a/gdb/testsuite/gdb.base/floatn.exp b/gdb/testsuite/gdb.base/floatn.exp index deb6d40e44d..1e4f94a70e0 100644 --- a/gdb/testsuite/gdb.base/floatn.exp +++ b/gdb/testsuite/gdb.base/floatn.exp @@ -34,7 +34,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Run to the breakpoint at return. diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp index 986e46ecd61..918f3e4fd5f 100644 --- a/gdb/testsuite/gdb.base/foll-exec-mode.exp +++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp @@ -30,13 +30,13 @@ # required for follow-exec-mode testing. if { [target_info exists gdb_protocol] && [target_info gdb_protocol] == "remote" } { - continue + return } # Until "catch exec" is implemented on other targets... # if {![istarget "*-linux*"]} then { - continue + return } standard_testfile foll-exec-mode.c diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp index 90fb64bf2a8..8cddfa52c3b 100644 --- a/gdb/testsuite/gdb.base/foll-exec.exp +++ b/gdb/testsuite/gdb.base/foll-exec.exp @@ -19,7 +19,7 @@ # Until "catch exec" is implemented on other targets... # if { ![istarget "*-linux*"] } then { - continue + return } standard_testfile foll-exec.c diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp index bc6083f8fcb..06390b1002b 100644 --- a/gdb/testsuite/gdb.base/gdb1250.exp +++ b/gdb/testsuite/gdb.base/gdb1250.exp @@ -32,7 +32,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb clean_restart ${binfile} if ![runto abort {allow-pending}] then { - continue + return } # See http://sources.redhat.com/gdb/bugs/1250 diff --git a/gdb/testsuite/gdb.base/gdb1821.exp b/gdb/testsuite/gdb.base/gdb1821.exp index 8e5bbedcee0..cfa95aa5c24 100644 --- a/gdb/testsuite/gdb.base/gdb1821.exp +++ b/gdb/testsuite/gdb.base/gdb1821.exp @@ -30,7 +30,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "print /x bar" "{x__0 = 0x0, y__0 = 0x0, z__1 = 0x0}" diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp index 9a9d93ab93d..a09a28a6904 100644 --- a/gdb/testsuite/gdb.base/infcall-input.exp +++ b/gdb/testsuite/gdb.base/infcall-input.exp @@ -20,7 +20,7 @@ standard_testfile if [target_info exists gdb,cannot_call_functions] { unsupported "can not call functions" - continue + return } if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp index 8b0e14b402f..28ea8df1e74 100644 --- a/gdb/testsuite/gdb.base/inferior-died.exp +++ b/gdb/testsuite/gdb.base/inferior-died.exp @@ -18,7 +18,7 @@ # if { ![istarget "*-*-linux*"] } then { unsupported "inferior-died.exp" - continue + return } if { ![support_displaced_stepping] } { diff --git a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp index c3c7916f471..bff19074269 100644 --- a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp +++ b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping interrupt-daemon-attach.exp because of nosignals." - continue + return } # This test requires sending ^C to interrupt the running target. diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp index ab3db309ead..04e5b8c6c11 100644 --- a/gdb/testsuite/gdb.base/interrupt.exp +++ b/gdb/testsuite/gdb.base/interrupt.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nointerrupts] { verbose "Skipping interrupt.exp because of nointerrupts." - continue + return } if [target_info exists gdb,noinferiorio] { diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp index fcbec9a1c2e..7450b2ae4b9 100644 --- a/gdb/testsuite/gdb.base/kill-after-signal.exp +++ b/gdb/testsuite/gdb.base/kill-after-signal.exp @@ -22,7 +22,7 @@ if { ![can_single_step_to_signal_handler] } { if [target_info exists gdb,nosignals] { verbose "Skipping kill-after-signal.exp because of nosignals." - continue + return } if [prepare_for_testing "failed to prepare" ${testfile}] { diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp index 140f4ae85d1..f594c3be110 100644 --- a/gdb/testsuite/gdb.base/logical.exp +++ b/gdb/testsuite/gdb.base/logical.exp @@ -45,7 +45,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } proc evaluate { vars ops } { diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp index 68d8cab656c..cac8cf2ce87 100644 --- a/gdb/testsuite/gdb.base/miscexprs.exp +++ b/gdb/testsuite/gdb.base/miscexprs.exp @@ -56,7 +56,7 @@ clean_restart ${binfile} # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "break marker1" ".*" "" diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp index 2517602494b..0e35fbbc422 100644 --- a/gdb/testsuite/gdb.base/multi-forks.exp +++ b/gdb/testsuite/gdb.base/multi-forks.exp @@ -17,7 +17,7 @@ # other targets... # if { ![istarget "*-*-linux*"] } then { - continue + return } diff --git a/gdb/testsuite/gdb.base/nested-subp1.exp b/gdb/testsuite/gdb.base/nested-subp1.exp index 007e0ba0bf3..dc96e97d8a3 100644 --- a/gdb/testsuite/gdb.base/nested-subp1.exp +++ b/gdb/testsuite/gdb.base/nested-subp1.exp @@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \ clean_restart "${testcase}" if ![runto_main] { perror "could not run to main" - continue + return } set bp_location [gdb_get_line_number "STOP" "${testcase}.c"] diff --git a/gdb/testsuite/gdb.base/nested-subp2.exp b/gdb/testsuite/gdb.base/nested-subp2.exp index 876b797e49d..efc8dc5c25b 100644 --- a/gdb/testsuite/gdb.base/nested-subp2.exp +++ b/gdb/testsuite/gdb.base/nested-subp2.exp @@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \ clean_restart "${testcase}" if ![runto_main] { perror "could not run to main" - continue + return } set bp_location [gdb_get_line_number "STOP" "${testcase}.c"] diff --git a/gdb/testsuite/gdb.base/nested-subp3.exp b/gdb/testsuite/gdb.base/nested-subp3.exp index dd236f07c8f..fc87631c342 100644 --- a/gdb/testsuite/gdb.base/nested-subp3.exp +++ b/gdb/testsuite/gdb.base/nested-subp3.exp @@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \ clean_restart "${testcase}" if ![runto_main] { perror "could not run to main" - continue + return } set bp_location [gdb_get_line_number "STOP" "${testcase}.c"] diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp index 81221930c83..6b61fc06a98 100644 --- a/gdb/testsuite/gdb.base/pc-fp.exp +++ b/gdb/testsuite/gdb.base/pc-fp.exp @@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } diff --git a/gdb/testsuite/gdb.base/permissions.exp b/gdb/testsuite/gdb.base/permissions.exp index d3482454fc2..233b630f0ea 100644 --- a/gdb/testsuite/gdb.base/permissions.exp +++ b/gdb/testsuite/gdb.base/permissions.exp @@ -87,7 +87,7 @@ gdb_load ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "print x = 45" "$decimal = 45" "set a global" diff --git a/gdb/testsuite/gdb.base/pie-execl.exp b/gdb/testsuite/gdb.base/pie-execl.exp index 6aea8177bd5..2364c74de96 100644 --- a/gdb/testsuite/gdb.base/pie-execl.exp +++ b/gdb/testsuite/gdb.base/pie-execl.exp @@ -20,14 +20,14 @@ global inferior_spawn_id global gdb_spawn_id if ![istarget *-linux*] { - continue + return } # In remote mode we cannot use the 'set args' command, and this # test requires it. if { [target_info exists gdb_protocol] } then { if { [target_info gdb_protocol] == "remote" } then { - continue + return } } diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp index bca8377637b..15f7879a27f 100644 --- a/gdb/testsuite/gdb.base/pointers.exp +++ b/gdb/testsuite/gdb.base/pointers.exp @@ -45,7 +45,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "next " "more_code.*;" "continuing after dummy()" diff --git a/gdb/testsuite/gdb.base/prologue.exp b/gdb/testsuite/gdb.base/prologue.exp index f9f57a185ad..8a3545299c9 100644 --- a/gdb/testsuite/gdb.base/prologue.exp +++ b/gdb/testsuite/gdb.base/prologue.exp @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .c @@ -27,7 +27,7 @@ clean_restart ${binfile} if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } proc find_breakpoint_pc { sym } { diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp index 83fcc1a777c..854acc9c457 100644 --- a/gdb/testsuite/gdb.base/ptype.exp +++ b/gdb/testsuite/gdb.base/ptype.exp @@ -591,7 +591,7 @@ if [runto_main] then { if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } # We need to up this because this can be really slow on some boards. diff --git a/gdb/testsuite/gdb.base/random-signal.exp b/gdb/testsuite/gdb.base/random-signal.exp index 70fa49c7825..1b07060c4a9 100644 --- a/gdb/testsuite/gdb.base/random-signal.exp +++ b/gdb/testsuite/gdb.base/random-signal.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping catch-signal.exp because of nosignals." - continue + return } # This test requires sending ^C to interrupt the running target. diff --git a/gdb/testsuite/gdb.base/readnever.exp b/gdb/testsuite/gdb.base/readnever.exp index 9ce3c9cf36d..3dfecdd021f 100644 --- a/gdb/testsuite/gdb.base/readnever.exp +++ b/gdb/testsuite/gdb.base/readnever.exp @@ -36,7 +36,7 @@ save_vars { GDBFLAGS } { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "break fun_three" \ diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp index f55922b0f2c..858398323cd 100644 --- a/gdb/testsuite/gdb.base/relational.exp +++ b/gdb/testsuite/gdb.base/relational.exp @@ -39,7 +39,7 @@ if [get_compiler_info] { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.base/relativedebug.exp index 4ab036f54ab..1f9c6ade959 100644 --- a/gdb/testsuite/gdb.base/relativedebug.exp +++ b/gdb/testsuite/gdb.base/relativedebug.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping relativedebug.exp because of nosignals." - continue + return } standard_testfile .c diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp index de3c6f488ed..8cd71384261 100644 --- a/gdb/testsuite/gdb.base/savedregs.exp +++ b/gdb/testsuite/gdb.base/savedregs.exp @@ -26,7 +26,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping savedregs.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp index da415d76a7f..a2997be0cb8 100644 --- a/gdb/testsuite/gdb.base/setvar.exp +++ b/gdb/testsuite/gdb.base/setvar.exp @@ -43,7 +43,7 @@ gdb_test_no_output "set print sevenbit-strings" if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Determine expected output for unsigned long variables, diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp index c9ae62caf42..f2c99c8a2a6 100644 --- a/gdb/testsuite/gdb.base/sigall.exp +++ b/gdb/testsuite/gdb.base/sigall.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping sigall.exp because of nosignals." - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp index bb78baba670..6bddc0749a9 100644 --- a/gdb/testsuite/gdb.base/sigaltstack.exp +++ b/gdb/testsuite/gdb.base/sigaltstack.exp @@ -24,7 +24,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping sigaltstack.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp index 72fa7360fb7..eb44533eacd 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -30,7 +30,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping sigbpt.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/sigchld.exp b/gdb/testsuite/gdb.base/sigchld.exp index 24a8080af72..03b5100a171 100644 --- a/gdb/testsuite/gdb.base/sigchld.exp +++ b/gdb/testsuite/gdb.base/sigchld.exp @@ -18,7 +18,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping sigchld.exp because of nosignals." - continue + return } standard_testfile .c diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp index 464c70acb06..961bc54bcb1 100644 --- a/gdb/testsuite/gdb.base/siginfo-addr.exp +++ b/gdb/testsuite/gdb.base/siginfo-addr.exp @@ -23,7 +23,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping siginfo-addr.exp because of nosignals." - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.base/siginfo-infcall.exp b/gdb/testsuite/gdb.base/siginfo-infcall.exp index 1c30650e72a..4f7caf354fa 100644 --- a/gdb/testsuite/gdb.base/siginfo-infcall.exp +++ b/gdb/testsuite/gdb.base/siginfo-infcall.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping siginfo-infcall.exp because of nosignals." - continue + return } standard_testfile .c diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp index 2d2f14c854c..221f0e9a294 100644 --- a/gdb/testsuite/gdb.base/siginfo-obj.exp +++ b/gdb/testsuite/gdb.base/siginfo-obj.exp @@ -23,7 +23,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping siginfo-obj.exp because of nosignals." - continue + return } if { ![supports_get_siginfo_type] } { diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.base/siginfo-thread.exp index 2774e4f20d3..8ced509cd5f 100644 --- a/gdb/testsuite/gdb.base/siginfo-thread.exp +++ b/gdb/testsuite/gdb.base/siginfo-thread.exp @@ -18,7 +18,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping siginfo-thread.exp because of nosignals." - continue + return } if { ![supports_get_siginfo_type] } { diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp index 9f422b7b3a4..2a1ceb89bdc 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -25,7 +25,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping siginfo.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp index 6ec4cfe8de2..11fa9d859d8 100644 --- a/gdb/testsuite/gdb.base/signals.exp +++ b/gdb/testsuite/gdb.base/signals.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping signals.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp index 2e60c8d828f..e7ce39d3669 100644 --- a/gdb/testsuite/gdb.base/signull.exp +++ b/gdb/testsuite/gdb.base/signull.exp @@ -29,7 +29,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping signull.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp index f36775a5fc8..ab1ce9beb26 100644 --- a/gdb/testsuite/gdb.base/sigrepeat.exp +++ b/gdb/testsuite/gdb.base/sigrepeat.exp @@ -21,7 +21,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping sigrepeat.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp index dd2bcc62447..58ebc46eecb 100644 --- a/gdb/testsuite/gdb.base/sigstep.exp +++ b/gdb/testsuite/gdb.base/sigstep.exp @@ -23,7 +23,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping sigstep.exp because of nosignals." - continue + return } diff --git a/gdb/testsuite/gdb.base/sigwinch-notty.exp b/gdb/testsuite/gdb.base/sigwinch-notty.exp index 510b90c722d..9e58584c3a4 100644 --- a/gdb/testsuite/gdb.base/sigwinch-notty.exp +++ b/gdb/testsuite/gdb.base/sigwinch-notty.exp @@ -19,13 +19,13 @@ if [target_info exists gdb,nosignals] { verbose "Skipping $subdir/$gdb_test_file_name.exp because of nosignals." - continue + return } # The testfile relies on "run" from the command line, so only works # with "target native". if { [target_info gdb_protocol] != "" } { - continue + return } gdb_exit diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp index a837b8f68a5..effd398ef05 100644 --- a/gdb/testsuite/gdb.base/sizeof.exp +++ b/gdb/testsuite/gdb.base/sizeof.exp @@ -35,7 +35,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp index ce2b080229e..0f2ce7e1ad8 100644 --- a/gdb/testsuite/gdb.base/skip-solib.exp +++ b/gdb/testsuite/gdb.base/skip-solib.exp @@ -22,7 +22,7 @@ # This only works on GNU/Linux. if { ![isnative] || [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { - continue + return } set test "skip-solib" diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp index 7a5dd071617..cb0e3c206a5 100644 --- a/gdb/testsuite/gdb.base/store.exp +++ b/gdb/testsuite/gdb.base/store.exp @@ -32,7 +32,7 @@ if [get_compiler_info] { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp index 09aef0ef391..e9326a6e4a5 100644 --- a/gdb/testsuite/gdb.base/structs.exp +++ b/gdb/testsuite/gdb.base/structs.exp @@ -21,7 +21,7 @@ if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } standard_testfile .c diff --git a/gdb/testsuite/gdb.base/symbol-alias.exp b/gdb/testsuite/gdb.base/symbol-alias.exp index 2b53cc31053..289f49bbc3f 100644 --- a/gdb/testsuite/gdb.base/symbol-alias.exp +++ b/gdb/testsuite/gdb.base/symbol-alias.exp @@ -21,7 +21,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfil } if ![runto_main] then { - continue + return } # Functions. diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp index 1055f20db04..63b27dd888b 100644 --- a/gdb/testsuite/gdb.base/unwindonsignal.exp +++ b/gdb/testsuite/gdb.base/unwindonsignal.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping unwindonsignal.exp because of nosignals." - continue + return } @@ -23,7 +23,7 @@ if [target_info exists gdb,nosignals] { # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp index e778af031cf..7d49acc17d3 100644 --- a/gdb/testsuite/gdb.base/varargs.exp +++ b/gdb/testsuite/gdb.base/varargs.exp @@ -64,7 +64,7 @@ if [gdb_skip_stdio_test "varargs.exp"] { if ![runto test] then { perror "couldn't run to breakpoint" - continue + return } gdb_test_stdio "print find_max1(5,1,2,3,4,5)" \ diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp index 43e039ed02b..ae5fa3f34c2 100644 --- a/gdb/testsuite/gdb.base/volatile.exp +++ b/gdb/testsuite/gdb.base/volatile.exp @@ -50,7 +50,7 @@ if [get_compiler_info] { # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } get_debug_format diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp index fd24015d1fb..655fbb8e8fa 100644 --- a/gdb/testsuite/gdb.base/whatis-exp.exp +++ b/gdb/testsuite/gdb.base/whatis-exp.exp @@ -39,7 +39,7 @@ if { [prepare_for_testing "failed to prepare" whatis-exp int-type.c {debug nowar if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp index bacb1b162a9..63871157ce1 100644 --- a/gdb/testsuite/gdb.cp/ambiguous.exp +++ b/gdb/testsuite/gdb.cp/ambiguous.exp @@ -19,7 +19,7 @@ # about the field or baseclass being ambiguous is emitted at the right # times. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -43,7 +43,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Run to a breakpoint after the variables have been initialized so we diff --git a/gdb/testsuite/gdb.cp/anon-ns.exp b/gdb/testsuite/gdb.cp/anon-ns.exp index 8c4d5e1bea9..852d9bc2c40 100644 --- a/gdb/testsuite/gdb.cp/anon-ns.exp +++ b/gdb/testsuite/gdb.cp/anon-ns.exp @@ -17,7 +17,7 @@ # This file is part of the gdb testsuite. -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } standard_testfile .cc anon-ns2.cc @@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {c++ if {![runto_main]} { perror "couldn't run to breakpoint" - continue + return } set ans {(anonymous namespace)} diff --git a/gdb/testsuite/gdb.cp/bs15503.exp b/gdb/testsuite/gdb.cp/bs15503.exp index b82eaa9e4dd..5eb3dc83e69 100644 --- a/gdb/testsuite/gdb.cp/bs15503.exp +++ b/gdb/testsuite/gdb.cp/bs15503.exp @@ -17,7 +17,7 @@ # This file was written by Sue Kimura (sue_kimura@hp.com) # Rewritten by Michael Chastain (mec.gnu@mindspring.com) -if { [skip_stl_tests] } { continue } +if { [skip_stl_tests] } { return } standard_testfile .cc @@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Set breakpoint on template function diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp index 5d0a52401a8..77ff6037fb2 100644 --- a/gdb/testsuite/gdb.cp/casts.exp +++ b/gdb/testsuite/gdb.cp/casts.exp @@ -25,7 +25,7 @@ # -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc casts03.cc @@ -39,7 +39,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Prevent symbol on address 0x0 being printed. @@ -187,7 +187,7 @@ if {[prepare_for_testing "failed to prepare" ${testfile}03 $srcfile2 \ if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Prevent symbol on address 0x0 being printed. diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp index 02f33bea599..04f665b2251 100644 --- a/gdb/testsuite/gdb.cp/class2.exp +++ b/gdb/testsuite/gdb.cp/class2.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -35,7 +35,7 @@ gdb_test_no_output "set print symbol off" if ![runto_main] then { perror "couldn't run to main" - continue + return } get_debug_format diff --git a/gdb/testsuite/gdb.cp/constexpr-field.exp b/gdb/testsuite/gdb.cp/constexpr-field.exp index 9282948dc67..b1ecf13918d 100644 --- a/gdb/testsuite/gdb.cp/constexpr-field.exp +++ b/gdb/testsuite/gdb.cp/constexpr-field.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite. -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } standard_testfile .cc @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ if {![runto_main]} { perror "couldn't run to breakpoint" - continue + return } # "x" sometimes isn't available due to diff --git a/gdb/testsuite/gdb.cp/converts.exp b/gdb/testsuite/gdb.cp/converts.exp index 74721b0438a..e4357fc924e 100644 --- a/gdb/testsuite/gdb.cp/converts.exp +++ b/gdb/testsuite/gdb.cp/converts.exp @@ -23,7 +23,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++} if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } gdb_breakpoint [gdb_get_line_number "end of main"] diff --git a/gdb/testsuite/gdb.cp/cpsizeof.exp b/gdb/testsuite/gdb.cp/cpsizeof.exp index 5163873a6b4..a27dcfcc88e 100644 --- a/gdb/testsuite/gdb.cp/cpsizeof.exp +++ b/gdb/testsuite/gdb.cp/cpsizeof.exp @@ -16,7 +16,7 @@ standard_testfile .cc -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] } { return -1 @@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] } { if {![runto_main]} { perror "could not run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "break here"] diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp index df8e7fb7cc4..1011a1408d9 100644 --- a/gdb/testsuite/gdb.cp/ctti.exp +++ b/gdb/testsuite/gdb.cp/ctti.exp @@ -21,7 +21,7 @@ # Call to template instantiations. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile cttiadd.cc cttiadd1.cc cttiadd2.cc cttiadd3.cc @@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \ if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_breakpoint [gdb_get_line_number "marker add1"] @@ -49,7 +49,7 @@ gdb_test "print i" "\\$\[0-9\]+ = 4" # TODO: this needs more work before actually deploying it. # So bail out here. -if { [ test_compiler_info gcc-*] } then { continue } +if { [ test_compiler_info gcc-*] } then { return } gdb_test_multiple "print add(2,2)" "print add(2,2)" { -re "\\$\[0-9\]+ = 4\r\n$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp index 729cd7380f7..c95fef004b5 100644 --- a/gdb/testsuite/gdb.cp/derivation.exp +++ b/gdb/testsuite/gdb.cp/derivation.exp @@ -28,7 +28,7 @@ set nl "\[\r\n\]+" # Start program. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib "cp-support.exp" @@ -57,7 +57,7 @@ with_test_prefix "before run" { if ![runto 'marker1'] then { perror "couldn't run to marker1" - continue + return } # Check inheritance of typedefs again, but this time with an active block. @@ -263,7 +263,7 @@ gdb_test "ptype N::Derived::value_type" "type = int" # Now run to N::Derived::doit and get the type of "value_type" if {![runto "N::Derived::doit"]} { perror "couldn't run to N::Derived::doit" - continue + return } gdb_test "ptype value_type" "type = int" diff --git a/gdb/testsuite/gdb.cp/disasm-func-name.exp b/gdb/testsuite/gdb.cp/disasm-func-name.exp index 06304813cbb..d1a93f7d2e7 100644 --- a/gdb/testsuite/gdb.cp/disasm-func-name.exp +++ b/gdb/testsuite/gdb.cp/disasm-func-name.exp @@ -18,7 +18,7 @@ # Test that the disassembler correctly demangles C++ function names in # it's header line. -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } standard_testfile .cc @@ -33,7 +33,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \ if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } proc check_disassembly_header { request expected } { diff --git a/gdb/testsuite/gdb.cp/dispcxx.exp b/gdb/testsuite/gdb.cp/dispcxx.exp index bf98762b8c6..df931ae1b77 100644 --- a/gdb/testsuite/gdb.cp/dispcxx.exp +++ b/gdb/testsuite/gdb.cp/dispcxx.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "Break here"] diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp index 66201720e3c..7970b8cc115 100644 --- a/gdb/testsuite/gdb.cp/exception.exp +++ b/gdb/testsuite/gdb.cp/exception.exp @@ -33,7 +33,7 @@ set ws "\[\r\n\t \]+" set nl "\[\r\n\]+" -if { [skip_stl_tests] } { continue } +if { [skip_stl_tests] } { return } standard_testfile .cc @@ -86,7 +86,7 @@ gdb_test_multiple "" "run to main" { } if { !$ok } { - continue + return } set name "info breakpoints (after inferior run)" diff --git a/gdb/testsuite/gdb.cp/filename.exp b/gdb/testsuite/gdb.cp/filename.exp index 8a627be90b3..113c84d1905 100644 --- a/gdb/testsuite/gdb.cp/filename.exp +++ b/gdb/testsuite/gdb.cp/filename.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "stop inside C"] diff --git a/gdb/testsuite/gdb.cp/fpointer.exp b/gdb/testsuite/gdb.cp/fpointer.exp index fc5a4c8b7fa..f2af2b94aca 100644 --- a/gdb/testsuite/gdb.cp/fpointer.exp +++ b/gdb/testsuite/gdb.cp/fpointer.exp @@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++} if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } # Test that function calls done through function pointers diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp index bb8434ffa51..e558f738aea 100644 --- a/gdb/testsuite/gdb.cp/gdb1355.exp +++ b/gdb/testsuite/gdb.cp/gdb1355.exp @@ -21,7 +21,7 @@ set ws "\[\r\n\t \]*" set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -39,7 +39,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to main" - continue + return } # See http://sources.redhat.com/gdb/bugs/1355 diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp index bfc99bd99c3..c0c9dfd1065 100644 --- a/gdb/testsuite/gdb.cp/gdb2495.exp +++ b/gdb/testsuite/gdb.cp/gdb2495.exp @@ -31,11 +31,11 @@ # This test is largely based of gdb.base/callfuncs.exp. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } if [target_info exists gdb,nosignals] { verbose "Skipping gdb2495.exp because of nosignals." - continue + return } standard_testfile .cc @@ -50,7 +50,7 @@ if [get_compiler_info "c++"] { # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { @@ -59,7 +59,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to main" - continue + return } # See http://sourceware.org/gdb/bugs/2495 @@ -104,7 +104,7 @@ gdb_test "p exceptions.throw_function()" \ # Restart the inferior back at main. if ![runto_main] then { perror "couldn't run to main" - continue + return } diff --git a/gdb/testsuite/gdb.cp/impl-this.exp b/gdb/testsuite/gdb.cp/impl-this.exp index a17af8baec2..2910bf7d79d 100644 --- a/gdb/testsuite/gdb.cp/impl-this.exp +++ b/gdb/testsuite/gdb.cp/impl-this.exp @@ -18,7 +18,7 @@ # Test expressions which assume an implicit "this" with a qualified # name. -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } standard_testfile .cc @@ -51,7 +51,7 @@ with_test_prefix "before run" { # Run to D::f. if {![runto_main]} { perror "couldn't run to main" - continue + return } gdb_breakpoint "D::f" diff --git a/gdb/testsuite/gdb.cp/iostream.exp b/gdb/testsuite/gdb.cp/iostream.exp index 247ca478690..5189a0dd3ed 100644 --- a/gdb/testsuite/gdb.cp/iostream.exp +++ b/gdb/testsuite/gdb.cp/iostream.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. # It tests various aspects of iostream that have caused problems for gdb. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] { perror "couldn't run to breakpoint" - continue + return } # PR 18417 diff --git a/gdb/testsuite/gdb.cp/koenig.exp b/gdb/testsuite/gdb.cp/koenig.exp index 125d46c18c4..5a846c0b8c2 100644 --- a/gdb/testsuite/gdb.cp/koenig.exp +++ b/gdb/testsuite/gdb.cp/koenig.exp @@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } # Test that koenig lookup finds correct function diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp index 7642d827cd3..cc78770d535 100644 --- a/gdb/testsuite/gdb.cp/local.exp +++ b/gdb/testsuite/gdb.cp/local.exp @@ -27,7 +27,7 @@ set nl "\[\r\n\]+" # test running programs # -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -44,12 +44,12 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } if ![runto 'marker1'] then { perror "couldn't run to marker1" - continue + return } gdb_test "up" ".*foobar.*" "up from marker1" diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp index bda83ea66dc..7dae01c7ee1 100644 --- a/gdb/testsuite/gdb.cp/m-data.exp +++ b/gdb/testsuite/gdb.cp/m-data.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # First, run to after we've constructed all the gnu_obj_N's: diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index 58aaaee7ef5..6b347e25971 100644 --- a/gdb/testsuite/gdb.cp/m-static.exp +++ b/gdb/testsuite/gdb.cp/m-static.exp @@ -19,7 +19,7 @@ # This file is part of the gdb testsuite -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -44,7 +44,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \ if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } get_debug_format diff --git a/gdb/testsuite/gdb.cp/many-args.exp b/gdb/testsuite/gdb.cp/many-args.exp index d86f4b9a5ee..aba1e78a561 100644 --- a/gdb/testsuite/gdb.cp/many-args.exp +++ b/gdb/testsuite/gdb.cp/many-args.exp @@ -19,7 +19,7 @@ # passed in registers. This test passes so many structures it is # hoped that some will need to be placed onto the stack. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] { perror "couldn't run to breakpoint" - continue + return } gdb_breakpoint [gdb_get_line_number "break-here"] diff --git a/gdb/testsuite/gdb.cp/mb-ctor.exp b/gdb/testsuite/gdb.cp/mb-ctor.exp index 66fa2ae2e23..cf22be9caa8 100644 --- a/gdb/testsuite/gdb.cp/mb-ctor.exp +++ b/gdb/testsuite/gdb.cp/mb-ctor.exp @@ -16,7 +16,7 @@ # Test that breakpoints on C++ constructors work, despite the # fact that gcc generates several versions of constructor function. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # Set a breakpoint with multiple locations diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp index 54a0efb3520..a01e62284a0 100644 --- a/gdb/testsuite/gdb.cp/member-ptr.exp +++ b/gdb/testsuite/gdb.cp/member-ptr.exp @@ -21,7 +21,7 @@ set vhn "\\$\[0-9\]+" -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_breakpoint [gdb_get_line_number "Breakpoint 1 here"] diff --git a/gdb/testsuite/gdb.cp/meth-typedefs.exp b/gdb/testsuite/gdb.cp/meth-typedefs.exp index f7c854792c8..c11e9916cb3 100644 --- a/gdb/testsuite/gdb.cp/meth-typedefs.exp +++ b/gdb/testsuite/gdb.cp/meth-typedefs.exp @@ -30,7 +30,7 @@ proc add {var name params expected {kind {func}}} { lappend result [list "${method_name}($params)" $expect] } -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } # Tests for c++/12266 et al standard_testfile .cc @@ -42,7 +42,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ if {![runto_main]} { perror "couldn't run to breakpoint" - continue + return } array set typedefs { diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp index 40d99a5d75d..615307f1c68 100644 --- a/gdb/testsuite/gdb.cp/method.exp +++ b/gdb/testsuite/gdb.cp/method.exp @@ -32,7 +32,7 @@ # test running programs # -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -49,7 +49,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "break A::foo" \ diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp index 5c151ac0973..ad0129cdc19 100644 --- a/gdb/testsuite/gdb.cp/method2.exp +++ b/gdb/testsuite/gdb.cp/method2.exp @@ -18,7 +18,7 @@ # This tests setting a break in an ambiguous c++ method with # current_language set to c. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if {![runto_main]} { perror "couldn't run to breakpoint" - continue + return } proc test_break { lang } { diff --git a/gdb/testsuite/gdb.cp/namelessclass.exp b/gdb/testsuite/gdb.cp/namelessclass.exp index 7684c17d5c1..b9f5822995c 100644 --- a/gdb/testsuite/gdb.cp/namelessclass.exp +++ b/gdb/testsuite/gdb.cp/namelessclass.exp @@ -20,7 +20,7 @@ load_lib dwarf.exp # Do not run in environments which do not support C++. if {[skip_cplus_tests]} { - continue + return } # This test can only be run on x86-like targets which support DWARF. diff --git a/gdb/testsuite/gdb.cp/namespace-nested-import.exp b/gdb/testsuite/gdb.cp/namespace-nested-import.exp index 2a97f515d4c..134276849cf 100644 --- a/gdb/testsuite/gdb.cp/namespace-nested-import.exp +++ b/gdb/testsuite/gdb.cp/namespace-nested-import.exp @@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } gdb_test "print C::x" "= 5" diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp index df5608fda94..a721ecdb0b9 100644 --- a/gdb/testsuite/gdb.cp/namespace.exp +++ b/gdb/testsuite/gdb.cp/namespace.exp @@ -25,7 +25,7 @@ -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc namespace1.cc @@ -52,12 +52,12 @@ gdb_test "show lang" "auto; currently c\\+\\+.*" # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } if ![runto 'marker1'] then { perror "couldn't run to marker1" - continue + return } gdb_test "up" ".*main.*" "up from marker1" @@ -198,7 +198,7 @@ gdb_test_multiple $test $test { if ![runto "C::D::marker2"] then { perror "couldn't run to marker2" - continue + return } gdb_test "print c" "\\$\[0-9\].* = 1" diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp index 685f3e429ff..2e6bf84fcc1 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.exp +++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp @@ -14,7 +14,7 @@ # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to main" - continue + return } if {![skip_unwinder_tests]} { diff --git a/gdb/testsuite/gdb.cp/nsalias.exp b/gdb/testsuite/gdb.cp/nsalias.exp index ff39c06b601..4daba1988c9 100644 --- a/gdb/testsuite/gdb.cp/nsalias.exp +++ b/gdb/testsuite/gdb.cp/nsalias.exp @@ -23,7 +23,7 @@ if {![dwarf2_support]} { } if {[skip_cplus_tests]} { - continue + return } standard_testfile .cc nsalias-dw.S diff --git a/gdb/testsuite/gdb.cp/nsdecl.exp b/gdb/testsuite/gdb.cp/nsdecl.exp index 07173bb465c..8f612807049 100644 --- a/gdb/testsuite/gdb.cp/nsdecl.exp +++ b/gdb/testsuite/gdb.cp/nsdecl.exp @@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/nsimport.exp b/gdb/testsuite/gdb.cp/nsimport.exp index 2272881ab16..161f5960479 100644 --- a/gdb/testsuite/gdb.cp/nsimport.exp +++ b/gdb/testsuite/gdb.cp/nsimport.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } gdb_test "print x" "\\$\[0-9\].* = 11" diff --git a/gdb/testsuite/gdb.cp/nsnested.exp b/gdb/testsuite/gdb.cp/nsnested.exp index aa33956b3e7..0ac325c0f65 100644 --- a/gdb/testsuite/gdb.cp/nsnested.exp +++ b/gdb/testsuite/gdb.cp/nsnested.exp @@ -22,7 +22,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++} ############################################ if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } gdb_test "print ab" "No symbol .* in current context." \ diff --git a/gdb/testsuite/gdb.cp/nsnoimports.exp b/gdb/testsuite/gdb.cp/nsnoimports.exp index 71434a6d99a..ec8cedbeef4 100644 --- a/gdb/testsuite/gdb.cp/nsnoimports.exp +++ b/gdb/testsuite/gdb.cp/nsnoimports.exp @@ -22,7 +22,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++} ############################################ if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } with_test_prefix "main scope" { diff --git a/gdb/testsuite/gdb.cp/nsrecurs.exp b/gdb/testsuite/gdb.cp/nsrecurs.exp index 9dbabbf5cd9..94cb069ee00 100644 --- a/gdb/testsuite/gdb.cp/nsrecurs.exp +++ b/gdb/testsuite/gdb.cp/nsrecurs.exp @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/operator.exp b/gdb/testsuite/gdb.cp/operator.exp index 4389b8e7047..7ce460f6e04 100644 --- a/gdb/testsuite/gdb.cp/operator.exp +++ b/gdb/testsuite/gdb.cp/operator.exp @@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } # Test global operator diff --git a/gdb/testsuite/gdb.cp/oranking.exp b/gdb/testsuite/gdb.cp/oranking.exp index 1a0a7e25f19..25ba55def29 100644 --- a/gdb/testsuite/gdb.cp/oranking.exp +++ b/gdb/testsuite/gdb.cp/oranking.exp @@ -23,7 +23,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++} if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } gdb_breakpoint [gdb_get_line_number "end of main"] diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp index 2fc650e215f..681edf204d3 100644 --- a/gdb/testsuite/gdb.cp/ovldbreak.exp +++ b/gdb/testsuite/gdb.cp/ovldbreak.exp @@ -28,7 +28,7 @@ set timeout 15 # test running programs # -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -40,7 +40,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { # if {![runto_main]} { perror "couldn't run to breakpoint" - continue + return } # When I ask gdb to set a breakpoint on an overloaded function, diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp index 6f8a87939a1..767d12bce1d 100644 --- a/gdb/testsuite/gdb.cp/ovsrch.exp +++ b/gdb/testsuite/gdb.cp/ovsrch.exp @@ -52,7 +52,7 @@ proc test_class {class} { gdb_test "break ${class}::hibob if (a_param == 3)" "Breakpoint (\[0-9\]).*" } -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # Test for c++/11734 standard_testfile ovsrch1.cc ovsrch2.cc ovsrch3.cc ovsrch4.cc @@ -64,7 +64,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \ if {![runto_main]} { perror "couldn't run to breakpoint" - continue + return } # Break in A::stop_here and run tests. diff --git a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp index f722eb7ae0b..97cb44f2f94 100644 --- a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp +++ b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp @@ -27,7 +27,7 @@ if {[skip_cplus_tests]} { untested "c++ test skipped" - continue + return } standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/pass-by-ref.exp b/gdb/testsuite/gdb.cp/pass-by-ref.exp index cb3e4fe8ebf..0ea5306ff7c 100644 --- a/gdb/testsuite/gdb.cp/pass-by-ref.exp +++ b/gdb/testsuite/gdb.cp/pass-by-ref.exp @@ -70,7 +70,7 @@ if {[skip_cplus_tests]} { untested "c++ test skipped" - continue + return } # The program source is generated in the output directory. diff --git a/gdb/testsuite/gdb.cp/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp index 57102280be6..f25cdb80ef2 100644 --- a/gdb/testsuite/gdb.cp/pr-1023.exp +++ b/gdb/testsuite/gdb.cp/pr-1023.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test_multiple "break myClass::performBlocking" "break myClass::performBlocking" { diff --git a/gdb/testsuite/gdb.cp/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp index e9da1ab36b6..b6604575638 100644 --- a/gdb/testsuite/gdb.cp/pr-1210.exp +++ b/gdb/testsuite/gdb.cp/pr-1210.exp @@ -17,7 +17,7 @@ # This file is part of the gdb testsuite. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -35,7 +35,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "next" ".*return 0;" "step past initialization" diff --git a/gdb/testsuite/gdb.cp/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp index 9924c7d358b..e13b6426902 100644 --- a/gdb/testsuite/gdb.cp/pr-574.exp +++ b/gdb/testsuite/gdb.cp/pr-574.exp @@ -20,7 +20,7 @@ # This file is part of the gdb testsuite -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -44,7 +44,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # First, run to after we've constructed the object: diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp index a47978845d9..3b0ecac6e8d 100644 --- a/gdb/testsuite/gdb.cp/pr10728.exp +++ b/gdb/testsuite/gdb.cp/pr10728.exp @@ -17,7 +17,7 @@ set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib "cp-support.exp" @@ -44,7 +44,7 @@ clean_restart $binfile if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # set a breakpoint at the return stmt diff --git a/gdb/testsuite/gdb.cp/pr9067.exp b/gdb/testsuite/gdb.cp/pr9067.exp index 81e56ced95f..4b601dd8f6b 100644 --- a/gdb/testsuite/gdb.cp/pr9067.exp +++ b/gdb/testsuite/gdb.cp/pr9067.exp @@ -15,7 +15,7 @@ set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib "cp-support.exp" @@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "print b" ".*same as static member.*" diff --git a/gdb/testsuite/gdb.cp/pr9631.exp b/gdb/testsuite/gdb.cp/pr9631.exp index 84645497145..0bbc49aaf41 100644 --- a/gdb/testsuite/gdb.cp/pr9631.exp +++ b/gdb/testsuite/gdb.cp/pr9631.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_breakpoint [gdb_get_line_number "set breakpoint here"] diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp index 70349d2b296..be597f51a86 100644 --- a/gdb/testsuite/gdb.cp/printmethod.exp +++ b/gdb/testsuite/gdb.cp/printmethod.exp @@ -19,7 +19,7 @@ # This file is part of the gdb testsuite -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -37,7 +37,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # First, run to after we've constructed the object: diff --git a/gdb/testsuite/gdb.cp/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp index 8611d37a234..3ca384ae391 100644 --- a/gdb/testsuite/gdb.cp/ref-types.exp +++ b/gdb/testsuite/gdb.cp/ref-types.exp @@ -20,7 +20,7 @@ # test running programs # -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -33,12 +33,12 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } if ![runto 'marker1'] then { perror "couldn't run to marker1" - continue + return } gdb_test "up" ".*main.*" "up from marker1 1" @@ -59,12 +59,12 @@ proc gdb_start_again {} { # if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } if ![runto 'marker1'] then { perror "couldn't run to marker1" - continue + return } gdb_test "up" ".*main.*" "up from marker1 2" @@ -130,7 +130,7 @@ gdb_test "print ras\[3\]" ".\[0-9\]* = 3" "print value of ras\[3\]" if ![runto 'f'] then { perror "couldn't run to f" - continue + return } gdb_test "up" ".main2.*" "up from f" diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp index 9a1e279c594..b71f44bddf2 100644 --- a/gdb/testsuite/gdb.cp/rtti.exp +++ b/gdb/testsuite/gdb.cp/rtti.exp @@ -26,7 +26,7 @@ # (involving templates, in particular) where this problem triggers # because GDB and GCC have different ideas what a class is called. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } # # test running programs @@ -45,7 +45,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \ if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # First, run to after we've constructed the object: diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp b/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp index 96a0ca18da2..80aeb078590 100644 --- a/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp +++ b/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp @@ -18,7 +18,7 @@ standard_testfile .cc -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \ {debug c++ additional_flags="-std=gnu++11"}] } { @@ -27,7 +27,7 @@ if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \ if {![runto_main]} { perror "could not run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "break here"] diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp index b4aa08f4eea..a1e107838d1 100644 --- a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp +++ b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp @@ -16,7 +16,7 @@ # Tests for reference types with short type variables in GDB, based on # gdb.cp/ref-types.exp. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -63,7 +63,7 @@ gdb_test "print rrat\[3\]" ".$decimal = 3" "print value of rrat\[3\]" if {![runto 'f']} then { perror "couldn't run to f" - continue + return } gdb_test "up" ".main2.*" "up from f" diff --git a/gdb/testsuite/gdb.cp/scope-err.exp b/gdb/testsuite/gdb.cp/scope-err.exp index 2bfb6ffc08a..4234f3f1a8a 100644 --- a/gdb/testsuite/gdb.cp/scope-err.exp +++ b/gdb/testsuite/gdb.cp/scope-err.exp @@ -17,7 +17,7 @@ # Derived from gdb.linespec/ls-errs.exp. if {[skip_cplus_tests]} { - continue + return } standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/shadow.exp b/gdb/testsuite/gdb.cp/shadow.exp index fc054b451ef..613aac30129 100644 --- a/gdb/testsuite/gdb.cp/shadow.exp +++ b/gdb/testsuite/gdb.cp/shadow.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/smartp.exp b/gdb/testsuite/gdb.cp/smartp.exp index 58a9b966228..a40d54fa135 100644 --- a/gdb/testsuite/gdb.cp/smartp.exp +++ b/gdb/testsuite/gdb.cp/smartp.exp @@ -23,7 +23,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++} if ![runto_main] then { perror "couldn't run to breakpoint main" - continue + return } gdb_breakpoint [gdb_get_line_number "end of main"] diff --git a/gdb/testsuite/gdb.cp/static-method.exp b/gdb/testsuite/gdb.cp/static-method.exp index fc1e19e764d..cd3171e0d53 100644 --- a/gdb/testsuite/gdb.cp/static-method.exp +++ b/gdb/testsuite/gdb.cp/static-method.exp @@ -38,7 +38,7 @@ proc test_breakpoint {func result} { } } -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } # Tests for c++/12750 standard_testfile .cc @@ -67,7 +67,7 @@ gdb_test_multiple $test $test { if {![runto_main]} { perror "couldn't run to breakpoint" - continue + return } set ans {(anonymous namespace)} diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp index 6fdea112cb2..507068d5a68 100644 --- a/gdb/testsuite/gdb.cp/temargs.exp +++ b/gdb/testsuite/gdb.cp/temargs.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite. if {[skip_cplus_tests]} { - continue + return } standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp index 2fbdb510e9c..8e74c91760e 100644 --- a/gdb/testsuite/gdb.cp/try_catch.exp +++ b/gdb/testsuite/gdb.cp/try_catch.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite -if { [skip_stl_tests] } { continue } +if { [skip_stl_tests] } { return } # # test running programs @@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_breakpoint [gdb_get_line_number "marker 1-throw"] diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp index afc4ac894a5..d67e42803fb 100644 --- a/gdb/testsuite/gdb.cp/userdef.exp +++ b/gdb/testsuite/gdb.cp/userdef.exp @@ -19,7 +19,7 @@ # source file "userdef.cc" # -if { [skip_stl_tests] } { continue } +if { [skip_stl_tests] } { return } standard_testfile .cc @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } gdb_test "break marker1" \ diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp index 54e90539e27..e69f7c9df53 100644 --- a/gdb/testsuite/gdb.cp/var-tag.exp +++ b/gdb/testsuite/gdb.cp/var-tag.exp @@ -17,7 +17,7 @@ # Test expressions in which variable names shadow tag names. -if {[skip_cplus_tests]} { continue } +if {[skip_cplus_tests]} { return } standard_testfile var-tag.cc var-tag-2.cc var-tag-3.cc var-tag-4.cc @@ -83,7 +83,7 @@ with_test_prefix "before start" { # Run to main and test again. if {![runto_main]} { perror "couldn't run to main" - continue + return } with_test_prefix "in main" { diff --git a/gdb/testsuite/gdb.cp/virtbase.exp b/gdb/testsuite/gdb.cp/virtbase.exp index 812e8ba73b7..828f8f576da 100644 --- a/gdb/testsuite/gdb.cp/virtbase.exp +++ b/gdb/testsuite/gdb.cp/virtbase.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if {![runto_main]} then { perror "couldn't run to breakpoint" - continue + return } gdb_breakpoint [gdb_get_line_number "breakpoint 1"] diff --git a/gdb/testsuite/gdb.cp/virtbase2.exp b/gdb/testsuite/gdb.cp/virtbase2.exp index a1a4bf88da0..dc9149bf4a1 100644 --- a/gdb/testsuite/gdb.cp/virtbase2.exp +++ b/gdb/testsuite/gdb.cp/virtbase2.exp @@ -15,7 +15,7 @@ # Make sure printing virtual base class data member works correctly (PR16841) -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } standard_testfile .cc @@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if {![runto_main]} then { perror "couldn't run to main" - continue + return } # From a list of nested scopes, generate all possible ways of accessing something diff --git a/gdb/testsuite/gdb.cp/virtfunc2.exp b/gdb/testsuite/gdb.cp/virtfunc2.exp index 6f41d2ba9b0..0a06d753474 100644 --- a/gdb/testsuite/gdb.cp/virtfunc2.exp +++ b/gdb/testsuite/gdb.cp/virtfunc2.exp @@ -18,7 +18,7 @@ set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib "cp-support.exp" @@ -30,7 +30,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } # set a breakpoint at the return stmt diff --git a/gdb/testsuite/gdb.cp/watch-cp.exp b/gdb/testsuite/gdb.cp/watch-cp.exp index 2aba411af86..30e804d3858 100644 --- a/gdb/testsuite/gdb.cp/watch-cp.exp +++ b/gdb/testsuite/gdb.cp/watch-cp.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] || [skip_hw_watchpoint_tests]} { continue } +if { [skip_cplus_tests] || [skip_hw_watchpoint_tests]} { return } standard_testfile .cc @@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { if ![runto_main] then { perror "couldn't run to main" - continue + return } gdb_test "watch watchme\[3\]" "atchpoint .*: watchme.*" "set watchpoint" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp index b8c74d4c4cf..f7c9e9597a7 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp @@ -39,7 +39,7 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile \ if ![runto MAIN__] then { perror "couldn't run to breakpoint MAIN__" - continue + return } gdb_breakpoint [gdb_get_line_number "stop-here-out" \ diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp index 3bd34d39841..63fc723956e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp @@ -36,7 +36,7 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug no } if ![runto_main] then { - continue + return } set srcline [gdb_get_line_number "stepi line" $csrcfile] diff --git a/gdb/testsuite/gdb.dwarf2/implref-array.exp b/gdb/testsuite/gdb.dwarf2/implref-array.exp index bd132209741..d9ddf602bb7 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-array.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-array.exp @@ -17,7 +17,7 @@ # The referenced value is a global array whose location is a DW_OP_addr. if [skip_cplus_tests] { - continue + return } load_lib dwarf.exp diff --git a/gdb/testsuite/gdb.dwarf2/implref-const.exp b/gdb/testsuite/gdb.dwarf2/implref-const.exp index 5dbc8645c86..c25fc7e9bf3 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-const.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-const.exp @@ -17,7 +17,7 @@ # The referenced value is a DW_AT_const_value. if [skip_cplus_tests] { - continue + return } load_lib dwarf.exp diff --git a/gdb/testsuite/gdb.dwarf2/implref-global.exp b/gdb/testsuite/gdb.dwarf2/implref-global.exp index 7686a270ae4..b4f3035cc36 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-global.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-global.exp @@ -17,7 +17,7 @@ # The referenced value is a global variable whose location is a DW_OP_addr. if [skip_cplus_tests] { - continue + return } load_lib dwarf.exp diff --git a/gdb/testsuite/gdb.dwarf2/implref-struct.exp b/gdb/testsuite/gdb.dwarf2/implref-struct.exp index d007b81adf0..10358df68b7 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-struct.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-struct.exp @@ -17,7 +17,7 @@ # The referenced value is a global struct whose location is a DW_OP_addr. if [skip_cplus_tests] { - continue + return } load_lib dwarf.exp diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit.exp b/gdb/testsuite/gdb.dwarf2/imported-unit.exp index 9bcd46dcfda..ecaa0e13af8 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit.exp @@ -23,7 +23,7 @@ # this case -flto. if [skip_cplus_tests] { - continue + return } load_lib dwarf.exp diff --git a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp index f2c07693be5..498648bd768 100644 --- a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp +++ b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp @@ -33,7 +33,7 @@ if { [prepare_for_testing "failed to prepare" "${test}" \ if { ![runto f] } { perror "Could not run to breakpoint `f'." - continue + return } gdb_test "watch x" ".*\[Ww\]atchpoint 2: x" "watch x" diff --git a/gdb/testsuite/gdb.fortran/array-bounds-high.exp b/gdb/testsuite/gdb.fortran/array-bounds-high.exp index 9623a71b9bf..effbddcb528 100644 --- a/gdb/testsuite/gdb.fortran/array-bounds-high.exp +++ b/gdb/testsuite/gdb.fortran/array-bounds-high.exp @@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} { if {![fortran_runto_main]} { perror "Could not run to main." - continue + return } gdb_test "until 21" {21.*print.*} diff --git a/gdb/testsuite/gdb.fortran/array-bounds.exp b/gdb/testsuite/gdb.fortran/array-bounds.exp index 20330932a14..1b11f01ca40 100644 --- a/gdb/testsuite/gdb.fortran/array-bounds.exp +++ b/gdb/testsuite/gdb.fortran/array-bounds.exp @@ -28,7 +28,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} { if {![fortran_runto_main]} { perror "Could not run to main." - continue + return } # Convenience proc to setup for KFAIL diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gdb.fortran/array-element.exp index a32e5138d6f..22b72e2974b 100644 --- a/gdb/testsuite/gdb.fortran/array-element.exp +++ b/gdb/testsuite/gdb.fortran/array-element.exp @@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { if ![runto sub_] then { perror "couldn't run to breakpoint sub_" - continue + return } gdb_breakpoint [gdb_get_line_number "return"] diff --git a/gdb/testsuite/gdb.fortran/array-indices.exp b/gdb/testsuite/gdb.fortran/array-indices.exp index 2740b81e038..403a5fc023c 100644 --- a/gdb/testsuite/gdb.fortran/array-indices.exp +++ b/gdb/testsuite/gdb.fortran/array-indices.exp @@ -83,7 +83,7 @@ proc array_repeat { variant } { if {![fortran_runto_main]} { perror "Could not run to main." - continue + return } gdb_breakpoint [gdb_get_line_number "Break here"] diff --git a/gdb/testsuite/gdb.fortran/array-no-bounds.exp b/gdb/testsuite/gdb.fortran/array-no-bounds.exp index 047ed5826d0..da965c559fa 100644 --- a/gdb/testsuite/gdb.fortran/array-no-bounds.exp +++ b/gdb/testsuite/gdb.fortran/array-no-bounds.exp @@ -28,7 +28,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ if { ![fortran_runto_main] } { perror "Could not run to main." - continue + return } # Go to foo. diff --git a/gdb/testsuite/gdb.fortran/array-repeat.exp b/gdb/testsuite/gdb.fortran/array-repeat.exp index bf16735c7e4..045bac17ea1 100644 --- a/gdb/testsuite/gdb.fortran/array-repeat.exp +++ b/gdb/testsuite/gdb.fortran/array-repeat.exp @@ -66,7 +66,7 @@ proc array_repeat { variant } { if {![fortran_runto_main]} { perror "Could not run to main." - continue + return } gdb_breakpoint [gdb_get_line_number "Break here"] diff --git a/gdb/testsuite/gdb.fortran/charset.exp b/gdb/testsuite/gdb.fortran/charset.exp index b462124e02c..5e4ba592cc1 100644 --- a/gdb/testsuite/gdb.fortran/charset.exp +++ b/gdb/testsuite/gdb.fortran/charset.exp @@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug addi if ![fortran_runto_main] { perror "Couldn't run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "break-here"] diff --git a/gdb/testsuite/gdb.fortran/common-block.exp b/gdb/testsuite/gdb.fortran/common-block.exp index ac39a4a575c..e6555f536dd 100644 --- a/gdb/testsuite/gdb.fortran/common-block.exp +++ b/gdb/testsuite/gdb.fortran/common-block.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" ${testfile} \ if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "stop-here-out"] diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp index ca41c812364..9298b3be56c 100644 --- a/gdb/testsuite/gdb.fortran/complex.exp +++ b/gdb/testsuite/gdb.fortran/complex.exp @@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet if ![fortran_runto_main] then { perror "Couldn't run to main" - continue + return } # Depending on the compiler being used, the type names can be printed differently. diff --git a/gdb/testsuite/gdb.fortran/derived-type-function.exp b/gdb/testsuite/gdb.fortran/derived-type-function.exp index f34a47a62bd..573444a5808 100644 --- a/gdb/testsuite/gdb.fortran/derived-type-function.exp +++ b/gdb/testsuite/gdb.fortran/derived-type-function.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "bp"] diff --git a/gdb/testsuite/gdb.fortran/derived-type-striding.exp b/gdb/testsuite/gdb.fortran/derived-type-striding.exp index 5975e045415..f8062b56572 100644 --- a/gdb/testsuite/gdb.fortran/derived-type-striding.exp +++ b/gdb/testsuite/gdb.fortran/derived-type-striding.exp @@ -31,7 +31,7 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ if {![runto [gdb_get_line_number "post_init"]]} then { perror "couldn't run to breakpoint post_init" - continue + return } # Test homogeneous derived type. diff --git a/gdb/testsuite/gdb.fortran/derived-type.exp b/gdb/testsuite/gdb.fortran/derived-type.exp index 5149cf28dbf..b3be8e57056 100644 --- a/gdb/testsuite/gdb.fortran/derived-type.exp +++ b/gdb/testsuite/gdb.fortran/derived-type.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } # Depending on the compiler being used, the type names can be printed differently. diff --git a/gdb/testsuite/gdb.fortran/function-calls.exp b/gdb/testsuite/gdb.fortran/function-calls.exp index 6b521efbcbd..bc0192be064 100644 --- a/gdb/testsuite/gdb.fortran/function-calls.exp +++ b/gdb/testsuite/gdb.fortran/function-calls.exp @@ -41,7 +41,7 @@ with_complaints 5 { if {![runto [gdb_get_line_number "post_init"]]} then { perror "couldn't run to breakpoint post_init" - continue + return } # Use inspired by gdb.base/callfuncs.exp. diff --git a/gdb/testsuite/gdb.fortran/info-modules.exp b/gdb/testsuite/gdb.fortran/info-modules.exp index c7aaa7305d5..a6359374a46 100644 --- a/gdb/testsuite/gdb.fortran/info-modules.exp +++ b/gdb/testsuite/gdb.fortran/info-modules.exp @@ -19,7 +19,7 @@ load_lib "fortran.exp" load_lib "sym-info-cmds.exp" -if { [skip_fortran_tests] } { continue } +if { [skip_fortran_tests] } { return } standard_testfile info-types.f90 info-types-2.f90 @@ -33,7 +33,7 @@ gdb_test_no_output "set auto-solib-add off" if { ![fortran_runto_main] } { perror "Could not run to main." - continue + return } # Avoid libc symbols. diff --git a/gdb/testsuite/gdb.fortran/info-types.exp b/gdb/testsuite/gdb.fortran/info-types.exp index 67fe4d79c59..9a388dd1a15 100644 --- a/gdb/testsuite/gdb.fortran/info-types.exp +++ b/gdb/testsuite/gdb.fortran/info-types.exp @@ -18,7 +18,7 @@ load_lib "fortran.exp" load_lib "sym-info-cmds.exp" -if { [skip_fortran_tests] } { continue } +if { [skip_fortran_tests] } { return } standard_testfile info-types.f90 info-types-2.f90 @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile \ if { ![fortran_runto_main] } { perror "Could not run to main." - continue + return } set integer4 [fortran_int4] diff --git a/gdb/testsuite/gdb.fortran/intrinsics.exp b/gdb/testsuite/gdb.fortran/intrinsics.exp index 29cff35c556..0894654f781 100644 --- a/gdb/testsuite/gdb.fortran/intrinsics.exp +++ b/gdb/testsuite/gdb.fortran/intrinsics.exp @@ -17,7 +17,7 @@ load_lib "fortran.exp" -if { [skip_fortran_tests] } { continue } +if { [skip_fortran_tests] } { return } standard_testfile .f90 @@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } if { ![fortran_runto_main] } { perror "Could not run to main." - continue + return } gdb_breakpoint [gdb_get_line_number "stop-here"] diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp index 284bcf1e8dd..09013b05447 100644 --- a/gdb/testsuite/gdb.fortran/library-module.exp +++ b/gdb/testsuite/gdb.fortran/library-module.exp @@ -47,7 +47,7 @@ gdb_load_shlib $libfile if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } gdb_breakpoint $srclibfile:[gdb_get_line_number "i-is-2-in-lib" $srclibfile] diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fortran/logical.exp index 977731099b8..1efb031b136 100644 --- a/gdb/testsuite/gdb.fortran/logical.exp +++ b/gdb/testsuite/gdb.fortran/logical.exp @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet if { ![fortran_runto_main] } { perror "Could not run to main." - continue + return } gdb_breakpoint [gdb_get_line_number "stop-here"] diff --git a/gdb/testsuite/gdb.fortran/max-depth.exp b/gdb/testsuite/gdb.fortran/max-depth.exp index f97e6502170..3a8a94e895d 100644 --- a/gdb/testsuite/gdb.fortran/max-depth.exp +++ b/gdb/testsuite/gdb.fortran/max-depth.exp @@ -18,7 +18,7 @@ load_lib "fortran.exp" -if { [skip_fortran_tests] } { continue } +if { [skip_fortran_tests] } { return } standard_testfile .f90 @@ -28,7 +28,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } if { ![fortran_runto_main] } { perror "Could not run to main." - continue + return } gdb_breakpoint [gdb_get_line_number "stop-here"] diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp index b00122a0379..08dc1a50e88 100644 --- a/gdb/testsuite/gdb.fortran/module.exp +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -36,7 +36,7 @@ gdb_test_no_output "set auto-solib-add off" if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } # Avoid libc symbols. diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp index 565eb39c7e1..fc517b67b9a 100644 --- a/gdb/testsuite/gdb.fortran/multi-dim.exp +++ b/gdb/testsuite/gdb.fortran/multi-dim.exp @@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug f90} if ![fortran_runto_main] { perror "Couldn't run to main" - continue + return } # Depending on the compiler being used, the type names can be printed differently. diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.fortran/namelist.exp index d6263e12fec..c7c92c1349c 100644 --- a/gdb/testsuite/gdb.fortran/namelist.exp +++ b/gdb/testsuite/gdb.fortran/namelist.exp @@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } # Depending on the compiler being used, the type names can be printed diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp index 6009cb65c53..3c8a5364efa 100644 --- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp @@ -109,7 +109,7 @@ proc do_bp_tests {with_src_prefix_p with_nest_prefix_p} { # Break on a contained function and run to it. if {![runto ${src_prefix}[gdb_get_line_number "pre_init"]]} then { perror "couldn't run to breakpoint pre_init" - continue + return } # Call a contained function. diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp index eaeca1ede27..524cfa757d6 100644 --- a/gdb/testsuite/gdb.fortran/print-formatted.exp +++ b/gdb/testsuite/gdb.fortran/print-formatted.exp @@ -16,7 +16,7 @@ load_lib "fortran.exp" if { [skip_fortran_tests] } { - continue + return } standard_testfile .f90 diff --git a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp index 8e0bb710f6f..8c497810534 100644 --- a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp +++ b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } set integer4 [fortran_int4] diff --git a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp index ebb90b68b9e..aa7f5d1ebde 100644 --- a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp +++ b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp @@ -27,7 +27,7 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} { if {![runto [gdb_get_line_number "post_truth_table_init"]]} then { perror "couldn't run to breakpoint post_truth_table_init" - continue + return } # Non-zero value to use as the function call count base. Using zero is avoided diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.fortran/subarray.exp index f7996368143..b282c5dd7c9 100644 --- a/gdb/testsuite/gdb.fortran/subarray.exp +++ b/gdb/testsuite/gdb.fortran/subarray.exp @@ -32,7 +32,7 @@ gdb_test_no_output "set auto-solib-add off" if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } # Avoid libc symbols, in particular the 'array' type. diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp index 5e93c4aede9..5b3a680c9f7 100644 --- a/gdb/testsuite/gdb.fortran/vla-value.exp +++ b/gdb/testsuite/gdb.fortran/vla-value.exp @@ -132,7 +132,7 @@ clean_restart ${testfile} if ![fortran_runto_main] then { perror "couldn't run to main" - continue + return } gdb_breakpoint [gdb_get_line_number "vla2-allocated"] gdb_continue_to_breakpoint "vla2-allocated, second time" diff --git a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp index 9ea4f5bc549..6c7f12d152f 100644 --- a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp +++ b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp @@ -35,7 +35,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $objsfile object {}] != "" } if [mi_gdb_start] { - continue + return } mi_delete_breakpoints @@ -52,7 +52,7 @@ if [mi_runto func_nofb_marker] { # GDB could have crashed. mi_gdb_exit if [mi_gdb_start] { - continue + return } mi_delete_breakpoints mi_gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.mi/gdb680.exp b/gdb/testsuite/gdb.mi/gdb680.exp index 46a507d19c8..551ac740493 100644 --- a/gdb/testsuite/gdb.mi/gdb680.exp +++ b/gdb/testsuite/gdb.mi/gdb680.exp @@ -22,7 +22,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } proc do_test {count} { diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp index 0d07d20a8b9..c4cad2075ac 100644 --- a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp +++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp @@ -32,11 +32,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb } if [mi_gdb_start] { - continue + return } if ![can_spawn_for_attach] { - continue + return } set string_re {(?:[^\\"]|\\.)*} diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-no-inferior.exp b/gdb/testsuite/gdb.mi/list-thread-groups-no-inferior.exp index 8d197113075..46144dadcd4 100644 --- a/gdb/testsuite/gdb.mi/list-thread-groups-no-inferior.exp +++ b/gdb/testsuite/gdb.mi/list-thread-groups-no-inferior.exp @@ -23,7 +23,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } # Try the "-list-thread-groups --available". This command can generate diff --git a/gdb/testsuite/gdb.mi/mi-async-run.exp b/gdb/testsuite/gdb.mi/mi-async-run.exp index b085baad938..03db72e2440 100644 --- a/gdb/testsuite/gdb.mi/mi-async-run.exp +++ b/gdb/testsuite/gdb.mi/mi-async-run.exp @@ -37,7 +37,7 @@ proc test_async_run {} { gdb_exit if [mi_gdb_start] { - continue + return } mi_gdb_load ${binfile} diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-async.exp index 6230dace55e..af16b4a243d 100644 --- a/gdb/testsuite/gdb.mi/mi-async.exp +++ b/gdb/testsuite/gdb.mi/mi-async.exp @@ -36,7 +36,7 @@ load_lib mi-support.exp gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile basics.c diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp index e1402078b66..b9f10892e30 100644 --- a/gdb/testsuite/gdb.mi/mi-basics.exp +++ b/gdb/testsuite/gdb.mi/mi-basics.exp @@ -30,7 +30,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start separate-inferior-tty] { - continue + return } standard_testfile basics.c diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp index f24ce6ba86c..6472dcd0113 100644 --- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp @@ -169,7 +169,7 @@ proc test_pending_resolved { } { gdb_exit if [mi_gdb_start] { - continue + return } mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load ${binfile} diff --git a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp index d8d7a57a766..f10d028714c 100644 --- a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp +++ b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp @@ -15,7 +15,7 @@ # Test the -catch-throw, -catch-rethrow, and -catch-catch MI commands. -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib mi-support.exp set MIFLAGS "-i=mi" @@ -47,7 +47,7 @@ proc restart_for_test {} { global main_lineno if {[mi_gdb_start]} { - continue + return } mi_delete_breakpoints diff --git a/gdb/testsuite/gdb.mi/mi-cmd-error.exp b/gdb/testsuite/gdb.mi/mi-cmd-error.exp index 103006588c4..76db1e0ea7c 100644 --- a/gdb/testsuite/gdb.mi/mi-cmd-error.exp +++ b/gdb/testsuite/gdb.mi/mi-cmd-error.exp @@ -27,7 +27,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp b/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp index d275df4708f..7f9cb086623 100644 --- a/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp +++ b/gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp @@ -42,7 +42,7 @@ proc test { variant } { with_test_prefix "$variant" { gdb_exit if [mi_gdb_start] { - continue + return } set options {debug} diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp index bf6d9a4aca6..f8a25ca9c71 100644 --- a/gdb/testsuite/gdb.mi/mi-console.exp +++ b/gdb/testsuite/gdb.mi/mi-console.exp @@ -48,7 +48,7 @@ proc semihosted_string { string } { gdb_exit if [mi_gdb_start separate-inferior-tty] { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.mi/mi-editing.exp b/gdb/testsuite/gdb.mi/mi-editing.exp index f6511debf37..76c18b12952 100644 --- a/gdb/testsuite/gdb.mi/mi-editing.exp +++ b/gdb/testsuite/gdb.mi/mi-editing.exp @@ -25,7 +25,7 @@ set MIFLAGS "-i=mi" gdb_exit if {[mi_gdb_start]} { - continue + return } mi_gdb_test "-interpreter-exec console \"set editing on\"" \ diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp index 7c5dfd9b88b..0baf525633b 100644 --- a/gdb/testsuite/gdb.mi/mi-eval.exp +++ b/gdb/testsuite/gdb.mi/mi-eval.exp @@ -27,7 +27,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile basics.c diff --git a/gdb/testsuite/gdb.mi/mi-file-transfer.exp b/gdb/testsuite/gdb.mi/mi-file-transfer.exp index 46806a5b6d9..5c5ea02a428 100644 --- a/gdb/testsuite/gdb.mi/mi-file-transfer.exp +++ b/gdb/testsuite/gdb.mi/mi-file-transfer.exp @@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb gdb_exit if [mi_gdb_start] { - continue + return } mi_delete_breakpoints mi_gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp index 5b5d16cde52..0544a924bcb 100644 --- a/gdb/testsuite/gdb.mi/mi-file.exp +++ b/gdb/testsuite/gdb.mi/mi-file.exp @@ -20,7 +20,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile basics.c diff --git a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp index 3ccc4da886f..04d1903c2b9 100644 --- a/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp +++ b/gdb/testsuite/gdb.mi/mi-fullname-deleted.exp @@ -18,7 +18,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.mi/mi-hack-cli.exp b/gdb/testsuite/gdb.mi/mi-hack-cli.exp index 72f0cfb2712..542c72d5cb2 100644 --- a/gdb/testsuite/gdb.mi/mi-hack-cli.exp +++ b/gdb/testsuite/gdb.mi/mi-hack-cli.exp @@ -21,7 +21,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } mi_gdb_test "show architecture" \ diff --git a/gdb/testsuite/gdb.mi/mi-i-cmd.exp b/gdb/testsuite/gdb.mi/mi-i-cmd.exp index 49340716e2e..4474f45a406 100644 --- a/gdb/testsuite/gdb.mi/mi-i-cmd.exp +++ b/gdb/testsuite/gdb.mi/mi-i-cmd.exp @@ -18,7 +18,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } # First, verify that the debugger correctly advertises support diff --git a/gdb/testsuite/gdb.mi/mi-info-os.exp b/gdb/testsuite/gdb.mi/mi-info-os.exp index 7149306cc8d..ea4acf9e3eb 100644 --- a/gdb/testsuite/gdb.mi/mi-info-os.exp +++ b/gdb/testsuite/gdb.mi/mi-info-os.exp @@ -30,7 +30,7 @@ if [gdb_skip_xml_test] then { gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile basics.c diff --git a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp index 307addc79a8..f19c2c15c58 100644 --- a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp +++ b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp @@ -13,14 +13,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib mi-support.exp set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile .cc diff --git a/gdb/testsuite/gdb.mi/mi-language.exp b/gdb/testsuite/gdb.mi/mi-language.exp index 2fe4796bcf6..db23590a70c 100644 --- a/gdb/testsuite/gdb.mi/mi-language.exp +++ b/gdb/testsuite/gdb.mi/mi-language.exp @@ -18,7 +18,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } # First, verify that the debugger correctly advertises support diff --git a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp index ba3de85ea1f..d9999078059 100644 --- a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp +++ b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp @@ -18,7 +18,7 @@ # file with a Windows-style logical drive names and C++. if {[skip_cplus_tests]} { - continue + return } load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.mi/mi-multi-commands.exp b/gdb/testsuite/gdb.mi/mi-multi-commands.exp index 58187b15815..35da211f6bc 100644 --- a/gdb/testsuite/gdb.mi/mi-multi-commands.exp +++ b/gdb/testsuite/gdb.mi/mi-multi-commands.exp @@ -40,7 +40,7 @@ proc run_test { args } { gdb_exit if [mi_gdb_start $args] { - continue + return } set start 1 diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp index fe9392e314e..12cfab2619f 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp @@ -51,7 +51,7 @@ mi_gdb_test "-gdb-set mi-async 1" ".*" mi_detect_async if { [mi_runto_main] < 0 } { - continue + return } mi_create_breakpoint break_at_me "breakpoint at marker" \ diff --git a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp index 51244af17e9..847e28b1985 100644 --- a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp +++ b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp @@ -53,7 +53,7 @@ mi_gdb_test "-gdb-set mi-async 1" ".*" mi_detect_async if { [mi_runto_main] < 0 } { - continue + return } # Check that register and stack info don't end up stale after resuming diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp index c1415ca4fb5..b8184f9bba7 100644 --- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp +++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp @@ -40,7 +40,7 @@ mi_gdb_test "-gdb-set mi-async 1" ".*" mi_detect_async if { [mi_runto_main] < 0 } { - continue + return } mi_create_breakpoint thread_function \ diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp index 912034f11bc..db6e6ec3633 100644 --- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp +++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp @@ -40,7 +40,7 @@ mi_gdb_test "-gdb-set mi-async 1" ".*" mi_detect_async if { [mi_runto_main] < 0 } { - continue + return } # Keep this in sync with THREADS in the $srcfile. diff --git a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp index f0eb10004d7..fa106fa9efa 100644 --- a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp +++ b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp @@ -45,7 +45,7 @@ mi_gdb_test "-gdb-set mi-async 1" ".*" mi_detect_async if { [mi_runto_main] < 0 } { - continue + return } mi_create_breakpoint thread_execler \ diff --git a/gdb/testsuite/gdb.mi/mi-pthreads.exp b/gdb/testsuite/gdb.mi/mi-pthreads.exp index 8724a86470a..c92b1a26975 100644 --- a/gdb/testsuite/gdb.mi/mi-pthreads.exp +++ b/gdb/testsuite/gdb.mi/mi-pthreads.exp @@ -24,7 +24,7 @@ set MIFLAGS "-i=mi" gdb_exit if {[mi_gdb_start]} { - continue + return } # This procedure tests the various thread commands in MI. diff --git a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp index 27c330f762a..59f3effc1b7 100644 --- a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp +++ b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp @@ -28,7 +28,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile .S diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp index 5d808205ad7..393c3a7da42 100644 --- a/gdb/testsuite/gdb.mi/mi-return.exp +++ b/gdb/testsuite/gdb.mi/mi-return.exp @@ -26,7 +26,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile basics.c diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp index 08c54dc895f..959e3b67687 100644 --- a/gdb/testsuite/gdb.mi/mi-simplerun.exp +++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp @@ -29,7 +29,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile basics.c diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp index 50e6d0facfa..88d030dde3a 100644 --- a/gdb/testsuite/gdb.mi/mi-solib.exp +++ b/gdb/testsuite/gdb.mi/mi-solib.exp @@ -23,7 +23,7 @@ if {[skip_shlib_tests]} { gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile solib-main.c solib-lib.c diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp index fb399e87ebb..d04c8153c65 100644 --- a/gdb/testsuite/gdb.mi/mi-stack.exp +++ b/gdb/testsuite/gdb.mi/mi-stack.exp @@ -27,7 +27,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp index 539071d785e..98458c5b5d5 100644 --- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp @@ -18,7 +18,7 @@ if [target_info exists gdb,nosignals] { verbose "Skipping mi-syn-frame.exp because of nosignals." - continue + return } load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp index f3682f9635b..706e4020179 100644 --- a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp +++ b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp @@ -15,7 +15,7 @@ if [target_info exists gdb,nointerrupts] { verbose "Skipping mi-threads-interrupt.exp because of nointerrupts." - continue + return } load_lib mi-support.exp @@ -38,7 +38,7 @@ proc test_continue_interrupt { } { gdb_exit if {[mi_gdb_start]} { - continue + return } # Load the binary in gdb... diff --git a/gdb/testsuite/gdb.mi/mi-undefined-cmd.exp b/gdb/testsuite/gdb.mi/mi-undefined-cmd.exp index 8ac450dbde2..390eb6fb7d2 100644 --- a/gdb/testsuite/gdb.mi/mi-undefined-cmd.exp +++ b/gdb/testsuite/gdb.mi/mi-undefined-cmd.exp @@ -18,7 +18,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp index ab5c6fd0dd4..1fbfd932996 100644 --- a/gdb/testsuite/gdb.mi/mi-until.exp +++ b/gdb/testsuite/gdb.mi/mi-until.exp @@ -26,7 +26,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile until.c diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp index cb94936fa86..2f8d39a6acd 100644 --- a/gdb/testsuite/gdb.mi/mi-var-block.exp +++ b/gdb/testsuite/gdb.mi/mi-var-block.exp @@ -24,7 +24,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile var-cmd.c diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp b/gdb/testsuite/gdb.mi/mi-var-child-f.exp index 4f417a79244..b097b1c4673 100644 --- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp +++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp @@ -23,7 +23,7 @@ if { [skip_fortran_tests] } { return -1 } gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile array.f90 diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp index 8d729616874..4c05888ab74 100644 --- a/gdb/testsuite/gdb.mi/mi-var-child.exp +++ b/gdb/testsuite/gdb.mi/mi-var-child.exp @@ -24,7 +24,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp index 6c89c798ef1..3805b581765 100644 --- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp +++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp @@ -24,7 +24,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile var-cmd.c diff --git a/gdb/testsuite/gdb.mi/mi-var-cp.exp b/gdb/testsuite/gdb.mi/mi-var-cp.exp index ba366daf2c3..2258b30100c 100644 --- a/gdb/testsuite/gdb.mi/mi-var-cp.exp +++ b/gdb/testsuite/gdb.mi/mi-var-cp.exp @@ -13,14 +13,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib mi-support.exp set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile .cc diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp index 9ed185d0ad0..0cf679d1bd3 100644 --- a/gdb/testsuite/gdb.mi/mi-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi-var-display.exp @@ -24,7 +24,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile var-cmd.c diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp index 9bdd5c3400a..1b2c68df18e 100644 --- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp +++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp @@ -25,7 +25,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile var-cmd.c diff --git a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp index 79c7bf859e0..868cfa99338 100644 --- a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp +++ b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp @@ -21,7 +21,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.mi/mi-var-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-rtti.exp index 0015d23a4be..ad18d1ae56d 100644 --- a/gdb/testsuite/gdb.mi/mi-var-rtti.exp +++ b/gdb/testsuite/gdb.mi/mi-var-rtti.exp @@ -13,14 +13,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_cplus_tests] } { continue } +if { [skip_cplus_tests] } { return } load_lib mi-support.exp set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile .cc diff --git a/gdb/testsuite/gdb.mi/mi-vla-c99.exp b/gdb/testsuite/gdb.mi/mi-vla-c99.exp index 556d241457e..3c24ea77a40 100644 --- a/gdb/testsuite/gdb.mi/mi-vla-c99.exp +++ b/gdb/testsuite/gdb.mi/mi-vla-c99.exp @@ -23,7 +23,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile vla.c diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp index d6bd3069b1d..00312354fc9 100644 --- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp +++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp @@ -24,7 +24,7 @@ set MIFLAGS "-i=mi" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile vla.f90 diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp index 8603edfda9d..b132d90353d 100644 --- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp @@ -52,7 +52,7 @@ mi_gdb_test "-gdb-set mi-async 1" ".*" mi_detect_async if { [mi_runto_main] < 0 } { - continue + return } # Set a watchpoint. diff --git a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp index f4cd61eaca2..3e8322239ae 100644 --- a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp +++ b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp @@ -18,7 +18,7 @@ set MIFLAGS "-i=mi2" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile .s diff --git a/gdb/testsuite/gdb.mi/mi2-cli-display.exp b/gdb/testsuite/gdb.mi/mi2-cli-display.exp index 3f993309d89..2afc75b2a68 100644 --- a/gdb/testsuite/gdb.mi/mi2-cli-display.exp +++ b/gdb/testsuite/gdb.mi/mi2-cli-display.exp @@ -19,7 +19,7 @@ load_lib mi-support.exp set MIFLAGS "-i=mi2" if {[mi_gdb_start]} { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.mi/mi2-prompt.exp b/gdb/testsuite/gdb.mi/mi2-prompt.exp index 1ecd62dc652..34b51289ea7 100644 --- a/gdb/testsuite/gdb.mi/mi2-prompt.exp +++ b/gdb/testsuite/gdb.mi/mi2-prompt.exp @@ -18,7 +18,7 @@ set MIFLAGS "-i=mi2" gdb_exit if [mi_gdb_start] { - continue + return } # Check console 'set prompt' does not affect the MI output. diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp index d0d6ad98603..16700dd58a7 100644 --- a/gdb/testsuite/gdb.mi/mi2-var-child.exp +++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp @@ -24,7 +24,7 @@ set MIFLAGS "-i=mi2" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile var-cmd.c diff --git a/gdb/testsuite/gdb.modula2/multidim.exp b/gdb/testsuite/gdb.modula2/multidim.exp index c680948b7d2..1e4354d8822 100644 --- a/gdb/testsuite/gdb.modula2/multidim.exp +++ b/gdb/testsuite/gdb.modula2/multidim.exp @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ if ![runto here] then { perror "couldn't run to breakpoint 'here'" - continue + return } gdb_test "set lang modula-2" ".*does not match.*" "switch to modula-2" diff --git a/gdb/testsuite/gdb.modula2/unbounded-array.exp b/gdb/testsuite/gdb.modula2/unbounded-array.exp index 596bd16aaa2..ae3032d349f 100644 --- a/gdb/testsuite/gdb.modula2/unbounded-array.exp +++ b/gdb/testsuite/gdb.modula2/unbounded-array.exp @@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug quiet}]} if ![runto foo] then { perror "couldn't run to breakpoint foo" - continue + return } gdb_test "set lang modula-2" ".*does not match.*" "switch to modula-2" diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp index c4517485c0c..cf7101bd5f4 100644 --- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp +++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp @@ -14,13 +14,13 @@ # along with this program. If not, see . if ![target_can_use_run_cmd] { - continue + return } # Until "catch exec" is implemented on other targets... # if {![istarget "*-linux*"]} then { - continue + return } set testfile "bkpt-multi-exec" diff --git a/gdb/testsuite/gdb.opt/fortran-string.exp b/gdb/testsuite/gdb.opt/fortran-string.exp index 4c633356160..8d4018e9b8b 100644 --- a/gdb/testsuite/gdb.opt/fortran-string.exp +++ b/gdb/testsuite/gdb.opt/fortran-string.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "prepare for testing" ${testfile} ${srcfile} \ if ![runto f] then { perror "couldn't run to f" - continue + return } gdb_test_no_output "set print frame-arguments all" diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp index 7ee1a5a85d9..17ad83672d1 100644 --- a/gdb/testsuite/gdb.opt/inline-cmds.exp +++ b/gdb/testsuite/gdb.opt/inline-cmds.exp @@ -337,7 +337,7 @@ proc mi_cli_step {cli_output_re message} { # CLI output sent to MI's console. with_test_prefix "mi" { if [mi_gdb_start] { - continue + return } mi_gdb_load ${binfile} mi_runto_main diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.exp b/gdb/testsuite/gdb.python/py-framefilter-mi.exp index 08f9e17e9f9..344067fe4a7 100644 --- a/gdb/testsuite/gdb.python/py-framefilter-mi.exp +++ b/gdb/testsuite/gdb.python/py-framefilter-mi.exp @@ -22,7 +22,7 @@ set MIFLAGS "-i=mi2" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile py-framefilter-mi.c diff --git a/gdb/testsuite/gdb.python/py-inferior-leak.exp b/gdb/testsuite/gdb.python/py-inferior-leak.exp index 3e87835644c..c46b7aaa3e4 100644 --- a/gdb/testsuite/gdb.python/py-inferior-leak.exp +++ b/gdb/testsuite/gdb.python/py-inferior-leak.exp @@ -23,12 +23,12 @@ standard_testfile clean_restart # Skip all tests if Python scripting is not enabled. -if { [skip_python_tests] } { continue } +if { [skip_python_tests] } { return } # Skip this test if the tracemalloc module is not available. if { ![gdb_py_module_available "tracemalloc"] } { unsupported "tracemalloc module not available" - continue + return } set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py] diff --git a/gdb/testsuite/gdb.python/py-mi-cmd.exp b/gdb/testsuite/gdb.python/py-mi-cmd.exp index 300ab956892..d372518a031 100644 --- a/gdb/testsuite/gdb.python/py-mi-cmd.exp +++ b/gdb/testsuite/gdb.python/py-mi-cmd.exp @@ -20,7 +20,7 @@ set MIFLAGS "-i=mi" gdb_exit if {[mi_gdb_start]} { - continue + return } if {[lsearch -exact [mi_get_features] python] < 0} { diff --git a/gdb/testsuite/gdb.python/py-mi-events.exp b/gdb/testsuite/gdb.python/py-mi-events.exp index 9014a888975..e8361c0bc2f 100644 --- a/gdb/testsuite/gdb.python/py-mi-events.exp +++ b/gdb/testsuite/gdb.python/py-mi-events.exp @@ -20,7 +20,7 @@ set MIFLAGS "-i=mi2" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile @@ -31,7 +31,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb return -1 } -if { [mi_skip_python_tests] } { continue } +if { [mi_skip_python_tests] } { return } set remote_python_file [gdb_remote_download host ${srcdir}/${subdir}/${pyfile}] diff --git a/gdb/testsuite/gdb.python/py-mi-objfile.exp b/gdb/testsuite/gdb.python/py-mi-objfile.exp index f1c353ee58c..3e8bf82bdf6 100644 --- a/gdb/testsuite/gdb.python/py-mi-objfile.exp +++ b/gdb/testsuite/gdb.python/py-mi-objfile.exp @@ -20,7 +20,7 @@ set MIFLAGS "-i=mi2" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile @@ -31,7 +31,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb return -1 } -if { [mi_skip_python_tests] } { continue } +if { [mi_skip_python_tests] } { return } # Make the -gdb.py script available to gdb, it is automagically loaded by gdb. # Care is taken to put it in the same directory as the binary so that diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp index b832b2ccbd3..291980479a3 100644 --- a/gdb/testsuite/gdb.python/py-mi.exp +++ b/gdb/testsuite/gdb.python/py-mi.exp @@ -21,7 +21,7 @@ set MIFLAGS "-i=mi2" gdb_exit if [mi_gdb_start] { - continue + return } standard_testfile py-prettyprint.c @@ -348,7 +348,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" \ } if [mi_gdb_start] { - continue + return } mi_delete_breakpoints mi_gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp index d68dd7b9049..066d307fbcd 100644 --- a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp +++ b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp @@ -50,7 +50,7 @@ clean_restart $executable if ![runto_main] then { untested "could not run to main" - continue + return } gdb_test_no_output "record" diff --git a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp index 9ea8931e9cf..8cecb067667 100644 --- a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp +++ b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp @@ -51,7 +51,7 @@ clean_restart $executable if ![runto_main] then { untested "could not run to main" - continue + return } gdb_test_no_output "record" diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index b337b483476..5f8ea1a298c 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp index bb0222bed4b..81a2aaca4c8 100644 --- a/gdb/testsuite/gdb.rust/expr.exp +++ b/gdb/testsuite/gdb.rust/expr.exp @@ -17,7 +17,7 @@ # Rust compiler. This serves as a smoke test. load_lib "rust-support.exp" -if {[skip_rust_tests]} { continue } +if {[skip_rust_tests]} { return } gdb_start @@ -25,7 +25,7 @@ gdb_test_no_output "set var \$something = 27" if {![set_lang_rust]} { warning "Rust expression tests suppressed." - continue + return } gdb_test "print 9__97" " = 997" diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp index 45755710626..9e12f624a7f 100644 --- a/gdb/testsuite/gdb.rust/fnfield.exp +++ b/gdb/testsuite/gdb.rust/fnfield.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp index 15f9d615b6c..6dfb068c6d8 100644 --- a/gdb/testsuite/gdb.rust/generics.exp +++ b/gdb/testsuite/gdb.rust/generics.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index 56731692b43..f3eb943c1b7 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp index 19204168fa5..07d74956228 100644 --- a/gdb/testsuite/gdb.rust/modules.exp +++ b/gdb/testsuite/gdb.rust/modules.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp index d4fde1647c1..7c7c78b5847 100644 --- a/gdb/testsuite/gdb.rust/pp.exp +++ b/gdb/testsuite/gdb.rust/pp.exp @@ -18,7 +18,7 @@ load_lib gdb-python.exp load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } -if { [skip_python_tests] } { continue } +if { [skip_python_tests] } { return } set remote_python_file [gdb_remote_download host \ ${srcdir}/${subdir}/${testfile}.py] diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp index c4ba4735071..3d2ac070bca 100644 --- a/gdb/testsuite/gdb.rust/rawids.exp +++ b/gdb/testsuite/gdb.rust/rawids.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } set v [split [rust_compiler_version] .] diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp index b4da237e7d9..8383cb743ae 100644 --- a/gdb/testsuite/gdb.rust/rust-style.exp +++ b/gdb/testsuite/gdb.rust/rust-style.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } save_vars { env(TERM) } { diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 246aff634d3..252c47baac5 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs @@ -389,7 +389,7 @@ gdb_test "print empty_enum_value.something" "" load_lib gdb-python.exp if {[skip_python_tests]} { - continue + return } gdb_test "python print(gdb.lookup_type('simple::HiBob'))" "simple::HiBob" diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp index 464cb79290f..aa45e64b877 100644 --- a/gdb/testsuite/gdb.rust/traits.exp +++ b/gdb/testsuite/gdb.rust/traits.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp index 9de0a0e724f..d091a8ac92e 100644 --- a/gdb/testsuite/gdb.rust/unicode.exp +++ b/gdb/testsuite/gdb.rust/unicode.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } # Non-ASCII identifiers were allowed starting in 1.53. diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp index f0cb6e3ca57..0a786569e34 100644 --- a/gdb/testsuite/gdb.rust/union.exp +++ b/gdb/testsuite/gdb.rust/union.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp index 67ee49d0935..59a7394a943 100644 --- a/gdb/testsuite/gdb.rust/unsized.exp +++ b/gdb/testsuite/gdb.rust/unsized.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index 8095d9fcedf..8f34c2928d9 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -17,7 +17,7 @@ load_lib rust-support.exp if {[skip_rust_tests]} { - continue + return } standard_testfile .rs diff --git a/gdb/testsuite/gdb.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp index 4d3eb090f4f..db25a6ef075 100644 --- a/gdb/testsuite/gdb.server/extended-remote-restart.exp +++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp @@ -30,13 +30,13 @@ # This test is only for extended remote targets. if {[target_info gdb_protocol] != "extended-remote"} { - continue + return } # This test also makes use of 'detach-on-fork' which is not supported # on all platforms. if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then { - continue + return } # And we need to be able to reconnect to gdbserver. diff --git a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp index 8088fc59a51..70b4dbf4340 100644 --- a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp +++ b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp @@ -26,7 +26,7 @@ if { [skip_gdbserver_tests] } { if [target_info exists gdb,nointerrupts] { verbose "Skipping reconnect-ctrl-c.exp because of nointerrupts." - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.stabs/exclfwd.exp b/gdb/testsuite/gdb.stabs/exclfwd.exp index 3d4a211bc47..5337ac8e376 100644 --- a/gdb/testsuite/gdb.stabs/exclfwd.exp +++ b/gdb/testsuite/gdb.stabs/exclfwd.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \ if ![runto_main] then { perror "couldn't run to breakpoint" - continue + return } get_debug_format diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp index d824c5ba707..b4a255fe00e 100644 --- a/gdb/testsuite/gdb.threads/attach-into-signal.exp +++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp @@ -19,7 +19,7 @@ # This test only works on Linux if { ![isnative] || [is_remote host] || [use_gdb_stub] || ![istarget *-linux*] } { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp index b2e5277cff8..68c866a36f0 100644 --- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp +++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp @@ -39,7 +39,7 @@ # This test only works on Linux if { ![isnative] || [is_remote host] || [use_gdb_stub] || ![istarget *-linux*] } { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp index d8a8382da11..72a907728db 100644 --- a/gdb/testsuite/gdb.threads/attach-stopped.exp +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp @@ -20,7 +20,7 @@ # This test only works on Linux if { ![isnative] || [is_remote host] || [use_gdb_stub] || ![istarget *-linux*] } { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsuite/gdb.threads/check-libthread-db.exp index 4e61a3ccc17..231c1d2596d 100644 --- a/gdb/testsuite/gdb.threads/check-libthread-db.exp +++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp @@ -15,7 +15,7 @@ # This test only works for native processes on GNU/Linux. if {[target_info gdb_protocol] != "" || ![istarget *-linux*]} { - continue + return } # Test relies on checking gdb debug output. Do not run if gdb debug is diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp index c05ac4a5a03..845d859f95a 100644 --- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp +++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp @@ -24,7 +24,7 @@ # inferiors have terminated, and this test requires that. if { [target_info exists gdb_protocol] && [target_info gdb_protocol] == "remote" } { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp index 52e701a4154..81b5b57bf63 100644 --- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp +++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp @@ -27,7 +27,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } proc get_dummy_frame_number { } { diff --git a/gdb/testsuite/gdb.threads/hand-call-new-thread.exp b/gdb/testsuite/gdb.threads/hand-call-new-thread.exp index 25da0169d5d..74cb58d9c90 100644 --- a/gdb/testsuite/gdb.threads/hand-call-new-thread.exp +++ b/gdb/testsuite/gdb.threads/hand-call-new-thread.exp @@ -23,7 +23,7 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] } if ![runto_main] { - continue + return } # Set a thread-specific breakpoint that the wrong thread trips on diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp index e6d444e039a..744b47a1962 100644 --- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp +++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp @@ -28,7 +28,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.threads/names.exp b/gdb/testsuite/gdb.threads/names.exp index f7dddaa05be..ecb241713f4 100644 --- a/gdb/testsuite/gdb.threads/names.exp +++ b/gdb/testsuite/gdb.threads/names.exp @@ -17,7 +17,7 @@ # threads). if [target_info exists gdb,no_thread_names] { - continue + return } standard_testfile @@ -27,7 +27,7 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] } if ![runto "all_threads_ready"] { - continue + return } gdb_test "info threads" \ diff --git a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp index 32c5f85ec75..2a9746a502e 100644 --- a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp +++ b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp @@ -21,7 +21,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. if [gdb_debug_enabled] { - continue + return } standard_testfile diff --git a/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp b/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp index 6548b767aa3..866973761a2 100644 --- a/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp +++ b/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp @@ -35,7 +35,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads} } if ![runto_main] { - continue + return } # Make sure it's GDB's decr_pc logic that's being tested, not the diff --git a/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp b/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp index c8ac550e633..6fb58e3a82f 100644 --- a/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp +++ b/gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp @@ -33,7 +33,7 @@ proc do_test {displaced command} { clean_restart $executable if ![runto_main] { - continue + return } gdb_test_no_output "set displaced-stepping $displaced" diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp index 23589e2ecb8..6d021f878f0 100644 --- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp +++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp @@ -28,7 +28,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab # test. if [target_info exists gdb,cannot_call_functions] { unsupported "this target can not call functions" - continue + return } clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp index 20ba731171a..517e0394e06 100644 --- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp @@ -175,7 +175,7 @@ proc test_pending_resolved { } { gdb_exit if [mi_gdb_start] { - continue + return } mi_gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp index 6a702b64824..96251c900e7 100644 --- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp @@ -80,7 +80,7 @@ proc test_create_delete_modify_tsv { } { } gdb_exit if [mi_gdb_start] { - continue + return } mi_gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp index 03f5414a7cd..463b6d946d8 100644 --- a/gdb/testsuite/gdb.trace/stap-trace.exp +++ b/gdb/testsuite/gdb.trace/stap-trace.exp @@ -24,7 +24,7 @@ set cr "\[\r\n\]+" # Only x86 and x86_64 targets are supported for now. if { ![istarget "x86_64-*"] && ![istarget "i?86-*"] } { - continue + return } proc compile_stap_bin {exec_name {arg ""}} { @@ -56,7 +56,7 @@ proc prepare_for_trace_test {} { if { ![runto_main] } { perror "Could not run to `main'." - continue + return } gdb_breakpoint [gdb_get_line_number "end-here"] @@ -112,7 +112,7 @@ if {![compile_stap_bin "stap-probe-nosem"]} { clean_restart $executable if { ![runto_main] } { perror "Could not run to `main'." - continue + return } if { ![gdb_target_supports_trace] } {