Re: PATCH: PR testsuite/12040: GDB Fortran tests use g77 instead of gfortran

Tom Tromey
2011-06-29T17:50:35Z

H.J.> Did we get gfortran when searching for F77/f77 compiler?

Tom> No, I forgot the most crucial bit :)
Tom> I will write a follow-up patch to make our tests use gfortran.
Tom> I don't think supporting g77 is all that worthwhile any more.

Here is the follow-up. I am checking it in.

This patch switches all the gdb.fortran tests to use the new gfortran
support.

Built and regested both locally and by the buildbot.

Note that this introduces new FAILs:

FAIL: gdb.fortran/array-element.exp: continue to breakpoint once again (the program exited)
FAIL: gdb.fortran/array-element.exp: print the second element of array a

These tests were previously not run, at least not on the machines I use.
This is really just a single failure; I looked at it briefly and it is
either a gfortran bug, or a bad assumption on the part of the testcase
writer. I don't actually know Fortran so it is hard to say.

Tom

2011-06-29 Tom Tromey <tromey@redhat.com>

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.

diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gdb.fortran/array-element.exp
index 0ce2621..1fc4059 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 ba58cb2..103ec8e 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 9751dc2..508c1f9 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 b0b4068..8c9f43c 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 06d6f0b..c3719b4 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 d96baac..364c59d 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 d41ce0f..33b7574 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 58d020b..b4324dd 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
}