aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <oliva@adacore.com>2019-08-16 03:38:23 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2019-08-16 03:38:23 +0000
commit2bfd0045b1a52540315042d0f55798c3679cd5f6 (patch)
tree6d0b4eebeb235a17929c5a56df8a645da65e5042
parent3b5864f42104cc3c35568fa5f9e4b256c2b49bb8 (diff)
downloadgcc-2bfd0045b1a52540315042d0f55798c3679cd5f6.zip
gcc-2bfd0045b1a52540315042d0f55798c3679cd5f6.tar.gz
gcc-2bfd0045b1a52540315042d0f55798c3679cd5f6.tar.bz2
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
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.misc-tests/options.exp3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index aeaaac0..55c5982 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-16 Alexandre Oliva <oliva@adacore.com>
+
+ * gcc.misc-tests/options.exp: Match /ld and -ld besides
+ /collect2.
+
2019-08-15 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/91443
diff --git a/gcc/testsuite/gcc.misc-tests/options.exp b/gcc/testsuite/gcc.misc-tests/options.exp
index 7953523..c50784c 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
}