ccanlint: --deps-fail-ignore.

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

diff --git a/tools/ccanlint/tests/tests_pass.c b/tools/ccanlint/tests/tests_pass.c
index 6ec17396167122eb89eee33b14c3e5bae9543e24..cb093264c74ba7d2a3500c49fe6b2151f6518395 100644 (file)
--- a/tools/ccanlint/tests/tests_pass.c
+++ b/tools/ccanlint/tests/tests_pass.c
@@ -1,6 +1,6 @@
 #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 <sys/types.h>
@@ -36,12 +36,12 @@ static const char *can_run(struct manifest *m)
 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;
 }
@@ -60,11 +60,9 @@ static void 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);
 
                        run_command_async(i, *timeleft,
                                          "valgrind -q"
@@ -83,7 +81,6 @@ static void run_test(void *ctx,
 }
 
 static void do_run_tests(struct manifest *m,
-                        bool keep,
                         unsigned int *timeleft,
                         struct score *score)
 {
@@ -129,8 +126,8 @@ 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]);
+       command = tal_fmt(m, "gdb -ex 'break tap.c:139' -ex 'run' %s",
+                         first->file->compiled[COMPILE_NORMAL]);
        if (system(command))
                doesnt_matter();
 }