[PATCH] Fix how we match for count(n*) in gcov tests.

[Martin Liška]

Hi.

A small tweak in tests that fixes pattern of following form: /* count(1*). */
I'm going to install the patch.

Martin

gcc/testsuite/ChangeLog:

2018-11-19  Martin Liska  <mli...@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*).
---
 gcc/testsuite/g++.dg/gcov/pr84548.C | 2 +-
 gcc/testsuite/g++.dg/gcov/ternary.C | 2 +-
 gcc/testsuite/lib/gcov.exp          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



diff --git a/gcc/testsuite/g++.dg/gcov/pr84548.C b/gcc/testsuite/g++.dg/gcov/pr84548.C
index 6c22c1902f2..3b60b90e2a2 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 d055928c295..9b8e34644b4 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 a7b8c0a1ef4..dbd3c8e8e44 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] {