From 0ecee54cfd04a60e7ca61ae07c72b20e21390257 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 29 Jun 2011 17:50:47 +0000 Subject: [PATCH] PR testsuite/12040: * gdb.fortran/array-element.exp: Use f90, not f77. * gdb.fortran/complex.exp: Use f90, not f77. * gdb.fortran/derived-type.exp: Use f90, not f77. * gdb.fortran/library-module.exp: Use f90, not f77. * gdb.fortran/logical.exp: Use f90, not f77. * gdb.fortran/module.exp: Use f90, not f77. * gdb.fortran/multi-dim.exp: Use f90, not f77. * gdb.fortran/subarray.exp: Use f90, not f77. --- gdb/testsuite/ChangeLog | 12 ++++++++++++ gdb/testsuite/gdb.fortran/array-element.exp | 2 +- gdb/testsuite/gdb.fortran/complex.exp | 2 +- gdb/testsuite/gdb.fortran/derived-type.exp | 2 +- gdb/testsuite/gdb.fortran/library-module.exp | 4 ++-- gdb/testsuite/gdb.fortran/logical.exp | 4 ++-- gdb/testsuite/gdb.fortran/module.exp | 2 +- gdb/testsuite/gdb.fortran/multi-dim.exp | 2 +- gdb/testsuite/gdb.fortran/subarray.exp | 2 +- 9 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f156a7c9b85..f826b19be9a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2011-06-29 Tom Tromey + + PR testsuite/12040: + * gdb.fortran/array-element.exp: Use f90, not f77. + * gdb.fortran/complex.exp: Use f90, not f77. + * gdb.fortran/derived-type.exp: Use f90, not f77. + * gdb.fortran/library-module.exp: Use f90, not f77. + * gdb.fortran/logical.exp: Use f90, not f77. + * gdb.fortran/module.exp: Use f90, not f77. + * gdb.fortran/multi-dim.exp: Use f90, not f77. + * gdb.fortran/subarray.exp: Use f90, not f77. + 2011-06-29 Tom Tromey * gdb.fortran/charset.exp: New file. diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gdb.fortran/array-element.exp index 0ce2621a3a8..1fc4059e0f5 100644 --- a/gdb/testsuite/gdb.fortran/array-element.exp +++ b/gdb/testsuite/gdb.fortran/array-element.exp @@ -29,7 +29,7 @@ set srcfile ${testfile}.f set binfile ${objdir}/${subdir}/${testfile} if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ - executable {debug f77}] != ""} { + executable {debug f90}] != ""} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp index ba58cb234bb..103ec8eac4b 100644 --- a/gdb/testsuite/gdb.fortran/complex.exp +++ b/gdb/testsuite/gdb.fortran/complex.exp @@ -18,7 +18,7 @@ set srcfile ${testfile}.f set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ - executable {debug f77 quiet}] != "" } { + executable {debug f90 quiet}] != "" } { untested "Couldn't compile ${srcfile}" return -1 } diff --git a/gdb/testsuite/gdb.fortran/derived-type.exp b/gdb/testsuite/gdb.fortran/derived-type.exp index 9751dc24e35..508c1f9d051 100644 --- a/gdb/testsuite/gdb.fortran/derived-type.exp +++ b/gdb/testsuite/gdb.fortran/derived-type.exp @@ -29,7 +29,7 @@ set srcfile ${testfile}.f90 set binfile ${objdir}/${subdir}/${testfile} if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ - executable {debug f77}] != ""} { + executable {debug f90}] != ""} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp index b0b4068c65d..8c9f43c493f 100644 --- a/gdb/testsuite/gdb.fortran/library-module.exp +++ b/gdb/testsuite/gdb.fortran/library-module.exp @@ -25,7 +25,7 @@ if [get_compiler_info not-used] { return -1 } -if { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$libfile {debug f77}] != "" } { +if { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$libfile {debug f90}] != "" } { untested "Couldn't compile ${srclibfile}" return -1 } @@ -34,7 +34,7 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$li # just for the linking phase (and not the source compilation phase). And any # warnings on ignored $libfile abort the process. -if { [gdb_compile [list $srcdir/$subdir/$srcfile $objdir/$subdir/$libfile] $objdir/$subdir/$binfile executable {debug f77}] != "" } { +if { [gdb_compile [list $srcdir/$subdir/$srcfile $objdir/$subdir/$libfile] $objdir/$subdir/$binfile executable {debug f90}] != "" } { untested "Couldn't compile ${srcfile}" return -1 } diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fortran/logical.exp index 06d6f0b9585..c3719b4f41f 100644 --- a/gdb/testsuite/gdb.fortran/logical.exp +++ b/gdb/testsuite/gdb.fortran/logical.exp @@ -2,7 +2,7 @@ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ set test "logical" set srcfile ${test}.f90 -if { [prepare_for_testing "${test}.exp" "${test}" "${srcfile}" {debug f77 quiet}] } { +if { [prepare_for_testing "${test}.exp" "${test}" "${srcfile}" {debug f90 quiet}] } { untested "Could not compile ${srcfile}." return -1 } diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp index d96baacfa65..364c59d8984 100644 --- a/gdb/testsuite/gdb.fortran/module.exp +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -16,7 +16,7 @@ set testfile "module" set srcfile ${testfile}.f90 -if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77}] } { +if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp index d41ce0fe46c..33b757469f1 100644 --- a/gdb/testsuite/gdb.fortran/multi-dim.exp +++ b/gdb/testsuite/gdb.fortran/multi-dim.exp @@ -20,7 +20,7 @@ if { [skip_fortran_tests] } { return -1 } set testfile "multi-dim" set srcfile ${testfile}.f90 -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f77}] } { +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.fortran/subarray.exp index 58d020b0558..b4324dd2099 100644 --- a/gdb/testsuite/gdb.fortran/subarray.exp +++ b/gdb/testsuite/gdb.fortran/subarray.exp @@ -29,7 +29,7 @@ set srcfile ${testfile}.f set binfile ${objdir}/${subdir}/${testfile} if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ - executable {debug f77}] != ""} { + executable {debug f90}] != ""} { return -1 } -- 2.30.2