diff options
| author | Bruno Larsen <blarsen@redhat.com> | 2022-05-13 13:23:57 -0300 |
|---|---|---|
| committer | Bruno Larsen <blarsen@redhat.com> | 2022-05-16 10:07:43 -0300 |
| commit | cdd4206647d0ef8d54d0fa66b3dfa57a4ec07db9 (patch) | |
| tree | be9e3ffcbe58cd24f751c1c828a91b8b79099784 /gdb/testsuite/gdb.cp | |
| parent | b7ff32f191ed7e708412e9faa31cf691f08ca695 (diff) | |
| download | binutils-gdb-cdd4206647d0ef8d54d0fa66b3dfa57a4ec07db9.tar.gz | |
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.
Diffstat (limited to 'gdb/testsuite/gdb.cp')
68 files changed, 130 insertions, 130 deletions
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 <http://www.gnu.org/licenses/>. -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<int>(2,2)" "print add<int>(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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. -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" |