ccanlint: use ccan/autodata

[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..efa997536c969ee3373b4c6193664f99028bd9ed 100644 (file)
--- a/tools/ccanlint/tests/tests_exist.c
+++ b/tools/ccanlint/tests/tests_exist.c
@@ -10,13 +10,22 @@
 #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 = talloc_asprintf(m, "%s/test", m->dir), *run_file;
 
        printf(
        "CCAN modules have a directory called test/ which contains tests.\n"
@@ -55,7 +64,8 @@ static void handle_no_tests(struct manifest *m, struct score *score)
                        err(1, "Creating test/ directory");
        }
 
-       run = fopen("test/run.c", "w");
+       run_file = talloc_asprintf(test_dir, "%s/run.c", test_dir);
+       run = fopen(run_file, "w");
        if (!run)
                err(1, "Trying to create a test/run.c");
 
@@ -93,7 +103,6 @@ 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;
@@ -104,6 +113,8 @@ static void check_tests_exist(struct manifest *m,
                if (errno != ENOENT)
                        err(1, "statting %s", test_dir);
                tests_exist.handle = handle_no_tests;
+               /* We "pass" this. */
+               score->pass = true;
                return;
        }
 
@@ -124,11 +135,3 @@ static void check_tests_exist(struct manifest *m,
        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 = ""
-};
-