ccanlint: handle nested modules when mentioned in examples.

[ccan] / tools / ccanlint / tests / tests_coverage.c

diff --git a/tools/ccanlint/tests/tests_coverage.c b/tools/ccanlint/tests/tests_coverage.c
index 67829e96918f8fe4e1509ac8830fd27a83e2b9cb..3d5216ffebd9495568b9045d4d5c3e9eca42cc06 100644 (file)
--- 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;
@@ -127,7 +135,6 @@ static void analyze_coverage(struct manifest *m, bool full_gcov,
 }
 
 static void do_run_coverage_tests(struct manifest *m,
-                                 bool keep,
                                  unsigned int *timeleft, struct score *score)
 {
        struct ccan_file *i;
@@ -135,28 +142,20 @@ static void do_run_coverage_tests(struct manifest *m,
        char *covcmd;
        bool full_gcov = (verbose > 1);
        struct list_head *list;
+       bool ran_some = false;
 
        /* This tells gcov where we put those .gcno files. */
-       outdir = talloc_dirname(score, m->info_file->compiled);
+       outdir = talloc_dirname(score,
+                               m->info_file->compiled[COMPILE_NORMAL]);
        covcmd = talloc_asprintf(m, "gcov %s -o %s",
                                 full_gcov ? "" : "-n",
                                 outdir);
 
-       /* Unlink these files afterwards. */
-       if (!keep) {
-               talloc_set_destructor(talloc_asprintf(score,
-                                                     "%s/run.gcno", outdir),
-                                     unlink_file_destructor);
-               talloc_set_destructor(talloc_asprintf(score,
-                                                     "%s/run.gcda", outdir),
-                                     unlink_file_destructor);
-       }
-
        /* Run them all. */
        foreach_ptr(list, &m->run_tests, &m->api_tests) {
                list_for_each(list, i, list) {
                        if (run_command(score, timeleft, &cmdout,
-                                       "%s", i->cov_compiled)) {
+                                       "%s", i->compiled[COMPILE_COVERAGE])) {
                                covcmd = talloc_asprintf_append(covcmd, " %s",
                                                                i->fullname);
                        } else {
@@ -165,9 +164,17 @@ static void do_run_coverage_tests(struct manifest *m,
                                                 " failed: %s", cmdout);
                                return;
                        }
+                       ran_some = true;
                }
        }
 
+       /* No tests at all?  0 out of 0 for you... */
+       if (!ran_some) {
+               score->total = score->score = 0;
+               score->pass = true;
+               return;
+       }
+
        /* Now run gcov: we want output even if it succeeds. */
        if (!run_command(score, timeleft, &cmdout, "%s", covcmd)) {
                score->error = talloc_asprintf(score, "Running gcov: %s",