From 7ff5fae704ca96a9ce17cba5004e7b8402bb70bb Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 29 Aug 2019 16:07:01 +0100 Subject: gdb/testsuite: Allow cc-with-tweaks board file to be used with Fortran The board file cc-with-tweaks is used as the core for lots of other board files, for example cc-with-gdb-index and cc-with-debug-names. This commit extends cc-with-tweaks so that it will wrap the Fortran compiler, allowing for more test coverage. I tested all of the board files that make use of cc-with-tweaks running the gdb.fortran/*.exp test set, and in some cases I did see extra failures. The "standard" results are: === gdb Summary === # of expected passes 953 # of known failures 2 With board file 'cc-with-dwz-m': === gdb Summary === # of expected passes 903 # of unexpected failures 1 # of known failures 2 # of untested testcases 4 With board file 'dwarf4-gdb-index': === gdb Summary === # of expected passes 950 # of unexpected failures 3 # of known failures 2 With board file 'fission-dwp': === gdb Summary === # of expected passes 949 # of unexpected failures 4 # of known failures 2 Despite these extra failure I don't think this should prevent this change going in as these failures presumably already exist in GDB. gdb/testsuite/ChangeLog: * boards/cc-with-tweaks.exp: Setup F90_FOR_TARGET and F77_FOR_TARGET. Change-Id: I06d412f94d0e119ad652dd6c20829f6705a54622 --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/boards/cc-with-tweaks.exp | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index befc4bb..d2fa9ed 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-16 Andrew Burgess + + * boards/cc-with-tweaks.exp: Setup F90_FOR_TARGET and + F77_FOR_TARGET. + 2019-10-16 Tom de Vries PR tdep/25096 diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp index 3714814..dfca1ad 100644 --- a/gdb/testsuite/boards/cc-with-tweaks.exp +++ b/gdb/testsuite/boards/cc-with-tweaks.exp @@ -43,6 +43,8 @@ process_multilib_options "" set found_gcc [find_gcc] set found_gxx [find_g++] set found_gnatmake [find_gnatmake] +set found_f90 [find_gfortran] +set found_f77 [find_g77] set_board_info compiler "$found_gcc" set contrib_dir [file normalize $srcdir/../contrib] @@ -58,6 +60,14 @@ if ![info exists GNATMAKE_FOR_TARGET] { set GNATMAKE_FOR_TARGET "$found_gnatmake" } set GNATMAKE_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $GNATMAKE_FOR_TARGET" +if ![info exists F90_FOR_TARGET] { + set F90_FOR_TARGET "$found_f90" +} +set F90_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $F90_FOR_TARGET" +if ![info exists F77_FOR_TARGET] { + set F77_FOR_TARGET "$found_f77" +} +set F77_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $F77_FOR_TARGET" set pwd [exec pwd -P] exec echo $GDB $INTERNAL_GDBFLAGS $GDBFLAGS \"\$@\" > $pwd/gdb.sh -- cgit v1.1