ntdb: assume HAVE_CCAN in header.

[ccan] / tools / ccanlint / tests / tests_pass_valgrind.c

diff --git a/tools/ccanlint/tests/tests_pass_valgrind.c b/tools/ccanlint/tests/tests_pass_valgrind.c
index d697cd981a1b19037781754c4cedb8634c4f7437..2f4df18b47e4382a3ea8d7032f78411fece3b536 100644 (file)
--- a/tools/ccanlint/tests/tests_pass_valgrind.c
+++ b/tools/ccanlint/tests/tests_pass_valgrind.c
@@ -3,6 +3,7 @@
 #include <ccan/str/str.h>
 #include <ccan/take/take.h>
 #include <ccan/foreach/foreach.h>
+#include <ccan/tal/grab_file/grab_file.h>
 #include "tests_pass.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -180,7 +181,7 @@ static void do_run_tests_vg(struct manifest *m,
                                continue;
                        }
 
-                       output = tal_grab_file(i, i->valgrind_log, NULL);
+                       output = grab_file(i, i->valgrind_log);
                        /* No valgrind errors? */
                        if (!output || output[0] == '\0') {
                                err = NULL;
@@ -250,10 +251,10 @@ static void run_under_debugger_vg(struct manifest *m, struct score *score)
                return;
 
        first = list_top(&score->per_file_errors, struct file_error, list);
-       command = tal_fmt(m, "valgrind --leak-check=full --db-attach=yes%s %s",
+       command = tal_fmt(m, "valgrind --leak-check=full --db-attach=yes%s %s %s",
                          concat(score, per_file_options(&tests_pass_valgrind,
                                                         first->file)),
-                         first->file->compiled[COMPILE_NORMAL]);
+                         valgrind_suppress, first->file->compiled[COMPILE_NORMAL]);
        if (system(command))
                doesnt_matter();
 }