ccanlint: use traversal to trim tests we want to skip.

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

diff --git a/tools/ccanlint/tests/tests_exist.c b/tools/ccanlint/tests/tests_exist.c
index 64b2691e0eaceba570e0e7595cda0a543b3e134d..57fd4e11769e664b77afdab30a24f3a145c9a740 100644 (file)
--- a/tools/ccanlint/tests/tests_exist.c
+++ b/tools/ccanlint/tests/tests_exist.c
@@ -10,13 +10,13 @@
 #include <err.h>
 #include <ccan/talloc/talloc.h>
 
-extern struct ccanlint tests_exist;
+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 +55,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");
 
@@ -104,6 +105,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;
        }
 
@@ -114,14 +117,11 @@ static void check_tests_exist(struct manifest *m,
 
        if (list_empty(&m->api_tests)
            && list_empty(&m->run_tests)
-           && list_empty(&m->compile_ok_tests)) {
-               if (list_empty(&m->compile_fail_tests)) {
-                       score->error = talloc_strdup(score,
+           && list_empty(&m->compile_ok_tests)
+           && list_empty(&m->compile_fail_tests)) {
+               score->error = talloc_strdup(score,
                                             "No tests in test directory");
-                       tests_exist.handle = handle_no_tests;
-               } else
-                       score->error = talloc_strdup(score,
-                                    "No positive tests in test directory");
+               tests_exist.handle = handle_no_tests;
                return;
        }
        score->pass = true;
@@ -132,7 +132,6 @@ struct ccanlint tests_exist = {
        .key = "tests_exist",
        .name = "Module has test directory with tests in it",
        .check = check_tests_exist,
-       .needs = ""
+       .needs = "info_exists"
 };
 
-REGISTER_TEST(tests_exist);