diff options
| author | Martin Liska <mliska@suse.cz> | 2018-11-19 12:19:15 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2018-11-19 11:19:15 +0000 |
| commit | ddd6f407e8021812c6205bebc40098b87faa4239 (patch) | |
| tree | b6b0146ed4f17a055f11d5cd72b372179ae99e2c /gcc | |
| parent | d86b600d897573373606f052fc76cf9102d4be34 (diff) | |
| download | gcc-ddd6f407e8021812c6205bebc40098b87faa4239.zip gcc-ddd6f407e8021812c6205bebc40098b87faa4239.tar.gz gcc-ddd6f407e8021812c6205bebc40098b87faa4239.tar.bz2 | |
Fix how we match for count(n*) in gcov tests.
2018-11-19 Martin Liska <mliska@suse.cz>
* g++.dg/gcov/pr84548.C: Remove remove-gcda.
* g++.dg/gcov/ternary.C: Likewise.
* lib/gcov.exp: Support pattern of following form:
count(1*).
From-SVN: r266270
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gcov/pr84548.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gcov/ternary.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gcov.exp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 271055d..3fff2c8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-11-19 Martin Liska <mliska@suse.cz> + + * g++.dg/gcov/pr84548.C: Remove remove-gcda. + * g++.dg/gcov/ternary.C: Likewise. + * lib/gcov.exp: Support pattern of following form: + count(1*). + 2018-11-19 Eric Botcazou <ebotcazou@adacore.com> * gcc.target/visium/overflow8.c: Remove -fno-if-conversion and diff --git a/gcc/testsuite/g++.dg/gcov/pr84548.C b/gcc/testsuite/g++.dg/gcov/pr84548.C index 6c22c19..3b60b90 100644 --- a/gcc/testsuite/g++.dg/gcov/pr84548.C +++ b/gcc/testsuite/g++.dg/gcov/pr84548.C @@ -16,4 +16,4 @@ int main() return 0; } -// { dg-final { run-gcov remove-gcda pr84548.C } } +// { dg-final { run-gcov pr84548.C } } diff --git a/gcc/testsuite/g++.dg/gcov/ternary.C b/gcc/testsuite/g++.dg/gcov/ternary.C index d055928..9b8e346 100644 --- a/gcc/testsuite/g++.dg/gcov/ternary.C +++ b/gcc/testsuite/g++.dg/gcov/ternary.C @@ -9,4 +9,4 @@ int main() return a; } -// { dg-final { run-gcov remove-gcda ternary.C } } +// { dg-final { run-gcov ternary.C } } diff --git a/gcc/testsuite/lib/gcov.exp b/gcc/testsuite/lib/gcov.exp index a7b8c0a..dbd3c8e 100644 --- a/gcc/testsuite/lib/gcov.exp +++ b/gcc/testsuite/lib/gcov.exp @@ -59,7 +59,7 @@ proc verify-lines { testname testcase file } { while { [gets $fd line] >= 0 } { # We want to match both "-" and "#####" as count as well as numbers, # since we want to detect lines that shouldn't be marked as covered. - if [regexp "^ *(\[^:]*): *(\[0-9\\-#]+):.*count\\((\[0-9\\-#=\\.kMGTPEZY]+)\\)(.*)" \ + if [regexp "^ *(\[^:]*): *(\[0-9\\-#]+):.*count\\((\[0-9\\-#=\\.kMGTPEZY\*]+)\\)(.*)" \ "$line" all is n shouldbe rest] { if [regexp "^ *{(.*)}" $rest all xfailed] { switch [dg-process-target $xfailed] { |