Use require !skip_fortran_tests

This changes some tests to use "require !skip_fortran_tests".

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
index 58e1eccf27c58c4fdc1ddbd14e1b2cf59698a696..8f6c0aa75dc91b9f9a4829fbb91fd149c17e91e9 100644 (file)
--- 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 ff054d29e7221e3d37985b4f16bfd22d6ed7f983..d4aba5e25850f349fd98f9cefad9aae91d8ffc25 100644 (file)
--- 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 f9b30e9a4dfc5e017fb8603b386df20bed05977d..25023ebace5dc49a972aaa10c25adf7099359fd2 100644 (file)
--- 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 b4b9e2954abaa58a3719ee8312006a687c61b626..0903d9ed7a06c419bb76f5a687c280da3ca2354f 100644 (file)
--- 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 5f663fe9d136b87893b63b10bb7cf52f02503352..1902329fc9413e772984a2b0d523151e791df5f8 100644 (file)
--- 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 64d1270d510e9c1d5446d3942af0981e229b4d82..299bf3417b693c2e5985c54b557925e80e35019e 100644 (file)
--- 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 9ae2851a2dbcea68a95714e31d71e272d5de56fe..126cea76ccbbb1cb9a26fdf6f3b4e55cd242ffba 100644 (file)
--- 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 5cb92cc6c861e1129b2a64a96afd68dd256f13a4..90b48a398d6f54d4a577e31e3c7160e42d24489a 100644 (file)
--- 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 f54e412eecca687b15b9edf2414225ac7b4421d4..f49154b9c6a58b508a54163d9b0c7c251ed6712e 100644 (file)
--- 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 1724e71957f2d94c433c453cddd1d66a081eb120..832aefc0954c69ec4248f1880edec5e0434e6279 100644 (file)
--- 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 80f6cc122df47245f815c073af84ebf782f43a2f..8fab57e13e738f8fa6f7c7693537f231d7ff237b 100644 (file)
--- 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 9ba2b04850329e3de24c9e1cf1bbbaae4ffee5b9..1acc40027c040140ba7ad1bf17fce47adef65347 100644 (file)
--- 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 fbd43fd0d73dfb3fa93ddaefcd1dce04494e3bf0..a1e59903014c47aeb0470fae7b1789e43a920972 100644 (file)
--- 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 533d7807ad6c45a123c774f8982a9672766464f2..6f51fce3ddcd8d7c038255c19b5f17009815f8a2 100644 (file)
--- 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 c69019643be6adb46859457ffc9fba921ea3e9a5..d17eb4a5db3548cf6cced73a8d69b4040f94e56f 100644 (file)
--- 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 02e273e9a517b0e9c994ba7dd7ed49c446c23e5f..1a86096478289a9aa9bb41fede9441fc33e7885e 100644 (file)
--- 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 0b8b10e7be5188290d03a9c7745e44082650d9ed..76a848c77119028495eb2a06ef5120f4d8761b81 100644 (file)
--- 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 0b00db81675b901d05592f27fe2b03950d0263bf..b551bbd428bcc971963d15d9142f169fe2476694 100644 (file)
--- 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 18798e060c3c0157f2a7d55a57108f74ecd44a80..4ae6f9ae7927c8215b81c8eda8365fac5ec42676 100644 (file)
--- 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 6b44aa2b462a0d923be5e2afea105a4e1c47f43a..708b73c3ca41767ca17a9ea668db2fbe7a1ab778 100644 (file)
--- 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 5d4c96bbec02985b24dd63012d0fc9e2a5948f64..75324ac4607a73721526f06fa6b9200125cda90e 100644 (file)
--- 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 3ba18c23d86e235825cf6a76af7cf0991b4385f2..d7fa4a0378bff34f62f2850975f08e1324f329cc 100644 (file)
--- 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 92834375a2d3fd45535557127492d2d1fd63ea34..9a9a3ca8f3f7e1f22f66133eb50eb116752fd7b4 100644 (file)
--- 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 5dae95f7f715a5d30b5cb8f09f1b6a28c6a8e1f0..be7c1937d78f96ae7f6f83beb224e7f5e8c62b3f 100644 (file)
--- 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 b47c59db463779eb04edaa5e1e44bccc4fc3436b..049008f90e059c37c4ae4113b62d9e94d183148b 100644 (file)
--- 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 af11fa1d4c43538d18cd79e791ec3ffc05dc88d6..8fb0a6c6cb96c2d0e01fb616cc78aaef43785474 100644 (file)
--- 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 9a8ca91127fb984f4b01f05d21003bc57c9a1447..07937741f158d3546ddea5b510f25d13285c9578 100644 (file)
--- 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 3fb9aba5efebcac30eb03f1bfde206a88adff76f..44773cc3a3b95836c55c8556f15718b2e575a253 100644 (file)
--- 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 ab54ead16136f27ca3b903cedf73ae12b971fa44..ef5e4e03b62571190a803aa8657445e15d240ae4 100644 (file)
--- 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 ff5fa3ba9467f01363f578e53239c031568a9ded..2992e9f2fd1d6bac6921a78840679a23471abb58 100644 (file)
--- 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 1cea93216e00423fe6050afff39aa53c0c96c626..565c9cf5190e33ca9f89ab41c574cc444a3fe029 100644 (file)
--- 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 4f057faa57c41412275ba74edf948de23dc128de..460f242e137197eb13153ba3daf74e6cb8ba2db3 100644 (file)
--- 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 aec3c35170937ed99cf9f42238e0992eda33200a..563d4b1202422325ebd2ad15289ea6cd2617ffea 100644 (file)
--- 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 954fe2826f005d56a6c8cf3756de57d0f01509a9..60a37a46361e81397921995c75e971bc0f9fdf9e 100644 (file)
--- 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 8b2a1a74cb5fef38eb8b10411dacdb528cbaa93d..91ef4bc15be8e68243d03a112c32248f2f136e6c 100644 (file)
--- 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 e4ea7bb123c62312d713a2deb53fd0882a65580f..bbb3b2a21ed1a830b6faa76264d120b5175ba776 100644 (file)
--- 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 6538e16e566d04eaabb7a3bc216de5ce54ed2edc..a1614554556d48d0e6d105a963ef63992ce3e863 100644 (file)
--- 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 7c6984ee9732373e56d3ce56e9fcd1cc22ab7ee3..8c7e9957f140d93854a0e2c83815298701ec4b6e 100644 (file)
--- 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 58b78dd3e1d915bf584ed2abb9296bd3d8a90156..5646471e863e3af0c2366b9b3a0d7147a6e4f755 100644 (file)
--- 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 1f5f5bc65c8883a3cb088b275d957d238dcfa306..bf51e94629281c51376b68e741ccfa33f3f8d57f 100644 (file)
--- 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 32166ca871cc273b048d19eff56b3344a2695049..344745453cdc5b9d772016d5b8ff9237ea2c641a 100644 (file)
--- 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 374199349df17cd710e4374418e17aa83f5a0d02..bf8915a2f386bc11b036bf548a30cf4c6aa0ca29 100755 (executable)
--- 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 6f2924b47433c32f82a7a601f0b45e4700452de3..1ffa5a39fc3bfd80be3e5110921e896384d1c1a1 100755 (executable)
--- 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 395789cb98b6f1ab1327cb897a0c287dc69da3f2..a37ab3fedb135d7e6309b816e9daa95e6e4522a9 100644 (file)
--- 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 c3b07134cf5fe37ad02ce4aac2f46031dc0418c6..9d552afcc61d5a0a1e08183b13710ae6e1f0b0a3 100644 (file)
--- 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 e30d6a46fea5e1726eac1353b2072d7ffb72bf42..964b69ef948c5c8da48aeff54bb818780ae3b540 100755 (executable)
--- 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 098ccbd65e494506f6f8a502ee8232da5dce664b..82ad7b753e4f4695e0829874f76508437edeead8 100644 (file)
--- 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 549d18e96e44fd4db7756c107969e1a5c3587e0e..c420ccdc124ac47f9427dcc40f2ba800cb154598 100644 (file)
--- 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 730d68ad95afa169a9cd20fc48de570e9a8f0d6e..e52c70fb2a9059145ea8810bb81f29a4724fb047 100644 (file)
--- 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 6e4bd011a28235f8130bcf42d27f9413ea5eae61..e3e055b112f2e5ee846ec460f37fc547c635f65e 100644 (file)
--- 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 f203eff666673cdc9aabc959a93a243abc3a67ad..2608e74946cb8d33b0a547cae6c6838efceca6cd 100644 (file)
--- 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 c116f80432a9bf23bfc5bc88988474a960b003fd..b7aac47c6fedd4e36a63441b707efdbd691c5316 100644 (file)
--- 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 ce74296cb4b97c6f60a0ef59515ea3f1bd812811..e028455fc638daa4b829228673a6770ac8fdca57 100644 (file)
--- 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 f202c075422396585670bf09e79fba1f28762c57..f553fe592f9a64239aba074ac5573579aff509d2 100644 (file)
--- 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 7222a1683421cbdf0afff8eff3432581be51a159..bc3f33e5aae6e5bc4779b0337705374f51901f61 100644 (file)
--- 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 be7ca14f5d8213156ee6f02676d138f5a5893fcf..bf2609b3faec7fe8a6847cd7ca447d32ada285f4 100644 (file)
--- 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 3bb63f73a8a32a7096a5582e55afd753bfcd12f2..dfe9518ed7e1d961aadcaf1b8d60ccdf62af87f0 100644 (file)
--- 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 5ec28088aef736d86d23bed78c88e17cb140b738..9025df0d90711519a0f26b293a79411014b0b560 100644 (file)
--- 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 afff37a3759144405c349b4e3c744c36e4837e40..dfa3fd626ffe316bfbf927153b6f5b4fc4721bc5 100644 (file)
--- 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 5d95d88f836bf94f5b86cd0b7a9573de58490601..c95125c66f3d30157965b7d66f7e4896a2db67f6 100644 (file)
--- 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 a5bf78f1de0a7a8ba41ab9a836e88249ba14d9f8..3d864bc87f8fba7ac3c8ce36ba1252f21f66b30d 100644 (file)
--- 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 5efb14b5ac3d9246ceb774fbd2fb10136815f707..2b3355c55b734e03226d631b819e9f57ac0f747c 100644 (file)
--- 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 301d4f605700c0a7d24ab1b9b2099aa7dc11f746..798c0d5c58c1e09bf5fc1b72ea6eaafff301852f 100644 (file)
--- 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 1ffe6a28e263d09aabf85b57662b038122d3d7e5..8344401da492f83c619a182ca99b8751e998e08a 100644 (file)
--- 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 7befd4605c8d7a64b1f6668a758d8ec366820a54..1a4d6f430cbbaa3f1bd909a17faad91d47cac09d 100755 (executable)
--- 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 7562b489dd9dc7f639cc86994a0559061e72bb9e..f836f05df8cce0574995d3da91910f6471265fd5 100644 (file)
--- 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 1463b811eb815ade0b28db21f45f1243e926544f..27ddf3b58a5f0c637c5a23eab5f7a1af8c4bea81 100644 (file)
--- 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 5c0556d7998b7ef8ebcef692824f56f03fafc6fa..4785afb7799654adf88d5ba381a22af34b1bb5ba 100644 (file)
--- 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 4b99fbcf29be32555165b7420f069449f3fa49fd..ec5b6250a9b07aba004294b89b479d7e2e3b5c3d 100644 (file)
--- 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 f29265bc55c02b38683d21106cda18ecc50855e1..18c2da5e9eafa0158939a901e05090bcb806bbe3 100644 (file)
--- 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 efd74aa63f58e77bb29715facd19d00a32c1c945..676408bb1db6590def80f4bfc02328a27e491b5d 100644 (file)
--- 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 5a4193068863e8e640bc835bed0529a4fa5cf016..c529415615974b21d8c65197825fc41075a4f0dc 100644 (file)
--- 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 a234394b602cfcf8fb46b3893bc03340c34936b7..1d6c91dc9b342f678b9c2dd358240272b5127a58 100644 (file)
--- 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