X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_coverage.c;h=69ca0350d338072f3729461e11a69ba2dd820d58;hb=87c679ff36d7b198862cd2652a384d90f89f3b2b;hp=a8da103f045fed21280625a1bbf9c4c4e44814c8;hpb=37c06f735fe985f19f6fadf47d03b15fa45b5317;p=ccan

diff --git a/tools/ccanlint/tests/tests_coverage.c b/tools/ccanlint/tests/tests_coverage.c
index a8da103f..69ca0350 100644
--- a/tools/ccanlint/tests/tests_coverage.c
+++ b/tools/ccanlint/tests/tests_coverage.c
@@ -127,7 +127,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;
@@ -138,26 +137,17 @@ static void do_run_coverage_tests(struct manifest *m,
 	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 {