diff options
| author | Tom Tromey <tom@tromey.com> | 2022-12-13 15:35:59 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2023-01-13 13:18:55 -0700 |
| commit | 7978d474f213ca9fbd37738f0d9350ff4a94d53b (patch) | |
| tree | 21a2b6af77b1986a1ca03c58b928b962c541c44a /gdb/testsuite/gdb.cp | |
| parent | 18d2b8767a86e819c911d12077ad9a1ab6f289a3 (diff) | |
| download | gdb-7978d474f213ca9fbd37738f0d9350ff4a94d53b.zip gdb-7978d474f213ca9fbd37738f0d9350ff4a94d53b.tar.gz gdb-7978d474f213ca9fbd37738f0d9350ff4a94d53b.tar.bz2 | |
Use require !skip_cplus_tests
This changes some tests to use "require !skip_cplus_tests".
Diffstat (limited to 'gdb/testsuite/gdb.cp')
119 files changed, 119 insertions, 151 deletions
diff --git a/gdb/testsuite/gdb.cp/align.exp b/gdb/testsuite/gdb.cp/align.exp index f1c8f5f..b75024d 100644 --- a/gdb/testsuite/gdb.cp/align.exp +++ b/gdb/testsuite/gdb.cp/align.exp @@ -18,7 +18,7 @@ # This tests that C++ alignof works in gdb, and that it agrees with # the compiler. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests # The types we're going to test. diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp index 966d99a..e132e73 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index 51cf92ae..160d269 100644 --- a/gdb/testsuite/gdb.cp/annota2.exp +++ b/gdb/testsuite/gdb.cp/annota2.exp @@ -20,7 +20,7 @@ # test running programs # -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp index b728c4e..5a5f3ff 100644 --- a/gdb/testsuite/gdb.cp/annota3.exp +++ b/gdb/testsuite/gdb.cp/annota3.exp @@ -20,7 +20,7 @@ # test running programs # -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/anon-ns.exp b/gdb/testsuite/gdb.cp/anon-ns.exp index a0d1245..d901753 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]} { return } +require !skip_cplus_tests standard_testfile .cc anon-ns2.cc diff --git a/gdb/testsuite/gdb.cp/anon-union.exp b/gdb/testsuite/gdb.cp/anon-union.exp index 521ee4e..f5ec03d 100644 --- a/gdb/testsuite/gdb.cp/anon-union.exp +++ b/gdb/testsuite/gdb.cp/anon-union.exp @@ -23,7 +23,7 @@ # -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/arg-reference.exp b/gdb/testsuite/gdb.cp/arg-reference.exp index c72196e..21a89bd 100644 --- a/gdb/testsuite/gdb.cp/arg-reference.exp +++ b/gdb/testsuite/gdb.cp/arg-reference.exp @@ -21,7 +21,7 @@ # Test G++ has compiled debuginfo without a C++ '&' reference where it should # not be. GCC Bug 33537. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/array-indices.exp b/gdb/testsuite/gdb.cp/array-indices.exp index e9723d9..8f88f94 100644 --- a/gdb/testsuite/gdb.cp/array-indices.exp +++ b/gdb/testsuite/gdb.cp/array-indices.exp @@ -15,7 +15,7 @@ # Test the printing of element indices in C++ arrays. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests set lang c++ diff --git a/gdb/testsuite/gdb.cp/array-repeat.exp b/gdb/testsuite/gdb.cp/array-repeat.exp index dac0c68..8c71149 100644 --- a/gdb/testsuite/gdb.cp/array-repeat.exp +++ b/gdb/testsuite/gdb.cp/array-repeat.exp @@ -15,7 +15,7 @@ # Test the detection and printing of repeated elements in C++ arrays. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests set lang c++ diff --git a/gdb/testsuite/gdb.cp/bool.exp b/gdb/testsuite/gdb.cp/bool.exp index 350c654..27f3532 100644 --- a/gdb/testsuite/gdb.cp/bool.exp +++ b/gdb/testsuite/gdb.cp/bool.exp @@ -20,7 +20,7 @@ # Test returning bool. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/break-f-std-string.exp b/gdb/testsuite/gdb.cp/break-f-std-string.exp index f687416..57006f0 100644 --- a/gdb/testsuite/gdb.cp/break-f-std-string.exp +++ b/gdb/testsuite/gdb.cp/break-f-std-string.exp @@ -58,7 +58,7 @@ standard_testfile .cc -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests # CXX11_ABI specifies the value to define _GLIBCXX_USE_CXX11_ABI as. diff --git a/gdb/testsuite/gdb.cp/breakpoint-locs.exp b/gdb/testsuite/gdb.cp/breakpoint-locs.exp index 18b03a0..af1711c 100644 --- a/gdb/testsuite/gdb.cp/breakpoint-locs.exp +++ b/gdb/testsuite/gdb.cp/breakpoint-locs.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc breakpoint-locs-2.cc diff --git a/gdb/testsuite/gdb.cp/breakpoint.exp b/gdb/testsuite/gdb.cp/breakpoint.exp index 2d1040d..46762fc 100644 --- a/gdb/testsuite/gdb.cp/breakpoint.exp +++ b/gdb/testsuite/gdb.cp/breakpoint.exp @@ -17,7 +17,7 @@ # This contains tests for breakpoints in C++. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/call-c.exp b/gdb/testsuite/gdb.cp/call-c.exp index 15c1360..9fdbd00 100644 --- a/gdb/testsuite/gdb.cp/call-c.exp +++ b/gdb/testsuite/gdb.cp/call-c.exp @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc call-c-1.c set objfilec [standard_output_file ${testfile}-1.o] diff --git a/gdb/testsuite/gdb.cp/call-method-register.exp b/gdb/testsuite/gdb.cp/call-method-register.exp index 627403f..6f0f521 100644 --- a/gdb/testsuite/gdb.cp/call-method-register.exp +++ b/gdb/testsuite/gdb.cp/call-method-register.exp @@ -16,7 +16,7 @@ # Test callling a method on a variable that has been put in a # register. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests load_lib "cp-support.exp" load_lib dwarf.exp diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp index a13f662..35305d7 100644 --- a/gdb/testsuite/gdb.cp/casts.exp +++ b/gdb/testsuite/gdb.cp/casts.exp @@ -25,7 +25,7 @@ # -if { [skip_cplus_tests] } { return } +require !skip_cplus_tests standard_testfile .cc casts03.cc diff --git a/gdb/testsuite/gdb.cp/chained-calls.exp b/gdb/testsuite/gdb.cp/chained-calls.exp index d131345..f147b36 100644 --- a/gdb/testsuite/gdb.cp/chained-calls.exp +++ b/gdb/testsuite/gdb.cp/chained-calls.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp index 6270be4..ea7cdf1 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp index d23c7d3..de7fa2e 100644 --- a/gdb/testsuite/gdb.cp/classes.exp +++ b/gdb/testsuite/gdb.cp/classes.exp @@ -18,7 +18,7 @@ set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp index 6433ccb..70779ce 100644 --- a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp +++ b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp @@ -17,7 +17,7 @@ # This file is part of the gdb testsuite. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests # Tests for c++/12273, breakpoint/12803 standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/constexpr-field.exp b/gdb/testsuite/gdb.cp/constexpr-field.exp index 14801d3..387636f 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]} { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp index d46bf76..3846aa2 100644 --- a/gdb/testsuite/gdb.cp/cp-relocate.exp +++ b/gdb/testsuite/gdb.cp/cp-relocate.exp @@ -18,7 +18,7 @@ standard_testfile .cc append binfile .o -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {c++ debug}] != "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp index 931f376..9d93d59 100644 --- a/gdb/testsuite/gdb.cp/cpcompletion.exp +++ b/gdb/testsuite/gdb.cp/cpcompletion.exp @@ -51,7 +51,7 @@ proc test_class_complete {class expr name matches} { } } -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile pr9594.cc diff --git a/gdb/testsuite/gdb.cp/cplabel.exp b/gdb/testsuite/gdb.cp/cplabel.exp index 4c67cde..c29b47c 100644 --- a/gdb/testsuite/gdb.cp/cplabel.exp +++ b/gdb/testsuite/gdb.cp/cplabel.exp @@ -15,7 +15,7 @@ # Tests for breakpoint on labels in methods. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp index b3d798b..f197e11 100644 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp @@ -16,7 +16,7 @@ # This file was written by Fred Fish. (fnf@cygnus.com) # Adapted for g++ 3.0 ABI by Michael Chastain. (chastain@redhat.com) -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/cpsizeof.exp b/gdb/testsuite/gdb.cp/cpsizeof.exp index c452b57..d235528 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]} { return } +require !skip_cplus_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] } { return -1 diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp index 966c749..a7cb988 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] } { return } +require !skip_cplus_tests standard_testfile cttiadd.cc cttiadd1.cc cttiadd2.cc cttiadd3.cc diff --git a/gdb/testsuite/gdb.cp/debug-expr.exp b/gdb/testsuite/gdb.cp/debug-expr.exp index a7938a4..300818e 100644 --- a/gdb/testsuite/gdb.cp/debug-expr.exp +++ b/gdb/testsuite/gdb.cp/debug-expr.exp @@ -15,7 +15,7 @@ # Test "set debug expr 1" on c++ expressions. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests gdb_start gdb_test_no_output "set language c++" diff --git a/gdb/testsuite/gdb.cp/demangle.exp b/gdb/testsuite/gdb.cp/demangle.exp index 3093640..28a0fe8 100644 --- a/gdb/testsuite/gdb.cp/demangle.exp +++ b/gdb/testsuite/gdb.cp/demangle.exp @@ -15,7 +15,7 @@ # This file was written by Fred Fish. (fnf@cygnus.com) -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests ### The demangling style we last sent to GDB. set current_demangling_style none diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp index 2f7dd4c..bb482e6 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] } { return } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/disasm-func-name.exp b/gdb/testsuite/gdb.cp/disasm-func-name.exp index ba4296d..3b8773f 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]} { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/dispcxx.exp b/gdb/testsuite/gdb.cp/dispcxx.exp index 5ae2a22..c079b0c 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/ena-dis-br-range.exp b/gdb/testsuite/gdb.cp/ena-dis-br-range.exp index 94f94e6..a8042c4 100644 --- a/gdb/testsuite/gdb.cp/ena-dis-br-range.exp +++ b/gdb/testsuite/gdb.cp/ena-dis-br-range.exp @@ -21,7 +21,7 @@ # multiple locations and breakpoints are found in # gdb.base/ena-dis-br.exp. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/enum-class.exp b/gdb/testsuite/gdb.cp/enum-class.exp index 67e8656..badc2dc 100644 --- a/gdb/testsuite/gdb.cp/enum-class.exp +++ b/gdb/testsuite/gdb.cp/enum-class.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/exceptprint.exp b/gdb/testsuite/gdb.cp/exceptprint.exp index 49fe02f..7e19d42 100644 --- a/gdb/testsuite/gdb.cp/exceptprint.exp +++ b/gdb/testsuite/gdb.cp/exceptprint.exp @@ -15,9 +15,7 @@ standard_testfile .cc -if {[skip_cplus_tests]} { - return -1 -} +require !skip_cplus_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp index 0d74571..deb9c94 100644 --- a/gdb/testsuite/gdb.cp/expand-sals.exp +++ b/gdb/testsuite/gdb.cp/expand-sals.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 } +require !skip_cplus_tests set srcfile expand-sals.cc if { [prepare_for_testing "failed to prepare" expand-sals $srcfile {debug c++}] } { diff --git a/gdb/testsuite/gdb.cp/extern-c.exp b/gdb/testsuite/gdb.cp/extern-c.exp index bdc8697..f380e90 100644 --- a/gdb/testsuite/gdb.cp/extern-c.exp +++ b/gdb/testsuite/gdb.cp/extern-c.exp @@ -15,7 +15,7 @@ # Test breakpoints on extern "C" functions implemented in C++. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/filename.exp b/gdb/testsuite/gdb.cp/filename.exp index 54cf4d1..f34f162 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/formatted-ref.exp b/gdb/testsuite/gdb.cp/formatted-ref.exp index a9494d8..0793963 100644 --- a/gdb/testsuite/gdb.cp/formatted-ref.exp +++ b/gdb/testsuite/gdb.cp/formatted-ref.exp @@ -28,7 +28,7 @@ # operand. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp index 724a251..1dda4c9 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/gdb2384.exp b/gdb/testsuite/gdb.cp/gdb2384.exp index 3e43d1d..6eb6292 100644 --- a/gdb/testsuite/gdb.cp/gdb2384.exp +++ b/gdb/testsuite/gdb.cp/gdb2384.exp @@ -21,8 +21,7 @@ # # PR c++/9489. -if { [skip_cplus_tests] } { continue } -if { [skip_shlib_tests] } { continue } +require !skip_cplus_tests !skip_shlib_tests standard_testfile .cc gdb2384-base.cc diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp index 639cee3..5d9cedb 100644 --- a/gdb/testsuite/gdb.cp/gdb2495.exp +++ b/gdb/testsuite/gdb.cp/gdb2495.exp @@ -31,7 +31,7 @@ # This test is largely based of gdb.base/callfuncs.exp. -if { [skip_cplus_tests] } { return } +require !skip_cplus_tests if [target_info exists gdb,nosignals] { verbose "Skipping gdb2495.exp because of nosignals." diff --git a/gdb/testsuite/gdb.cp/hang.exp b/gdb/testsuite/gdb.cp/hang.exp index e4ff996..95a0424 100644 --- a/gdb/testsuite/gdb.cp/hang.exp +++ b/gdb/testsuite/gdb.cp/hang.exp @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile hang1.cc hang2.cc hang3.cc diff --git a/gdb/testsuite/gdb.cp/impl-this.exp b/gdb/testsuite/gdb.cp/impl-this.exp index a37a8c6..14c3cb4 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]} { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/incomplete-type-overload.exp b/gdb/testsuite/gdb.cp/incomplete-type-overload.exp index a2b60e5..5dfd671 100644 --- a/gdb/testsuite/gdb.cp/incomplete-type-overload.exp +++ b/gdb/testsuite/gdb.cp/incomplete-type-overload.exp @@ -20,9 +20,7 @@ load_lib dwarf.exp -if { [skip_cplus_tests] } { return } - -require dwarf2_support +require dwarf2_support !skip_cplus_tests standard_testfile .cc .S set asm_file [standard_output_file ${srcfile2}] diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp index c4636a7..6d1d330 100644 --- a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp +++ b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d0.exp @@ -15,9 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Only test C++ if we are able. Always use C. -if { [skip_cplus_tests] } { - return -1 -} +require !skip_cplus_tests set lang {c++} set debug nodebug diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp index 5313e95..baf0559 100644 --- a/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp +++ b/gdb/testsuite/gdb.cp/infcall-nodebug-c++-d1.exp @@ -15,9 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Only test C++ if we are able. Always use C. -if { [skip_cplus_tests] } { - return -1 -} +require !skip_cplus_tests set lang {c++} set debug debug diff --git a/gdb/testsuite/gdb.cp/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp index 55c9644..1846125 100644 --- a/gdb/testsuite/gdb.cp/inherit.exp +++ b/gdb/testsuite/gdb.cp/inherit.exp @@ -20,7 +20,7 @@ set ws "\[\r\n\t \]+" set nl "\[\r\n\]+" set vhn "\\$\[0-9\]+" -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/iostream.exp b/gdb/testsuite/gdb.cp/iostream.exp index 38fd5832f..afd54d1 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp index 1180154..a281019 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp index 3f3706d..1578b6f 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index 97a5645..6dbb171 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/many-args.exp b/gdb/testsuite/gdb.cp/many-args.exp index 5c4a6bb..2751c00 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/mb-ctor.exp b/gdb/testsuite/gdb.cp/mb-ctor.exp index be6297c8..2f86c80 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp index eb54db8..cf13935 100644 --- a/gdb/testsuite/gdb.cp/mb-inline.exp +++ b/gdb/testsuite/gdb.cp/mb-inline.exp @@ -18,7 +18,7 @@ # This test verifies that setting breakpoint on line in inline # function will fire in all instantiations of that function. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile mb-inline1.cc mb-inline2.cc set hdrfile "${testfile}.h" diff --git a/gdb/testsuite/gdb.cp/member-name.exp b/gdb/testsuite/gdb.cp/member-name.exp index 2940342..90fa097 100644 --- a/gdb/testsuite/gdb.cp/member-name.exp +++ b/gdb/testsuite/gdb.cp/member-name.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 } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp index ad703e0..0807627 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/meth-typedefs.exp b/gdb/testsuite/gdb.cp/meth-typedefs.exp index 5ae29f5..174f89b 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]} { return } +require !skip_cplus_tests # Tests for c++/12266 et al standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp index bf65ce7..d4bb6fb 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp index 36a5662..04a064b 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/misc.exp b/gdb/testsuite/gdb.cp/misc.exp index 350061e..8f14d48 100644 --- a/gdb/testsuite/gdb.cp/misc.exp +++ b/gdb/testsuite/gdb.cp/misc.exp @@ -15,7 +15,7 @@ # This file was written by Fred Fish. (fnf@cygnus.com) -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/namelessclass.exp b/gdb/testsuite/gdb.cp/namelessclass.exp index bf4748c..6f6f7d2 100644 --- a/gdb/testsuite/gdb.cp/namelessclass.exp +++ b/gdb/testsuite/gdb.cp/namelessclass.exp @@ -19,12 +19,8 @@ load_lib dwarf.exp # Do not run in environments which do not support C++. -if {[skip_cplus_tests]} { - return -} - # This test can only be run on x86-like targets which support DWARF. -require dwarf2_support +require dwarf2_support !skip_cplus_tests if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { return 0 diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp index acdbc99..ed7943f 100644 --- a/gdb/testsuite/gdb.cp/namespace.exp +++ b/gdb/testsuite/gdb.cp/namespace.exp @@ -25,7 +25,7 @@ -if { [skip_cplus_tests] } { return } +require !skip_cplus_tests standard_testfile .cc namespace1.cc diff --git a/gdb/testsuite/gdb.cp/nested-class-func-class.exp b/gdb/testsuite/gdb.cp/nested-class-func-class.exp index 91a8d51..1b83f7b 100644 --- a/gdb/testsuite/gdb.cp/nested-class-func-class.exp +++ b/gdb/testsuite/gdb.cp/nested-class-func-class.exp @@ -15,7 +15,7 @@ # Regression test for type printing of private nested classes. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/nested-types.exp b/gdb/testsuite/gdb.cp/nested-types.exp index 3901ec9..889d6d7 100644 --- a/gdb/testsuite/gdb.cp/nested-types.exp +++ b/gdb/testsuite/gdb.cp/nested-types.exp @@ -19,7 +19,7 @@ # the corresponding source file. It then walks the nodes of this tree # to construct input suitable for passing to cp_test_ptype_class. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp index 9139671..e6565ad 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/no-libstdcxx-probe.exp b/gdb/testsuite/gdb.cp/no-libstdcxx-probe.exp index 5e3a370..3d7ef3a 100644 --- a/gdb/testsuite/gdb.cp/no-libstdcxx-probe.exp +++ b/gdb/testsuite/gdb.cp/no-libstdcxx-probe.exp @@ -15,9 +15,7 @@ standard_testfile exceptprint.cc -if {[skip_cplus_tests]} { - return -1 -} +require !skip_cplus_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 diff --git a/gdb/testsuite/gdb.cp/non-trivial-retval.exp b/gdb/testsuite/gdb.cp/non-trivial-retval.exp index 74427c0..9b8c5b1 100644 --- a/gdb/testsuite/gdb.cp/non-trivial-retval.exp +++ b/gdb/testsuite/gdb.cp/non-trivial-retval.exp @@ -17,7 +17,7 @@ set additional_flags "" -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/nsalias.exp b/gdb/testsuite/gdb.cp/nsalias.exp index 19a36b8..3c2f5e5 100644 --- a/gdb/testsuite/gdb.cp/nsalias.exp +++ b/gdb/testsuite/gdb.cp/nsalias.exp @@ -18,11 +18,7 @@ load_lib dwarf.exp -require dwarf2_support - -if {[skip_cplus_tests]} { - return -} +require dwarf2_support !skip_cplus_tests standard_testfile .cc nsalias-dw.S diff --git a/gdb/testsuite/gdb.cp/overload-const.exp b/gdb/testsuite/gdb.cp/overload-const.exp index 120945c..8ed9c68 100644 --- a/gdb/testsuite/gdb.cp/overload-const.exp +++ b/gdb/testsuite/gdb.cp/overload-const.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/overload.exp b/gdb/testsuite/gdb.cp/overload.exp index 8c0ecb5..ed265fb 100644 --- a/gdb/testsuite/gdb.cp/overload.exp +++ b/gdb/testsuite/gdb.cp/overload.exp @@ -24,7 +24,7 @@ set ws "\[\r\n\t \]+" set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp index 12a6722..a671499 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp index 454c020..f13c2ee 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] } { return } +require !skip_cplus_tests # Test for c++/11734 standard_testfile ovsrch1.cc ovsrch2.cc ovsrch3.cc ovsrch4.cc diff --git a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp index e45d556..62ae6b7 100644 --- a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp +++ b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp @@ -25,10 +25,7 @@ # - have inlined copy ctor # - have deleted destructor -if {[skip_cplus_tests]} { - untested "c++ test skipped" - return -} +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/pass-by-ref.exp b/gdb/testsuite/gdb.cp/pass-by-ref.exp index ecf5899..5424bce 100644 --- a/gdb/testsuite/gdb.cp/pass-by-ref.exp +++ b/gdb/testsuite/gdb.cp/pass-by-ref.exp @@ -68,10 +68,7 @@ # The companion test file pass-by-ref-2.exp also contains # manually-written cases. -if {[skip_cplus_tests]} { - untested "c++ test skipped" - return -} +require !skip_cplus_tests # The program source is generated in the output directory. # We use standard_testfile here to set convenience variables. diff --git a/gdb/testsuite/gdb.cp/pointer-to-member.exp b/gdb/testsuite/gdb.cp/pointer-to-member.exp index 56dedca..b69edb1 100644 --- a/gdb/testsuite/gdb.cp/pointer-to-member.exp +++ b/gdb/testsuite/gdb.cp/pointer-to-member.exp @@ -17,7 +17,7 @@ # Test printing c++ pointer-to-member. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp index 87af3ff..3ed8f31 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp index 84fb1cc..021710f 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp index ad8b296..2ea8210 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp index 07570ac..5fbbace 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] } { return } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/pr17132.exp b/gdb/testsuite/gdb.cp/pr17132.exp index fb4f872..fb9e739 100644 --- a/gdb/testsuite/gdb.cp/pr17132.exp +++ b/gdb/testsuite/gdb.cp/pr17132.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/pr17494.exp b/gdb/testsuite/gdb.cp/pr17494.exp index 103cff6..48a5c2b 100644 --- a/gdb/testsuite/gdb.cp/pr17494.exp +++ b/gdb/testsuite/gdb.cp/pr17494.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/pr9067.exp b/gdb/testsuite/gdb.cp/pr9067.exp index 5635b0d..cde7b20 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] } { return } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/pr9631.exp b/gdb/testsuite/gdb.cp/pr9631.exp index 888eef5..3a9e0af 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/print-demangle.exp b/gdb/testsuite/gdb.cp/print-demangle.exp index fbfbb95..733cd4e 100644 --- a/gdb/testsuite/gdb.cp/print-demangle.exp +++ b/gdb/testsuite/gdb.cp/print-demangle.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 } +require !skip_cplus_tests standard_testfile bool.cc diff --git a/gdb/testsuite/gdb.cp/print-method-args.exp b/gdb/testsuite/gdb.cp/print-method-args.exp index 8e711e0..8c5d5e2 100644 --- a/gdb/testsuite/gdb.cp/print-method-args.exp +++ b/gdb/testsuite/gdb.cp/print-method-args.exp @@ -17,7 +17,7 @@ # This test checks that a constructor and destructor are printed the same. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp index a7cf305..0cdb271 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/psmang.exp b/gdb/testsuite/gdb.cp/psmang.exp index a27a3f4..ba3e756 100644 --- a/gdb/testsuite/gdb.cp/psmang.exp +++ b/gdb/testsuite/gdb.cp/psmang.exp @@ -176,7 +176,7 @@ # -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile psmang1.cc psmang2.cc diff --git a/gdb/testsuite/gdb.cp/psymtab-parameter.exp b/gdb/testsuite/gdb.cp/psymtab-parameter.exp index 9910d88..ad64df6 100644 --- a/gdb/testsuite/gdb.cp/psymtab-parameter.exp +++ b/gdb/testsuite/gdb.cp/psymtab-parameter.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 } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/ptype-cv-cp.exp b/gdb/testsuite/gdb.cp/ptype-cv-cp.exp index 5865d98..4f0a6d9 100644 --- a/gdb/testsuite/gdb.cp/ptype-cv-cp.exp +++ b/gdb/testsuite/gdb.cp/ptype-cv-cp.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/ptype-flags.exp b/gdb/testsuite/gdb.cp/ptype-flags.exp index 02eff4a..e09447e 100644 --- a/gdb/testsuite/gdb.cp/ptype-flags.exp +++ b/gdb/testsuite/gdb.cp/ptype-flags.exp @@ -15,7 +15,7 @@ set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/punctuator.exp b/gdb/testsuite/gdb.cp/punctuator.exp index 4157182..6243372 100644 --- a/gdb/testsuite/gdb.cp/punctuator.exp +++ b/gdb/testsuite/gdb.cp/punctuator.exp @@ -17,7 +17,7 @@ # This file is part of the gdb testsuite -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests gdb_exit gdb_start diff --git a/gdb/testsuite/gdb.cp/re-set-overloaded.exp b/gdb/testsuite/gdb.cp/re-set-overloaded.exp index d083b41..d309c46 100644 --- a/gdb/testsuite/gdb.cp/re-set-overloaded.exp +++ b/gdb/testsuite/gdb.cp/re-set-overloaded.exp @@ -13,8 +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_shlib_tests] } { continue } +require !skip_cplus_tests !skip_shlib_tests standard_testfile bool.cc .cc diff --git a/gdb/testsuite/gdb.cp/ref-params.exp b/gdb/testsuite/gdb.cp/ref-params.exp index 7d728bd..b4c6cee 100644 --- a/gdb/testsuite/gdb.cp/ref-params.exp +++ b/gdb/testsuite/gdb.cp/ref-params.exp @@ -20,7 +20,7 @@ # test running programs # -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp index 05b3f68..c1b9866 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp index 8955cd6..0832053 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] } { return } +require !skip_cplus_tests # # test running programs diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp b/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp index 40be1b9..f1399ef 100644 --- a/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp +++ b/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp @@ -17,7 +17,7 @@ # C++11 rvalue reference type casting tests, based on gdb.cp/casts.exp. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-overload.exp b/gdb/testsuite/gdb.cp/rvalue-ref-overload.exp index 86e14a8..94ac384 100644 --- a/gdb/testsuite/gdb.cp/rvalue-ref-overload.exp +++ b/gdb/testsuite/gdb.cp/rvalue-ref-overload.exp @@ -18,7 +18,7 @@ # Tests for overloaded member functions with rvalue reference parameters, # based on gdb.cp/overload.exp. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-params.exp b/gdb/testsuite/gdb.cp/rvalue-ref-params.exp index f83d01b..46c32ce 100644 --- a/gdb/testsuite/gdb.cp/rvalue-ref-params.exp +++ b/gdb/testsuite/gdb.cp/rvalue-ref-params.exp @@ -16,7 +16,7 @@ # Tests for rvalue reference parameters of types and their subtypes in GDB, # based on gdb.cp/ref-params.exp. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp b/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp index 118cc16..52e8c68 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]} { return } +require !skip_cplus_tests if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \ {debug c++ additional_flags="-std=gnu++11"}] } { diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp index 3f94b79..f2963be 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/scope-err.exp b/gdb/testsuite/gdb.cp/scope-err.exp index 1ec8d60..e2dec73 100644 --- a/gdb/testsuite/gdb.cp/scope-err.exp +++ b/gdb/testsuite/gdb.cp/scope-err.exp @@ -16,9 +16,7 @@ # Tests for linespec errors with C++. # Derived from gdb.linespec/ls-errs.exp. -if {[skip_cplus_tests]} { - return -} +require !skip_cplus_tests standard_testfile .cc set exefile $testfile diff --git a/gdb/testsuite/gdb.cp/static-method.exp b/gdb/testsuite/gdb.cp/static-method.exp index 3180e28..282b5b7 100644 --- a/gdb/testsuite/gdb.cp/static-method.exp +++ b/gdb/testsuite/gdb.cp/static-method.exp @@ -37,7 +37,7 @@ proc test_breakpoint {func result} { } } -if {[skip_cplus_tests]} { return } +require !skip_cplus_tests # Tests for c++/12750 standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/static-print-quit.exp b/gdb/testsuite/gdb.cp/static-print-quit.exp index ba8e35b..f7f3ec0 100644 --- a/gdb/testsuite/gdb.cp/static-print-quit.exp +++ b/gdb/testsuite/gdb.cp/static-print-quit.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 } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/static-typedef-print.exp b/gdb/testsuite/gdb.cp/static-typedef-print.exp index f72314d..91fa658 100644 --- a/gdb/testsuite/gdb.cp/static-typedef-print.exp +++ b/gdb/testsuite/gdb.cp/static-typedef-print.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 } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/stub-array-size.exp b/gdb/testsuite/gdb.cp/stub-array-size.exp index f78308d..9492c47 100644 --- a/gdb/testsuite/gdb.cp/stub-array-size.exp +++ b/gdb/testsuite/gdb.cp/stub-array-size.exp @@ -18,7 +18,7 @@ # Test size of arrays of stubbed types (structures where the full definition # is not immediately available). -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc stub-array-size2.cc diff --git a/gdb/testsuite/gdb.cp/subtypes.exp b/gdb/testsuite/gdb.cp/subtypes.exp index 7dfec3e..67372c5 100644 --- a/gdb/testsuite/gdb.cp/subtypes.exp +++ b/gdb/testsuite/gdb.cp/subtypes.exp @@ -16,7 +16,7 @@ # Test for subtype definitions, i.e., types defined in classes, functions, # etc. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp index 7459d50..4d7677e 100644 --- a/gdb/testsuite/gdb.cp/temargs.exp +++ b/gdb/testsuite/gdb.cp/temargs.exp @@ -17,9 +17,7 @@ # This file is part of the gdb testsuite. -if {[skip_cplus_tests]} { - return -} +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp index e461b94..41709b5 100644 --- a/gdb/testsuite/gdb.cp/templates.exp +++ b/gdb/testsuite/gdb.cp/templates.exp @@ -17,7 +17,7 @@ set ws "\[\r\n\t \]+" -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/typed-enum.exp b/gdb/testsuite/gdb.cp/typed-enum.exp index 424c70a..ad6aa29 100644 --- a/gdb/testsuite/gdb.cp/typed-enum.exp +++ b/gdb/testsuite/gdb.cp/typed-enum.exp @@ -15,7 +15,7 @@ # # Check if unsigned typedef are handled correctly with typed enums. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/typedef-base.exp b/gdb/testsuite/gdb.cp/typedef-base.exp index ef6f83b..7a0d5f2 100644 --- a/gdb/testsuite/gdb.cp/typedef-base.exp +++ b/gdb/testsuite/gdb.cp/typedef-base.exp @@ -15,7 +15,7 @@ # # Make sure that inheritance through a typedef is well handled. -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/typedef-operator.exp b/gdb/testsuite/gdb.cp/typedef-operator.exp index 96fd9f1..f0cfc4b 100644 --- a/gdb/testsuite/gdb.cp/typedef-operator.exp +++ b/gdb/testsuite/gdb.cp/typedef-operator.exp @@ -15,7 +15,7 @@ # This file is part of the gdb testsuite. -if {[skip_cplus_tests]} { continue } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/typeid.exp b/gdb/testsuite/gdb.cp/typeid.exp index 66e345a..b4766d0 100644 --- a/gdb/testsuite/gdb.cp/typeid.exp +++ b/gdb/testsuite/gdb.cp/typeid.exp @@ -15,9 +15,7 @@ standard_testfile .cc -if {[skip_cplus_tests]} { - return -1 -} +require !skip_cplus_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp index 0ddfd1a..aa61598 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]} { return } +require !skip_cplus_tests standard_testfile var-tag.cc var-tag-2.cc var-tag-3.cc var-tag-4.cc diff --git a/gdb/testsuite/gdb.cp/virtbase.exp b/gdb/testsuite/gdb.cp/virtbase.exp index 4cc7994..8408235 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/virtbase2.exp b/gdb/testsuite/gdb.cp/virtbase2.exp index d15e009..9b18f59 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] } { return } +require !skip_cplus_tests standard_testfile .cc diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp index 7ca24cb..89c5b6d 100644 --- a/gdb/testsuite/gdb.cp/virtfunc.exp +++ b/gdb/testsuite/gdb.cp/virtfunc.exp @@ -18,7 +18,7 @@ set nl "\[\r\n\]+" -if { [skip_cplus_tests] } { continue } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/virtfunc2.exp b/gdb/testsuite/gdb.cp/virtfunc2.exp index 5e72454..de9ed11 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] } { return } +require !skip_cplus_tests load_lib "cp-support.exp" diff --git a/gdb/testsuite/gdb.cp/watch-cp.exp b/gdb/testsuite/gdb.cp/watch-cp.exp index 64694c6..62429f7 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]} { return } +require !skip_cplus_tests !skip_hw_watchpoint_tests standard_testfile .cc |