X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_coverage.c;h=3d5216ffebd9495568b9045d4d5c3e9eca42cc06;hb=932d65dd6537250e617516749f03a00fea3b34f6;hp=af8d6f21c845948fbbae3cd1413cbfc6ac8e2938;hpb=051db34fb275491d4d5dfa5bf7970e8e525766d8;p=ccan

diff --git a/tools/ccanlint/tests/tests_coverage.c b/tools/ccanlint/tests/tests_coverage.c
index af8d6f21..3d5216ff 100644
--- a/tools/ccanlint/tests/tests_coverage.c
+++ b/tools/ccanlint/tests/tests_coverage.c
@@ -54,19 +54,25 @@ static unsigned int score_coverage(float covered, unsigned total)
 static void analyze_coverage(struct manifest *m, bool full_gcov,
 			     const char *output, struct score *score)
 {
-	char **lines = strsplit(score, output, "\n", NULL);
+	char **lines = strsplit(score, output, "\n");
 	float covered_lines = 0.0;
 	unsigned int i, total_lines = 0;
 	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;
@@ -110,6 +118,10 @@ static void analyze_coverage(struct manifest *m, bool full_gcov,
 
 	score->pass = true;
 
+	if (verbose > 1)
+		printf("%u of %u lines covered\n",
+		       (unsigned)covered_lines, total_lines);
+
 	/* Nothing covered?  We can't tell if there's a source file which
 	 * was never executed, or there really is no code to execute, so
 	 * assume the latter: this test deserves no score. */
@@ -123,35 +135,46 @@ 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;
-	char *cmdout;
+	char *cmdout, *outdir;
 	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[COMPILE_NORMAL]);
 	covcmd = talloc_asprintf(m, "gcov %s -o %s",
 				 full_gcov ? "" : "-n",
-				 talloc_dirname(score, m->info_file->compiled));
+				 outdir);
 
 	/* 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 {
-				score->error = "Running test with coverage";
-				score_file_error(score, i, 0, cmdout);
+				score_file_error(score, i, 0,
+						 "Running test with coverage"
+						 " 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",