ccanlint: make _info ported an empty string on success.

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

diff --git a/tools/ccanlint/tests/main_header_compiles.c b/tools/ccanlint/tests/main_header_compiles.c
index 99f3aa38855928e8611dc0967f4ff854a65e6ed9..f54c6173a53578e76c6e805cf281ef7319a6c19a 100644 (file)
--- a/tools/ccanlint/tests/main_header_compiles.c
+++ b/tools/ccanlint/tests/main_header_compiles.c
@@ -1,7 +1,5 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
-#include <ccan/grab_file/grab_file.h>
 #include <ccan/str/str.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -36,7 +34,6 @@ static struct ccan_file *main_header(struct manifest *m)
 }
 
 static void check_includes_build(struct manifest *m,
-                                bool keep,
                                 unsigned int *timeleft, struct score *score)
 {
        char *contents;
@@ -44,15 +41,15 @@ static void check_includes_build(struct manifest *m,
        int fd;
        struct ccan_file *mainh = main_header(m);
 
-       tmpsrc = maybe_temp_file(m, "-included.c", keep, mainh->fullname);
-       tmpobj = maybe_temp_file(m, ".o", keep, tmpsrc);
+       tmpsrc = temp_file(m, "-included.c", mainh->fullname);
+       tmpobj = temp_file(m, ".o", tmpsrc);
 
        fd = open(tmpsrc, O_WRONLY | O_CREAT | O_EXCL, 0600);
        if (fd < 0)
                err(1, "Creating temporary file %s", tmpsrc);
 
-       contents = talloc_asprintf(tmpsrc, "#include <ccan/%s/%s.h>\n",
-                                  m->basename, m->basename);
+       contents = tal_fmt(tmpsrc, "#include <ccan/%s/%s.h>\n",
+                          m->modname, m->basename);
        if (write(fd, contents, strlen(contents)) != strlen(contents))
                err(1, "writing to temporary file %s", tmpsrc);
        close(fd);
@@ -62,7 +59,7 @@ static void check_includes_build(struct manifest *m,
                score->pass = true;
                score->score = score->total;
        } else {
-               score->error = talloc_asprintf(score,
+               score->error = tal_fmt(score,
                                       "#include of the main header file:\n%s",
                                       cmdout);
        }
@@ -73,7 +70,7 @@ struct ccanlint main_header_compiles = {
        .name = "Modules main header compiles",
        .check = check_includes_build,
        .can_run = can_build,
-       .needs = "depends_exist main_header_exists"
+       .needs = "depends_exist main_header_exists info_ported"
 };
 
 REGISTER_TEST(main_header_compiles);