diff options
| author | Tom de Vries <tdevries@suse.de> | 2022-06-27 12:47:26 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2022-06-27 12:47:26 +0200 |
| commit | 2043638bf9e8b7ea31b4cbf2c6f7299a3c27efb5 (patch) | |
| tree | 1a46216c4cc8ae26767ab45bbf1da9971c65f6f6 | |
| parent | 65067f1c2c842f001017638c4fe53613d6656263 (diff) | |
| download | gdb-2043638bf9e8b7ea31b4cbf2c6f7299a3c27efb5.zip gdb-2043638bf9e8b7ea31b4cbf2c6f7299a3c27efb5.tar.gz gdb-2043638bf9e8b7ea31b4cbf2c6f7299a3c27efb5.tar.bz2 | |
[gdb/testsuite] Skip gdb.fortran/namelist.exp for gfortran 4.8
The test-case gdb.fortran/namelist.exp uses a gfortran feature (emitting
DW_TAG_namelist in the debug info) that has been supported since gfortran 4.9,
see PR gcc/37132.
Skip the test for gfortran 4.8 and earlier. Do this using gcc_major_version,
and update it to be able to handle "gcc_major_version {gfortran-*} f90".
Tested on x86_64-linux, with gfortran 4.8.5, 7.5.0, and 12.1.1.
| -rw-r--r-- | gdb/testsuite/gdb.fortran/namelist.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.fortran/namelist.exp index 3917f1b..39cf0e1 100644 --- a/gdb/testsuite/gdb.fortran/namelist.exp +++ b/gdb/testsuite/gdb.fortran/namelist.exp @@ -37,7 +37,11 @@ set int [fortran_int4] gdb_breakpoint [gdb_get_line_number "Display namelist"] gdb_continue_to_breakpoint "Display namelist" -if { [test_compiler_info {gfortran-*} f90] } { +# DW_TAG_namelist is supported starting gcc 4.9. +set supported [expr \ + [test_compiler_info {gfortran-*} f90] \ + && [gcc_major_version {gfortran-*} f90] >= 4.9] +if { $supported } { gdb_test "ptype nml" \ "type = Type nml\r\n *$int :: a\r\n *$int :: b\r\n *End Type nml" gdb_test "print nml" \ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index efbe393..141cb04 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4220,13 +4220,17 @@ proc is_c_compiler_gcc {} { # Return the gcc major version, or -1. # For gcc 4.8.5, the major version is 4.8. # For gcc 7.5.0, the major version 7. +# The COMPILER and LANGUAGE arguments are as for test_compiler_info. -proc gcc_major_version { } { +proc gcc_major_version { {compiler "gcc-*"} {language "c"} } { global decimal - if { ![test_compiler_info "gcc-*"] } { + if { ![test_compiler_info $compiler $language] } { return -1 } - set res [regexp gcc-($decimal)-($decimal)- [test_compiler_info] \ + # Strip "gcc-*" to "gcc". + regsub -- {-.*} $compiler "" compiler + set res [regexp $compiler-($decimal)-($decimal)- \ + [test_compiler_info "" $language] \ dummy_var major minor] if { $res != 1 } { return -1 |