| Message ID | 20221217000818.3729389-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 d07890580a9..8bb79183067 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 bd179353761..3421dce36b6 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 effbddcb528..ce3c709d846 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 1b11f01ca40..de900464643 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 9c8798d1f6d..56c5e522551 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 403a5fc023c..89c9a013508 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 da965c559fa..29bbbbaf67b 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 045bac17ea1..2f543fd6555 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 b832fea292a..0a0ccc04aff 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 a0f00ebd04c..a0ef8031379 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 a38276c67e4..921befdac5a 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 70a6fbdfb72..6e40af6c23c 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 37bb825d164..7e630789e60 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 ab064910108..18619f649e7 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 ffcc9ab3cef..e217c4db3eb 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 5238faaaa6a..f2e733982db 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 30bdcb01652..29d77ff3881 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 8509283a17f..c47f27557b5 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 890e07adcef..bbbbc6257fe 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 b6fc95534eb..b1961858066 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 f09f04edd7a..acc0aadc11e 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 08d8ad4a60e..73453315370 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 3d45a63f839..9efad8e9aa3 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 5187e3ef480..e862a9a5f61 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 2bad2bc7c8f..c4e7f698fcf 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 f0463f4f62b..2264ad86714 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 892f189784a..91ae2193124 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 c14cdad4ff5..b9fe5a45c8c 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 f240bd71d57..8d1888d77d4 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 a6359374a46..b4c15a69533 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 527f9fead30..3d19cfa7593 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 0894654f781..3e581ef2761 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 6be9d03af6b..c1c4bea7b53 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 08fb6059bdf..0c5a71f4f5e 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 1efb031b136..5c755fed079 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 3a8a94e895d..bc0176373d3 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 5bed3be8697..0ff4fe41936 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 47fbf748e3f..e3f9cb62a9b 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 cafb12d0e75..ac5c0741713 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 8e2c9be5c99..f9e6ead7069 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 9aaf57db9b5..496efed8dea 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 b065336c830..a3df0d81392 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 00cfffa0b63..1a71a0ab178 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 8c43d177295..85bb91259f6 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 524cfa757d6..0cdfda796c2 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 fc605386c4d..cd040f0bac8 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 0ba07f6c1ff..5a1d8cc0923 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 daf5bd53550..fb42e5d8522 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 156e4fe4d17..7e28019eed6 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 cef30b1a6c3..8ceebe38594 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 f7248dd6c43..5b464254787 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 ccb4d145e8a..f341292006c 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 fb49e286e5b..00634547214 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 a39d55c51f3..3dfb5d3a337 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 776872ed219..8f8a64445f8 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 e481ad3b38d..bd54fea7835 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 eac667646ac..d95bdb05009 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 d6a1b857c95..dd8d1ce3e74 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 9750c2e7ab2..99874bb44ac 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 ed2db8cbc24..490236b78d4 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 dd0a7783d8d..04d5a3a0e08 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 52a70d1100b..f7bbc04ac70 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 3f267f2bb69..90fe19316ec 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 9930cd92ad0..5375d0458c7 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 fc8494fe36c..9f84a446272 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 5ac744ecde7..92b3313cb70 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 7b7b48940d2..ea55aa10994 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 b7ab7a51726..84c37267c72 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 a920fb879ee..0621c72a89c 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 83f313e1ae8..97166f8e8b3 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 fe4692fd52a..c9b8212e3fe 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 b097b1c4673..8d5c738a93c 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 00312354fc9..780b3068b97 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