summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-10-05 11:45:24 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-10-05 11:45:24 +0930
commitd638b7e4d67ea147a35e8e4c3b41e85e35cf9d97 (patch)
treeaf3e80d13ce392f897c41f41796d6f09454dd1bd
parent4be05500e605ccc0a68f1d3704c12ffd03cf2dfb (diff)
ccanlint: fix coverage display for gcov 4.7
David Gibson reports a new format, meaning we didn't show the gcov files with -vv.
-rw-r--r--tools/ccanlint/tests/tests_coverage.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/ccanlint/tests/tests_coverage.c b/tools/ccanlint/tests/tests_coverage.c
index 69ca0350..3d5216ff 100644
--- a/tools/ccanlint/tests/tests_coverage.c
+++ b/tools/ccanlint/tests/tests_coverage.c
@@ -60,13 +60,19 @@ static void analyze_coverage(struct manifest *m, bool full_gcov,
bool lines_matter = false;
/*
- Output looks like:
+ Output looks like: (gcov 4.6.3)
File '../../../ccan/tdb2/private.h'
Lines executed:0.00% of 8
/home/ccan/ccan/tdb2/test/run-simple-delete.c:creating 'run-simple-delete.c.gcov'
File '../../../ccan/tdb2/tdb.c'
Lines executed:0.00% of 450
+
+ For gcov 4.7.2:
+
+ File '/home/dwg/src/ccan/ccan/rfc822/test/run-check-check.c'
+ Lines executed:100.00% of 19
+ Creating 'run-check-check.c.gcov'
*/
for (i = 0; lines[i]; i++) {
@@ -86,7 +92,9 @@ static void analyze_coverage(struct manifest *m, bool full_gcov,
errx(1, "Could not parse line '%s'", lines[i]);
total_lines += of;
covered_lines += ex / 100.0 * of;
- } else if (full_gcov && strstr(lines[i], ":creating '")) {
+ } else if (full_gcov
+ && (strstr(lines[i], ":creating '")
+ || strstarts(lines[i], "Creating '"))) {
char *file, *filename, *apostrophe;
apostrophe = strchr(lines[i], '\'');
filename = apostrophe + 1;