From a54a7f13f3c98a6e6a865a9973958ac083e702ad Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 13 Aug 2020 17:41:28 +0100 Subject: [PATCH] Add skip_fortran_tests to more Fortran testcases This adds missing skip_fortran_tests checks to Fortran testcases, using the exact same pattern the existing files that do check it use. gdb/testsuite/ChangeLog: * gdb.fortran/complex.exp: Check skip_fortran_tests. * gdb.fortran/library-module.exp: Likewise. * gdb.fortran/logical.exp: Likewise. * gdb.fortran/module.exp: Likewise. * gdb.fortran/print_type.exp: Likewise. * gdb.fortran/vla-alloc-assoc.exp: Likewise. * gdb.fortran/vla-datatypes.exp: Likewise. * gdb.fortran/vla-history.exp: Likewise. * gdb.fortran/vla-ptr-info.exp: Likewise. * gdb.fortran/vla-ptype-sub.exp: Likewise. * gdb.fortran/vla-ptype.exp: Likewise. * gdb.fortran/vla-sizeof.exp: Likewise. * gdb.fortran/vla-type.exp: Likewise. * gdb.fortran/vla-value-sub-arbitrary.exp: Likewise. * gdb.fortran/vla-value-sub-finish.exp: Likewise. * gdb.fortran/vla-value-sub.exp: Likewise. * gdb.fortran/vla-value.exp: Likewise. --- gdb/testsuite/ChangeLog | 20 +++++++++++++++++++ gdb/testsuite/gdb.fortran/complex.exp | 2 ++ gdb/testsuite/gdb.fortran/library-module.exp | 5 ++++- gdb/testsuite/gdb.fortran/logical.exp | 2 ++ gdb/testsuite/gdb.fortran/module.exp | 2 ++ gdb/testsuite/gdb.fortran/print_type.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-datatypes.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-history.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-ptr-info.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-ptype-sub.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-ptype.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-sizeof.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-type.exp | 2 ++ .../gdb.fortran/vla-value-sub-arbitrary.exp | 2 ++ .../gdb.fortran/vla-value-sub-finish.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-value-sub.exp | 2 ++ gdb/testsuite/gdb.fortran/vla-value.exp | 2 ++ 18 files changed, 56 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 73d9de9301..f22401b305 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,23 @@ +2020-08-13 Pedro Alves + + * gdb.fortran/complex.exp: Check skip_fortran_tests. + * gdb.fortran/library-module.exp: Likewise. + * gdb.fortran/logical.exp: Likewise. + * gdb.fortran/module.exp: Likewise. + * gdb.fortran/print_type.exp: Likewise. + * gdb.fortran/vla-alloc-assoc.exp: Likewise. + * gdb.fortran/vla-datatypes.exp: Likewise. + * gdb.fortran/vla-history.exp: Likewise. + * gdb.fortran/vla-ptr-info.exp: Likewise. + * gdb.fortran/vla-ptype-sub.exp: Likewise. + * gdb.fortran/vla-ptype.exp: Likewise. + * gdb.fortran/vla-sizeof.exp: Likewise. + * gdb.fortran/vla-type.exp: Likewise. + * gdb.fortran/vla-value-sub-arbitrary.exp: Likewise. + * gdb.fortran/vla-value-sub-finish.exp: Likewise. + * gdb.fortran/vla-value-sub.exp: Likewise. + * gdb.fortran/vla-value.exp: Likewise. + 2020-08-13 Pedro Alves * gdb.ada/access_tagged_param.exp: Check skip_ada_tests. diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp index f1e754e163..1faed2afb9 100644 --- a/gdb/testsuite/gdb.fortran/complex.exp +++ b/gdb/testsuite/gdb.fortran/complex.exp @@ -16,6 +16,8 @@ standard_testfile .f90 load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp index 8254fcf10a..d2013e1d3e 100644 --- a/gdb/testsuite/gdb.fortran/library-module.exp +++ b/gdb/testsuite/gdb.fortran/library-module.exp @@ -13,6 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +load_lib fortran.exp + +if {[skip_fortran_tests]} { return -1 } + standard_testfile library-module-main.f90 set srclibfile ${testfile}-lib.f90 set libfile [standard_output_file ${testfile}-lib.so] @@ -40,7 +44,6 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90 clean_restart $testfile gdb_load_shlib $libfile -load_lib fortran.exp if ![fortran_runto_main] then { perror "couldn't run to main" diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fortran/logical.exp index 161bbdd908..6e22a255e6 100644 --- a/gdb/testsuite/gdb.fortran/logical.exp +++ b/gdb/testsuite/gdb.fortran/logical.exp @@ -18,6 +18,8 @@ standard_testfile .f90 load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp index 4a8251c44c..72e6a3a0ee 100644 --- a/gdb/testsuite/gdb.fortran/module.exp +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -15,6 +15,8 @@ load_lib "fortran.exp" +if {[skip_fortran_tests]} { return -1 } + standard_testfile .f90 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } { diff --git a/gdb/testsuite/gdb.fortran/print_type.exp b/gdb/testsuite/gdb.fortran/print_type.exp index fcedb9579a..14ddc04f8f 100755 --- a/gdb/testsuite/gdb.fortran/print_type.exp +++ b/gdb/testsuite/gdb.fortran/print_type.exp @@ -19,6 +19,8 @@ standard_testfile "pointers.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp index 2ae0411cf1..e8e1e850d0 100644 --- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp +++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp @@ -16,6 +16,8 @@ standard_testfile "vla.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gdb.fortran/vla-datatypes.exp index b69636f600..8a199d4acd 100644 --- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp +++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp @@ -16,6 +16,8 @@ standard_testfile ".f90" load_lib "fortran.exp" +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.fortran/vla-history.exp index 3bf98db197..093e107e51 100644 --- a/gdb/testsuite/gdb.fortran/vla-history.exp +++ b/gdb/testsuite/gdb.fortran/vla-history.exp @@ -16,6 +16,8 @@ standard_testfile "vla.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp index d3fa595bea..bfc118491c 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp @@ -16,6 +16,8 @@ standard_testfile "vla.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp index 07a4a5fc2e..192b58243a 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp @@ -16,6 +16,8 @@ standard_testfile "vla-sub.f90" load_lib "fortran.exp" +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp index bbb81ea0c8..cc768a753b 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptype.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp @@ -16,6 +16,8 @@ standard_testfile "vla.f90" load_lib "fortran.exp" +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-sizeof.exp b/gdb/testsuite/gdb.fortran/vla-sizeof.exp index d26b8c60f8..04296ac80c 100644 --- a/gdb/testsuite/gdb.fortran/vla-sizeof.exp +++ b/gdb/testsuite/gdb.fortran/vla-sizeof.exp @@ -16,6 +16,8 @@ standard_testfile "vla.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp index f007ea3a78..925c583edc 100755 --- a/gdb/testsuite/gdb.fortran/vla-type.exp +++ b/gdb/testsuite/gdb.fortran/vla-type.exp @@ -16,6 +16,8 @@ standard_testfile ".f90" load_lib "fortran.exp" +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp index c3ed909a81..99b8fd78f3 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp @@ -16,6 +16,8 @@ standard_testfile "vla-sub.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp index 403e411cc2..cd446e1266 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp @@ -16,6 +16,8 @@ standard_testfile "vla-sub.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub.exp b/gdb/testsuite/gdb.fortran/vla-value-sub.exp index fd923edf40..b22d7dfc18 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub.exp @@ -16,6 +16,8 @@ standard_testfile "vla-sub.f90" load_lib fortran.exp +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp index 9a727fc30a..be0a2d47fd 100644 --- a/gdb/testsuite/gdb.fortran/vla-value.exp +++ b/gdb/testsuite/gdb.fortran/vla-value.exp @@ -16,6 +16,8 @@ standard_testfile "vla.f90" load_lib "fortran.exp" +if {[skip_fortran_tests]} { return -1 } + if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 -- 2.34.1