tools: don't assume modules are immediately below ccan/ dir.

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

diff --git a/tools/ccanlint/tests/tests_exist.c b/tools/ccanlint/tests/tests_exist.c
index 2fc1664fd254adda189ffd4a181bb9eeae3363a8..a90ce0c021c71f3c10cfbe11d7e937f9e98fa55d 100644 (file)
--- a/tools/ccanlint/tests/tests_exist.c
+++ b/tools/ccanlint/tests/tests_exist.c
@@ -10,6 +10,15 @@
 #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)
@@ -60,12 +69,12 @@ static void handle_no_tests(struct manifest *m, struct score *score)
        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"
@@ -126,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 = "info_exists"
-};
-