X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Frun_tests_valgrind.c;h=4b425ea23ba59d7baa3d689ddbbd58355596af8f;hp=b89541f331475c510dd5a464b8826d418ce74003;hb=f24a8d30f5b6b8c0e642a357e4dae6f9277d041f;hpb=d1d6625caf6e9897a4a0479c0e04fee27de5b20e

diff --git a/tools/ccanlint/tests/run_tests_valgrind.c b/tools/ccanlint/tests/run_tests_valgrind.c
index b89541f3..4b425ea2 100644
--- a/tools/ccanlint/tests/run_tests_valgrind.c
+++ b/tools/ccanlint/tests/run_tests_valgrind.c
@@ -17,7 +17,8 @@
 /* Note: we already test safe_mode in run_tests.c */
 static const char *can_run_vg(struct manifest *m)
 {
-	char *output = run_command(m, "valgrind -q true");
+	unsigned int timeleft = default_timeout_ms;
+	char *output = run_command(m, &timeleft, "valgrind -q --error-exitcode=0 true");
 
 	if (output)
 		return talloc_asprintf(m, "No valgrind support: %s", output);
@@ -30,7 +31,9 @@ struct run_tests_result {
 	const char *output;
 };
 
-static void *do_run_tests_vg(struct manifest *m)
+static void *do_run_tests_vg(struct manifest *m,
+			     bool keep,
+			     unsigned int *timeleft)
 {
 	struct list_head *list = talloc(m, struct list_head);
 	struct run_tests_result *res;
@@ -40,9 +43,10 @@ static void *do_run_tests_vg(struct manifest *m)
 	list_head_init(list);
 
 	list_for_each(&m->run_tests, i, list) {
-		run_tests.total_score++;
-		/* FIXME: timeout here */
-		cmdout = run_command(m, "valgrind -q %s", i->compiled);
+		run_tests_vg.total_score++;
+		cmdout = run_command(m, timeleft,
+				     "valgrind -q --error-exitcode=100 %s",
+				     i->compiled);
 		if (cmdout) {
 			res = talloc(list, struct run_tests_result);
 			res->file = i;
@@ -52,9 +56,10 @@ static void *do_run_tests_vg(struct manifest *m)
 	}
 
 	list_for_each(&m->api_tests, i, list) {
-		run_tests.total_score++;
-		/* FIXME: timeout here */
-		cmdout = run_command(m, "valgrind -q %s", i->compiled);
+		run_tests_vg.total_score++;
+		cmdout = run_command(m, timeleft,
+				     "valgrind -q --error-exitcode=100 %s",
+				     i->compiled);
 		if (cmdout) {
 			res = talloc(list, struct run_tests_result);
 			res->file = i;
@@ -75,7 +80,7 @@ static unsigned int score_run_tests_vg(struct manifest *m, void *check_result)
 {
 	struct list_head *list = check_result;
 	struct run_tests_result *i;
-	unsigned int score = run_tests.total_score;
+	unsigned int score = run_tests_vg.total_score;
 
 	list_for_each(list, i, list)
 		score--;
@@ -95,20 +100,28 @@ static const char *describe_run_tests_vg(struct manifest *m,
 	return descrip;
 }
 
+/* Gcc's warn_unused_result is fascist bullshit. */
+#define doesnt_matter()
+
 static void run_under_debugger_vg(struct manifest *m, void *check_result)
 {
 	struct list_head *list = check_result;
 	struct run_tests_result *first;
+	char *command;
 
 	if (!ask("Should I run the first failing test under the debugger?"))
 		return;
 
 	first = list_top(list, struct run_tests_result, list);
-	run_command(m, "valgrind --db-attach=yes %s", first->file->compiled);
+	command = talloc_asprintf(m, "valgrind --db-attach=yes %s",
+				  first->file->compiled);
+	if (system(command))
+		doesnt_matter();
 }
 
 struct ccanlint run_tests_vg = {
-	.name = "run and api tests under valgrind",
+	.key = "valgrind-tests",
+	.name = "Module's run and api tests succeed under valgrind",
 	.score = score_run_tests_vg,
 	.check = do_run_tests_vg,
 	.describe = describe_run_tests_vg,