X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_pass.c;h=ba6103de2d50bf118b1952df3e7c28f66f16e7a2;hp=cbf01fd4e13e9b83df06378d97b276e2fdddc9f0;hb=dfafd0a1f522277c9be5fc589885db38f706d108;hpb=b931f4765272d68de3b5e35d70c1933c27bcdea4

diff --git a/tools/ccanlint/tests/tests_pass.c b/tools/ccanlint/tests/tests_pass.c
index cbf01fd4..ba6103de 100644
--- a/tools/ccanlint/tests/tests_pass.c
+++ b/tools/ccanlint/tests/tests_pass.c
@@ -1,8 +1,9 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/take/take.h>
 #include <ccan/str/str.h>
 #include <ccan/foreach/foreach.h>
+#include <ccan/tal/path/path.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -17,6 +18,7 @@
 #include "tests_pass.h"
 
 bool do_valgrind = false;
+const char *valgrind_suppress = "";
 
 static const char *can_run(struct manifest *m)
 {
@@ -27,28 +29,37 @@ static const char *can_run(struct manifest *m)
 
 	if (!is_excluded("tests_pass_valgrind")
 	    && run_command(m, &timeleft, &output,
-			   "valgrind -q true"))
+			   "valgrind -q true")) {
+		const char *sfile;
+
 		do_valgrind = true;
 
+		/* Check for suppressions file for all of CCAN. */
+		sfile = path_join(m, ccan_dir, ".valgrind_suppressions");
+		if (path_is_file(sfile))
+			valgrind_suppress = tal_fmt(m, "--suppressions=%s",
+						    sfile);
+	}
+
 	return NULL;
 }
 
 static const char *concat(struct score *score, char *bits[])
 {
 	unsigned int i;
-	char *ret = talloc_strdup(score, "");
+	char *ret = tal_strdup(score, "");
 
 	for (i = 0; bits[i]; i++) {
 		if (i)
-			ret = talloc_append_string(ret, " ");
-		ret = talloc_append_string(ret, bits[i]);
+			ret = tal_strcat(score, take(ret), " ");
+		ret = tal_strcat(score, take(ret), bits[i]);
 	}
 	return ret;
 }
 
-static bool run_test(void *ctx,
+static void run_test(void *ctx,
 		     struct manifest *m,
-		     unsigned int *timeleft, char **cmdout,
+		     unsigned int *timeleft,
 		     struct ccan_file *i)
 {
 	if (do_valgrind) {
@@ -60,47 +71,54 @@ static bool run_test(void *ctx,
 			/* FIXME: Valgrind's output sucks.  XML is
 			 * unreadable by humans *and* doesn't support
 			 * children reporting. */
-			i->valgrind_log = talloc_asprintf(m,
+			i->valgrind_log = tal_fmt(m,
 					  "%s.valgrind-log",
 					  i->compiled[COMPILE_NORMAL]);
-			talloc_set_destructor(i->valgrind_log,
-					      unlink_file_destructor);
-
-			return run_command(ctx, timeleft, cmdout,
-					   "valgrind -q"
-					   " --leak-check=full"
-					   " --log-fd=3 %s %s"
-					   " 3> %s",
-					   options,
-					   i->compiled[COMPILE_NORMAL],
-					   i->valgrind_log);
+
+			run_command_async(i, *timeleft,
+					  "valgrind -q"
+					  " --leak-check=full"
+					  " --log-fd=3 %s %s %s"
+					  " 3> %s",
+					  valgrind_suppress, options,
+					  i->compiled[COMPILE_NORMAL],
+					  i->valgrind_log);
+			return;
 		}
 	}
 
-	return run_command(m, timeleft, cmdout, "%s",
-			   i->compiled[COMPILE_NORMAL]);
+	run_command_async(i, *timeleft, "%s",
+			  i->compiled[COMPILE_NORMAL]);
 }
 
 static void do_run_tests(struct manifest *m,
-			 bool keep,
 			 unsigned int *timeleft,
 			 struct score *score)
 {
 	struct list_head *list;
 	struct ccan_file *i;
 	char *cmdout;
+	bool ok;
 
 	score->total = 0;
 	foreach_ptr(list, &m->run_tests, &m->api_tests) {
 		list_for_each(list, i, list) {
 			score->total++;
-			if (run_test(score, m, timeleft, &cmdout, i))
-				score->score++;
-			else
-				score_file_error(score, i, 0, "%s", cmdout);
+			if (verbose >= 2)
+				printf("   %s...\n", i->name);
+			run_test(score, m, timeleft, i);
 		}
 	}
 
+	while ((i = collect_command(&ok, &cmdout)) != NULL) {
+		if (!ok)
+			score_file_error(score, i, 0, "%s", cmdout);
+		else
+			score->score++;
+		if (verbose >= 2)
+			printf("   ...%s\n", i->name);
+	}
+
 	if (score->score == score->total)
 		score->pass = true;
 }
@@ -119,10 +137,11 @@ static void run_under_debugger(struct manifest *m, struct score *score)
 	if (!ask("Should I run the first failing test under the debugger?"))
 		return;
 
-	command = talloc_asprintf(m, "gdb -ex 'break tap.c:139' -ex 'run' %s",
-				  first->file->compiled[COMPILE_NORMAL]);
-	if (system(command))
+	command = tal_fmt(m, "gdb -ex 'break tap.c:139' -ex 'run' %s",
+			  first->file->compiled[COMPILE_NORMAL]);
+	if (system(command)) {
 		doesnt_matter();
+	}
 }
 
 struct ccanlint tests_pass = {