X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Frun_tests_valgrind.c;h=7ab67dbcd83f7550bf4b84a141c480fcc0c9a60a;hb=03a596908b779bbb4b7c2f739c5e238f8c5d6390;hp=e0c2ab9197db29d8fbe60c2194d1cbbd9e68e4d1;hpb=7a163ea2dcafc056fdafc8c71ef011e2bfdbeb65;p=ccan

diff --git a/tools/ccanlint/tests/run_tests_valgrind.c b/tools/ccanlint/tests/run_tests_valgrind.c
index e0c2ab91..7ab67dbc 100644
--- a/tools/ccanlint/tests/run_tests_valgrind.c
+++ b/tools/ccanlint/tests/run_tests_valgrind.c
@@ -19,10 +19,10 @@
 static const char *can_run_vg(struct manifest *m)
 {
 	unsigned int timeleft = default_timeout_ms;
-	char *output = run_command(m, &timeleft,
-				   "valgrind -q --error-exitcode=0 true");
+	char *output;
 
-	if (output)
+	if (!run_command(m, &timeleft, &output,
+			 "valgrind -q --error-exitcode=0 true"))
 		return talloc_asprintf(m, "No valgrind support: %s", output);
 	return NULL;
 }
@@ -41,14 +41,14 @@ static void do_run_tests_vg(struct manifest *m,
 	foreach_ptr(list, &m->run_tests, &m->api_tests) {
 		list_for_each(list, i, list) {
 			score->total++;
-			cmdout = run_command(m, timeleft,
-				     "valgrind -q --error-exitcode=100 %s",
-				     i->compiled);
-			if (cmdout) {
+			if (run_command(score, timeleft, &cmdout,
+					"valgrind -q --error-exitcode=100 %s",
+					i->compiled)) {
+				score->score++;
+			} else {
 				score->error = "Running under valgrind";
 				score_file_error(score, i, 0, cmdout);
-			} else
-				score->score++;
+			}
 		}
 	}