X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_pass_valgrind.c;h=7ef0ac1aa9ac72809473befa118538580d820a1e;hp=6bb27e875a8976133e988792ef361e76bf090e28;hb=299dc8f99ca642943db4f0204b5fe31065545d27;hpb=0f76c8b33771d01df2ce92974b88a69840bed321

diff --git a/tools/ccanlint/tests/tests_pass_valgrind.c b/tools/ccanlint/tests/tests_pass_valgrind.c
index 6bb27e87..7ef0ac1a 100644
--- a/tools/ccanlint/tests/tests_pass_valgrind.c
+++ b/tools/ccanlint/tests/tests_pass_valgrind.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <ctype.h>
 
-struct ccanlint run_tests_vg;
+REGISTER_TEST(tests_pass_valgrind);
 
 /* Note: we already test safe_mode in run_tests.c */
 static const char *can_run_vg(struct manifest *m)
@@ -52,11 +52,11 @@ static bool blank_line(const char *line)
 static char *get_leaks(const char *output, char **errs)
 {
 	char *leaks = talloc_strdup(output, "");
-	unsigned int i, num;
-	char **lines = strsplit(output, output, "\n", &num);
+	unsigned int i;
+	char **lines = strsplit(output, output, "\n");
 
 	*errs = talloc_strdup(output, "");
-	for (i = 0; i < num; i++) {
+	for (i = 0; i < talloc_array_length(lines) - 1; i++) {
 		if (strstr(lines[i], " lost ")) {
 			/* A leak... */
 			if (strstr(lines[i], " definitely lost ")) {
@@ -112,20 +112,22 @@ static void do_run_tests_vg(struct manifest *m,
 			 * humans, and you can't have both. */
 			run_command(score, timeleft, &cmdout,
 				    "valgrind -q --error-exitcode=101"
+				    " --child-silent-after-fork=yes"
 				    " --leak-check=full"
 				    " --log-fd=3 %s %s"
 				    " 3> valgrind.log",
-				    run_tests_vg.options ?
-				    run_tests_vg.options : "",
+				    tests_pass_valgrind.options ?
+				    tests_pass_valgrind.options : "",
 				    i->compiled);
 			output = grab_file(i, "valgrind.log", NULL);
 			if (!output || output[0] == '\0') {
 				err = NULL;
+				i->leak_info = NULL;
 			} else {
 				i->leak_info = get_leaks(output, &err);
 			}
 			if (err)
-				score_file_error(score, i, 0, err);
+				score_file_error(score, i, 0, "%s", err);
 			else
 				score->score++;
 		}
@@ -147,7 +149,8 @@ static void do_leakcheck_vg(struct manifest *m,
 	foreach_ptr(list, &m->run_tests, &m->api_tests) {
 		list_for_each(list, i, list) {
 			if (i->leak_info) {
-				score_file_error(score, i, 0, i->leak_info);
+				score_file_error(score, i, 0, "%s",
+						 i->leak_info);
 				leaks = true;
 			}
 		}
@@ -172,8 +175,8 @@ static void run_under_debugger_vg(struct manifest *m, struct score *score)
 
 	first = list_top(&score->per_file_errors, struct file_error, list);
 	command = talloc_asprintf(m, "valgrind --db-attach=yes%s %s",
-				  run_tests_vg.options ?
-				  run_tests_vg.options : "",
+				  tests_pass_valgrind.options ?
+				  tests_pass_valgrind.options : "",
 				  first->file->compiled);
 	if (system(command))
 		doesnt_matter();
@@ -189,8 +192,6 @@ struct ccanlint tests_pass_valgrind = {
 	.needs = "tests_pass"
 };
 
-REGISTER_TEST(tests_pass_valgrind);
-
 struct ccanlint tests_pass_valgrind_noleaks = {
 	.key = "tests_pass_valgrind_noleaks",
 	.name = "Module's run and api tests have no memory leaks",