| Message ID | 20230112030052.3306113-14-tom@tromey.com |
|---|---|
| State | Committed |
| Headers | |
| Series | Rewrite "require" test procedure and use it more often | |
Commit Message
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp index 58e1eccf27c..8f6c0aa75dc 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp @@ -24,9 +24,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { } # It requires fortran. -if {[skip_fortran_tests]} { - return 0 -} +require !skip_fortran_tests standard_testfile .S diff --git a/gdb/testsuite/gdb.fortran/allocated.exp b/gdb/testsuite/gdb.fortran/allocated.exp index ff054d29e72..d4aba5e2585 100644 --- a/gdb/testsuite/gdb.fortran/allocated.exp +++ b/gdb/testsuite/gdb.fortran/allocated.exp @@ -15,7 +15,7 @@ # Testing GDB's implementation of ALLOCATED keyword. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/array-bounds-high.exp b/gdb/testsuite/gdb.fortran/array-bounds-high.exp index f9b30e9a4df..25023ebace5 100644 --- a/gdb/testsuite/gdb.fortran/array-bounds-high.exp +++ b/gdb/testsuite/gdb.fortran/array-bounds-high.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. It contains test to ensure that # array bounds accept LONGEST. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests set testfile "array-bounds-high" standard_testfile .f90 diff --git a/gdb/testsuite/gdb.fortran/array-bounds.exp b/gdb/testsuite/gdb.fortran/array-bounds.exp index b4b9e2954ab..0903d9ed7a0 100644 --- a/gdb/testsuite/gdb.fortran/array-bounds.exp +++ b/gdb/testsuite/gdb.fortran/array-bounds.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. It contains test to ensure that # array bounds accept LONGEST. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests set testfile "array-bounds" standard_testfile .f90 diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gdb.fortran/array-element.exp index 5f663fe9d13..1902329fc94 100644 --- a/gdb/testsuite/gdb.fortran/array-element.exp +++ b/gdb/testsuite/gdb.fortran/array-element.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite. It contains test for printing # the elements of an array which is passed as pointer to a subroutine. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f diff --git a/gdb/testsuite/gdb.fortran/array-indices.exp b/gdb/testsuite/gdb.fortran/array-indices.exp index 64d1270d510..299bf3417b6 100644 --- a/gdb/testsuite/gdb.fortran/array-indices.exp +++ b/gdb/testsuite/gdb.fortran/array-indices.exp @@ -15,7 +15,7 @@ # Test the printing of element indices in Fortran arrays. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/array-no-bounds.exp b/gdb/testsuite/gdb.fortran/array-no-bounds.exp index 9ae2851a2db..126cea76ccb 100644 --- a/gdb/testsuite/gdb.fortran/array-no-bounds.exp +++ b/gdb/testsuite/gdb.fortran/array-no-bounds.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. It contains test to ensure that # array bounds accept LONGEST. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/array-repeat.exp b/gdb/testsuite/gdb.fortran/array-repeat.exp index 5cb92cc6c86..90b48a398d6 100644 --- a/gdb/testsuite/gdb.fortran/array-repeat.exp +++ b/gdb/testsuite/gdb.fortran/array-repeat.exp @@ -15,7 +15,7 @@ # Test the detection and printing of repeated elements in Fortran arrays. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/array-slices-bad.exp b/gdb/testsuite/gdb.fortran/array-slices-bad.exp index f54e412eecc..f49154b9c6a 100644 --- a/gdb/testsuite/gdb.fortran/array-slices-bad.exp +++ b/gdb/testsuite/gdb.fortran/array-slices-bad.exp @@ -15,7 +15,7 @@ # Test invalid element and slice array accesses. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp index 1724e71957f..832aefc0954 100644 --- a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp +++ b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp @@ -15,7 +15,7 @@ # Create a slice of an array, then take a slice of that slice. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp index 80f6cc122df..8fab57e13e7 100644 --- a/gdb/testsuite/gdb.fortran/array-slices.exp +++ b/gdb/testsuite/gdb.fortran/array-slices.exp @@ -33,7 +33,7 @@ # debug information) matches the size of the slice manually extracted # by GDB. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests # This test relies on output from the inferior. if [target_info exists gdb,noinferiorio] { diff --git a/gdb/testsuite/gdb.fortran/associated.exp b/gdb/testsuite/gdb.fortran/associated.exp index 9ba2b048503..1acc40027c0 100644 --- a/gdb/testsuite/gdb.fortran/associated.exp +++ b/gdb/testsuite/gdb.fortran/associated.exp @@ -15,7 +15,7 @@ # Testing GDB's implementation of ASSOCIATED keyword. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/assumedrank.exp b/gdb/testsuite/gdb.fortran/assumedrank.exp index fbd43fd0d73..a1e59903014 100644 --- a/gdb/testsuite/gdb.fortran/assumedrank.exp +++ b/gdb/testsuite/gdb.fortran/assumedrank.exp @@ -15,7 +15,7 @@ # Testing GDB's implementation of ASSUMED RANK arrays. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.fortran/block-data.exp index 533d7807ad6..6f51fce3ddc 100644 --- a/gdb/testsuite/gdb.fortran/block-data.exp +++ b/gdb/testsuite/gdb.fortran/block-data.exp @@ -21,7 +21,7 @@ # outputs nameless DW_TAG_module, unlike with gfortran which just # doesn't emit DW_TAG_module in this case. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.fortran/call-no-debug.exp b/gdb/testsuite/gdb.fortran/call-no-debug.exp index c69019643be..d17eb4a5db3 100644 --- a/gdb/testsuite/gdb.fortran/call-no-debug.exp +++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp @@ -16,7 +16,7 @@ # Test calling Fortran functions that are compiled without debug # information. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile call-no-debug-prog.f90 call-no-debug-func.f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/charset.exp b/gdb/testsuite/gdb.fortran/charset.exp index 02e273e9a51..1a860964782 100644 --- a/gdb/testsuite/gdb.fortran/charset.exp +++ b/gdb/testsuite/gdb.fortran/charset.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. It contains tests for evaluating # Fortran subarray expression. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp index 0b8b10e7be5..76a848c7711 100644 --- a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp +++ b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp @@ -16,7 +16,7 @@ # Test that GDB can print an allocatable array that is a data field # within a class like type. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/common-block.exp b/gdb/testsuite/gdb.fortran/common-block.exp index 0b00db81675..b551bbd428b 100644 --- a/gdb/testsuite/gdb.fortran/common-block.exp +++ b/gdb/testsuite/gdb.fortran/common-block.exp @@ -15,9 +15,7 @@ # This file was written by Jan Kratochvil <jan.kratochvil@redhat.com>. -if {[skip_fortran_tests]} { - return 0 -} +require !skip_fortran_tests standard_testfile .f90 load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.fortran/completion.exp b/gdb/testsuite/gdb.fortran/completion.exp index 18798e060c3..4ae6f9ae792 100644 --- a/gdb/testsuite/gdb.fortran/completion.exp +++ b/gdb/testsuite/gdb.fortran/completion.exp @@ -15,7 +15,7 @@ # Test tab completion of Fortran type field names. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp index 6b44aa2b462..708b73c3ca4 100644 --- a/gdb/testsuite/gdb.fortran/complex.exp +++ b/gdb/testsuite/gdb.fortran/complex.exp @@ -16,7 +16,7 @@ standard_testfile .f90 load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} { return -1 diff --git a/gdb/testsuite/gdb.fortran/debug-expr.exp b/gdb/testsuite/gdb.fortran/debug-expr.exp index 5d4c96bbec0..75324ac4607 100644 --- a/gdb/testsuite/gdb.fortran/debug-expr.exp +++ b/gdb/testsuite/gdb.fortran/debug-expr.exp @@ -15,7 +15,7 @@ # Test "set debug expr 1" on Fortran expressions. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. diff --git a/gdb/testsuite/gdb.fortran/derived-type-function.exp b/gdb/testsuite/gdb.fortran/derived-type-function.exp index 3ba18c23d86..d7fa4a0378b 100644 --- a/gdb/testsuite/gdb.fortran/derived-type-function.exp +++ b/gdb/testsuite/gdb.fortran/derived-type-function.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite. It contains tests for type-printing # and value-printing Fortran derived types having also functions. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/derived-type-striding.exp b/gdb/testsuite/gdb.fortran/derived-type-striding.exp index 92834375a2d..9a9a3ca8f3f 100644 --- a/gdb/testsuite/gdb.fortran/derived-type-striding.exp +++ b/gdb/testsuite/gdb.fortran/derived-type-striding.exp @@ -16,7 +16,7 @@ # Print some single dimensional integer arrays that will have a byte # stride in the debug information. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" diff --git a/gdb/testsuite/gdb.fortran/derived-type.exp b/gdb/testsuite/gdb.fortran/derived-type.exp index 5dae95f7f71..be7c1937d78 100644 --- a/gdb/testsuite/gdb.fortran/derived-type.exp +++ b/gdb/testsuite/gdb.fortran/derived-type.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite. It contains tests for type-printing # and value-printing Fortran derived types. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.fortran/dot-ops.exp b/gdb/testsuite/gdb.fortran/dot-ops.exp index b47c59db463..049008f90e0 100644 --- a/gdb/testsuite/gdb.fortran/dot-ops.exp +++ b/gdb/testsuite/gdb.fortran/dot-ops.exp @@ -18,7 +18,7 @@ load_lib "fortran.exp" -if { [skip_fortran_tests] } { continue } +require !skip_fortran_tests proc test_dot_operations {} { diff --git a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp b/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp index af11fa1d4c4..8fb0a6c6cb9 100644 --- a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp +++ b/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp @@ -16,7 +16,7 @@ # Test using whatis and ptype on different configurations of dynamic # types. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/empty-string.exp b/gdb/testsuite/gdb.fortran/empty-string.exp index 9a8ca91127f..07937741f15 100644 --- a/gdb/testsuite/gdb.fortran/empty-string.exp +++ b/gdb/testsuite/gdb.fortran/empty-string.exp @@ -15,7 +15,7 @@ # Test printing of an empty Fortran string. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/exprs.exp b/gdb/testsuite/gdb.fortran/exprs.exp index 3fb9aba5efe..44773cc3a3b 100644 --- a/gdb/testsuite/gdb.fortran/exprs.exp +++ b/gdb/testsuite/gdb.fortran/exprs.exp @@ -18,7 +18,7 @@ load_lib "fortran.exp" -if { [skip_fortran_tests] } { continue } +require !skip_fortran_tests proc test_integer_literals_accepted {} { global gdb_prompt diff --git a/gdb/testsuite/gdb.fortran/function-calls.exp b/gdb/testsuite/gdb.fortran/function-calls.exp index ab54ead1613..ef5e4e03b62 100644 --- a/gdb/testsuite/gdb.fortran/function-calls.exp +++ b/gdb/testsuite/gdb.fortran/function-calls.exp @@ -16,7 +16,7 @@ # Exercise passing and returning arguments in Fortran. This test case # is based on the GNU Fortran Argument passing conventions. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" diff --git a/gdb/testsuite/gdb.fortran/info-modules.exp b/gdb/testsuite/gdb.fortran/info-modules.exp index ff5fa3ba946..2992e9f2fd1 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] } { return } +require !skip_fortran_tests standard_testfile info-types.f90 info-types-2.f90 diff --git a/gdb/testsuite/gdb.fortran/info-types.exp b/gdb/testsuite/gdb.fortran/info-types.exp index 1cea93216e0..565c9cf5190 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] } { return } +require !skip_fortran_tests standard_testfile info-types.f90 info-types-2.f90 diff --git a/gdb/testsuite/gdb.fortran/intrinsics.exp b/gdb/testsuite/gdb.fortran/intrinsics.exp index 4f057faa57c..460f242e137 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] } { return } +require !skip_fortran_tests standard_testfile .f90 diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gdb.fortran/lbound-ubound.exp index aec3c351709..563d4b12024 100644 --- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp +++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp @@ -15,7 +15,7 @@ # Testing GDB's implementation of LBOUND and UBOUND. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".F90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp index 954fe2826f0..60a37a46361 100644 --- a/gdb/testsuite/gdb.fortran/library-module.exp +++ b/gdb/testsuite/gdb.fortran/library-module.exp @@ -15,7 +15,7 @@ load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile library-module-main.f90 set srclibfile ${testfile}-lib.f90 diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fortran/logical.exp index 8b2a1a74cb5..91ef4bc15be 100644 --- a/gdb/testsuite/gdb.fortran/logical.exp +++ b/gdb/testsuite/gdb.fortran/logical.exp @@ -18,7 +18,7 @@ standard_testfile .f90 load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} { return -1 diff --git a/gdb/testsuite/gdb.fortran/max-depth.exp b/gdb/testsuite/gdb.fortran/max-depth.exp index e4ea7bb123c..bbb3b2a21ed 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] } { return } +require !skip_fortran_tests standard_testfile .f90 diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp index 6538e16e566..a1614554556 100644 --- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp +++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp @@ -23,7 +23,7 @@ # each case to ensure that trying to print objects or types from one # language, while GDB's language is set to another, doesn't crash GDB. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile mixed-lang-stack.c mixed-lang-stack.cpp mixed-lang-stack.f90 diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp index 7c6984ee973..8c7e9957f14 100644 --- a/gdb/testsuite/gdb.fortran/module.exp +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -15,7 +15,7 @@ load_lib "fortran.exp" -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile .f90 diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp index 58b78dd3e1d..5646471e863 100644 --- a/gdb/testsuite/gdb.fortran/multi-dim.exp +++ b/gdb/testsuite/gdb.fortran/multi-dim.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. It contains tests for evaluating # Fortran subarray expression. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.fortran/namelist.exp index 1f5f5bc65c8..bf51e946292 100644 --- a/gdb/testsuite/gdb.fortran/namelist.exp +++ b/gdb/testsuite/gdb.fortran/namelist.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. It contains tests for fortran # namelist. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp index 32166ca871c..344745453cd 100644 --- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp @@ -15,7 +15,7 @@ # Further testing of placing breakpoints in nested subroutines. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests load_lib "fortran.exp" standard_testfile ".f90" diff --git a/gdb/testsuite/gdb.fortran/nested-funcs.exp b/gdb/testsuite/gdb.fortran/nested-funcs.exp index 374199349df..bf8915a2f38 100755 --- a/gdb/testsuite/gdb.fortran/nested-funcs.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs.exp @@ -16,7 +16,7 @@ # This testcase is supposed to test DWARF static link which is usually # used together with nested functions. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.fortran/oop_extend_type.exp b/gdb/testsuite/gdb.fortran/oop_extend_type.exp index 6f2924b4743..1ffa5a39fc3 100755 --- a/gdb/testsuite/gdb.fortran/oop_extend_type.exp +++ b/gdb/testsuite/gdb.fortran/oop_extend_type.exp @@ -16,9 +16,7 @@ standard_testfile ".f90" load_lib "fortran.exp" -if { [skip_fortran_tests] } { - return -1 -} +require !skip_fortran_tests if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp index 395789cb98b..a37ab3fedb1 100644 --- a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp +++ b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp @@ -15,7 +15,7 @@ # Test for GDB printing a pointer to a type containing a buffer. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp index c3b07134cf5..9d552afcc61 100644 --- a/gdb/testsuite/gdb.fortran/print-formatted.exp +++ b/gdb/testsuite/gdb.fortran/print-formatted.exp @@ -15,9 +15,7 @@ load_lib "fortran.exp" -if { [skip_fortran_tests] } { - return -} +require !skip_fortran_tests standard_testfile .f90 diff --git a/gdb/testsuite/gdb.fortran/print_type.exp b/gdb/testsuite/gdb.fortran/print_type.exp index e30d6a46fea..964b69ef948 100755 --- a/gdb/testsuite/gdb.fortran/print_type.exp +++ b/gdb/testsuite/gdb.fortran/print_type.exp @@ -19,7 +19,7 @@ standard_testfile "pointers.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/gdb.fortran/printing-types.exp index 098ccbd65e4..82ad7b753e4 100644 --- a/gdb/testsuite/gdb.fortran/printing-types.exp +++ b/gdb/testsuite/gdb.fortran/printing-types.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_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.exp b/gdb/testsuite/gdb.fortran/ptr-indentation.exp index 549d18e96e4..c420ccdc124 100644 --- a/gdb/testsuite/gdb.fortran/ptr-indentation.exp +++ b/gdb/testsuite/gdb.fortran/ptr-indentation.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_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp index 730d68ad95a..e52c70fb2a9 100644 --- a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp +++ b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp @@ -15,7 +15,7 @@ # This file contains a test for printing the types of functions. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f90 load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.fortran/rank.exp b/gdb/testsuite/gdb.fortran/rank.exp index 6e4bd011a28..e3e055b112f 100644 --- a/gdb/testsuite/gdb.fortran/rank.exp +++ b/gdb/testsuite/gdb.fortran/rank.exp @@ -15,7 +15,7 @@ # Testing GDB's implementation of RANK keyword. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/shape.exp b/gdb/testsuite/gdb.fortran/shape.exp index f203eff6666..2608e74946c 100644 --- a/gdb/testsuite/gdb.fortran/shape.exp +++ b/gdb/testsuite/gdb.fortran/shape.exp @@ -15,7 +15,7 @@ # Testing GDB's implementation of SHAPE keyword. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp index c116f80432a..b7aac47c6fe 100644 --- a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp +++ b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp @@ -17,7 +17,7 @@ # calls and substring operations that are to be skipped due to short # circuiting. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" diff --git a/gdb/testsuite/gdb.fortran/size.exp b/gdb/testsuite/gdb.fortran/size.exp index ce74296cb4b..e028455fc63 100644 --- a/gdb/testsuite/gdb.fortran/size.exp +++ b/gdb/testsuite/gdb.fortran/size.exp @@ -15,7 +15,7 @@ # Testing GDB's implementation of SIZE keyword. -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/string-types.exp b/gdb/testsuite/gdb.fortran/string-types.exp index f202c075422..f553fe592f9 100644 --- a/gdb/testsuite/gdb.fortran/string-types.exp +++ b/gdb/testsuite/gdb.fortran/string-types.exp @@ -19,7 +19,7 @@ standard_testfile .f90 load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug f90 quiet}]} { diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.fortran/subarray.exp index 7222a168342..bc3f33e5aae 100644 --- a/gdb/testsuite/gdb.fortran/subarray.exp +++ b/gdb/testsuite/gdb.fortran/subarray.exp @@ -18,7 +18,7 @@ # This file is part of the gdb testsuite. It contains tests for evaluating # Fortran subarray expression. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests standard_testfile .f load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/type-kinds.exp b/gdb/testsuite/gdb.fortran/type-kinds.exp index be7ca14f5d8..bf2609b3fae 100644 --- a/gdb/testsuite/gdb.fortran/type-kinds.exp +++ b/gdb/testsuite/gdb.fortran/type-kinds.exp @@ -19,7 +19,7 @@ load_lib "fortran.exp" -if { [skip_fortran_tests] } { continue } +require !skip_fortran_tests # Cast the value 1 to the type 'BASE_TYPE (kind=TYPE_KIND)'. The # expected result of the cast is CAST_RESULT, and the size of the diff --git a/gdb/testsuite/gdb.fortran/types.exp b/gdb/testsuite/gdb.fortran/types.exp index 3bb63f73a8a..dfe9518ed7e 100644 --- a/gdb/testsuite/gdb.fortran/types.exp +++ b/gdb/testsuite/gdb.fortran/types.exp @@ -18,7 +18,7 @@ load_lib "fortran.exp" -if { [skip_fortran_tests] } { continue } +require !skip_fortran_tests proc test_integer_literal_types_accepted {} { global gdb_prompt diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp index 5ec28088aef..9025df0d907 100644 --- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp +++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp @@ -16,7 +16,7 @@ standard_testfile "vla.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gdb.fortran/vla-datatypes.exp index afff37a3759..dfa3fd626ff 100644 --- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp +++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp @@ -16,7 +16,7 @@ standard_testfile ".f90" load_lib "fortran.exp" -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.fortran/vla-history.exp index 5d95d88f836..c95125c66f3 100644 --- a/gdb/testsuite/gdb.fortran/vla-history.exp +++ b/gdb/testsuite/gdb.fortran/vla-history.exp @@ -16,7 +16,7 @@ standard_testfile "vla.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp index a5bf78f1de0..3d864bc87f8 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp @@ -16,7 +16,7 @@ standard_testfile "vla.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp index 5efb14b5ac3..2b3355c55b7 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp @@ -16,7 +16,7 @@ standard_testfile "vla-sub.f90" load_lib "fortran.exp" -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp index 301d4f60570..798c0d5c58c 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptype.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp @@ -16,7 +16,7 @@ standard_testfile "vla.f90" load_lib "fortran.exp" -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-sizeof.exp b/gdb/testsuite/gdb.fortran/vla-sizeof.exp index 1ffe6a28e26..8344401da49 100644 --- a/gdb/testsuite/gdb.fortran/vla-sizeof.exp +++ b/gdb/testsuite/gdb.fortran/vla-sizeof.exp @@ -16,7 +16,7 @@ standard_testfile "vla.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp index 7befd4605c8..1a4d6f430cb 100755 --- a/gdb/testsuite/gdb.fortran/vla-type.exp +++ b/gdb/testsuite/gdb.fortran/vla-type.exp @@ -16,7 +16,7 @@ standard_testfile ".f90" load_lib "fortran.exp" -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp index 7562b489dd9..f836f05df8c 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp @@ -16,7 +16,7 @@ standard_testfile "vla-sub.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp index 1463b811eb8..27ddf3b58a5 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp @@ -16,7 +16,7 @@ standard_testfile "vla-sub.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub.exp b/gdb/testsuite/gdb.fortran/vla-value-sub.exp index 5c0556d7998..4785afb7799 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub.exp @@ -16,7 +16,7 @@ standard_testfile "vla-sub.f90" load_lib fortran.exp -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp index 4b99fbcf29b..ec5b6250a9b 100644 --- a/gdb/testsuite/gdb.fortran/vla-value.exp +++ b/gdb/testsuite/gdb.fortran/vla-value.exp @@ -16,7 +16,7 @@ standard_testfile "vla.f90" load_lib "fortran.exp" -if {[skip_fortran_tests]} { return -1 } +require !skip_fortran_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp index f29265bc55c..18c2da5e9ea 100644 --- a/gdb/testsuite/gdb.fortran/whatis_type.exp +++ b/gdb/testsuite/gdb.fortran/whatis_type.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_fortran_tests] } { continue } +require !skip_fortran_tests standard_testfile type.f90 load_lib "fortran.exp" diff --git a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp index efd74aa63f5..676408bb1db 100644 --- a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp +++ b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp @@ -15,7 +15,7 @@ # Test -symbol-info-modules, listing Fortran modules. -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests load_lib fortran.exp load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp b/gdb/testsuite/gdb.mi/mi-var-child-f.exp index 5a419306886..c5294156159 100644 --- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp +++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp @@ -19,7 +19,7 @@ load_lib mi-support.exp set MIFLAGS "-i=mi" load_lib "fortran.exp" -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests gdb_exit if [mi_gdb_start] { diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp index a234394b602..1d6c91dc9b3 100644 --- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp +++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp @@ -16,7 +16,7 @@ # Verify that, using the MI, we can evaluate a simple Fortran Variable # Length Array (VLA). -if { [skip_fortran_tests] } { return -1 } +require !skip_fortran_tests load_lib mi-support.exp load_lib fortran.exp