From 2bfd0045b1a52540315042d0f55798c3679cd5f6 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 16 Aug 2019 03:38:23 +0000 Subject: [PATCH] Match ld besides collect2 in gcov test The regexp that checks that -lgcov is linked in when --coverage is passed to the compiler driver requires the command line to match '/collect2'. Some of our targets don't match that, but they match /ld or ${target_alias}-ld depending on the testing scenario, so I'd like to tweak the test to match those as well. for gcc/testsuite/ChangeLog * gcc.misc-tests/options.exp: Match /ld and -ld besides /collect2. From-SVN: r274557 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.misc-tests/options.exp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aeaaac0a4a5..55c59822dde 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-08-16 Alexandre Oliva + + * gcc.misc-tests/options.exp: Match /ld and -ld besides + /collect2. + 2019-08-15 Thomas Koenig PR fortran/91443 diff --git a/gcc/testsuite/gcc.misc-tests/options.exp b/gcc/testsuite/gcc.misc-tests/options.exp index 79535238fca..c50784c84f3 100644 --- a/gcc/testsuite/gcc.misc-tests/options.exp +++ b/gcc/testsuite/gcc.misc-tests/options.exp @@ -65,7 +65,8 @@ proc check_for_all_options {language gcc_options compiler_pattern as_pattern ld_ fail "$test (assembler options)" return } - if {![regexp -- "/collect2(\\.exe)? .*$ld_pattern" $gcc_output]} { + # Match /collect2, /ld, or *-ld. + if {![regexp -- "(/collect2|\[-/\]ld)(\\.exe)? .*$ld_pattern" $gcc_output]} { fail "$test (linker options)" return } -- 2.30.2