tools: use tal/path instead of opencoding most paths.

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

diff --git a/tools/ccanlint/tests/tests_exist.c b/tools/ccanlint/tests/tests_exist.c
index 061a905227da58af30f67bdf484bb2b5d186b445..69e01df6e909ee64c0501384dcc25291efe7afa3 100644 (file)
--- a/tools/ccanlint/tests/tests_exist.c
+++ b/tools/ccanlint/tests/tests_exist.c
@@ -1,4 +1,6 @@
 #include <tools/ccanlint/ccanlint.h>
+#include <ccan/tal/str/str.h>
+#include <ccan/tal/path/path.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -8,15 +10,23 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
-#include <ccan/talloc/talloc.h>
 
+static void check_tests_exist(struct manifest *m,
+                             unsigned int *timeleft, struct score *score);
+
+static struct ccanlint tests_exist = {
+       .key = "tests_exist",
+       .name = "Module has test directory with tests in it",
+       .check = check_tests_exist,
+       .needs = "info_exists"
+};
 REGISTER_TEST(tests_exist);
 
 static void handle_no_tests(struct manifest *m, struct score *score)
 {
        FILE *run;
        struct ccan_file *i;
-       char *test_dir = talloc_asprintf(m, "%s/test", m->dir);
+       char *test_dir = tal_fmt(m, "%s/test", m->dir), *run_file;
 
        printf(
        "CCAN modules have a directory called test/ which contains tests.\n"
@@ -55,16 +65,17 @@ static void handle_no_tests(struct manifest *m, struct score *score)
                        err(1, "Creating test/ directory");
        }
 
-       run = fopen("test/run.c", "w");
+       run_file = tal_fmt(test_dir, "%s/run.c", test_dir);
+       run = fopen(run_file, "w");
        if (!run)
                err(1, "Trying to create a test/run.c");
 
-       fprintf(run, "#include <ccan/%s/%s.h>\n", m->basename, m->basename);
+       fprintf(run, "#include <ccan/%s/%s.h>\n", m->modname, m->basename);
        if (!list_empty(&m->c_files)) {
                fputs("/* Include the C files directly. */\n", run);
                list_for_each(&m->c_files, i, list)
                        fprintf(run, "#include <ccan/%s/%s>\n",
-                               m->basename, i->name);
+                               m->modname, i->name);
        }
        fprintf(run, "%s",
                "#include <ccan/tap/tap.h>\n\n"
@@ -93,22 +104,23 @@ static void handle_no_tests(struct manifest *m, struct score *score)
 }
 
 static void check_tests_exist(struct manifest *m,
-                           bool keep,
                            unsigned int *timeleft, struct score *score)
 {
        struct stat st;
-       char *test_dir = talloc_asprintf(m, "%s/test", m->dir);
+       char *test_dir = path_join(m, m->dir, "test");
 
        if (lstat(test_dir, &st) != 0) {
-               score->error = talloc_strdup(score, "No test directory");
+               score->error = tal_strdup(score, "No test directory");
                if (errno != ENOENT)
                        err(1, "statting %s", test_dir);
                tests_exist.handle = handle_no_tests;
+               /* We "pass" this. */
+               score->pass = true;
                return;
        }
 
        if (!S_ISDIR(st.st_mode)) {
-               score->error = talloc_strdup(score, "test is not a directory");
+               score->error = tal_strdup(score, "test is not a directory");
                return;
        }
 
@@ -116,19 +128,10 @@ static void check_tests_exist(struct manifest *m,
            && list_empty(&m->run_tests)
            && list_empty(&m->compile_ok_tests)
            && list_empty(&m->compile_fail_tests)) {
-               score->error = talloc_strdup(score,
-                                            "No tests in test directory");
+               score->error = tal_strdup(score, "No tests in test directory");
                tests_exist.handle = handle_no_tests;
                return;
        }
        score->pass = true;
        score->score = score->total;
 }
-
-struct ccanlint tests_exist = {
-       .key = "tests_exist",
-       .name = "Module has test directory with tests in it",
-       .check = check_tests_exist,
-       .needs = ""
-};
-