X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_exist.c;h=a90ce0c021c71f3c10cfbe11d7e937f9e98fa55d;hb=932d65dd6537250e617516749f03a00fea3b34f6;hp=523fe99f716c19c4101cc880077511e2da6e13e1;hpb=2d31e99c851a669e22b79b9a8107b148c280816f;p=ccan

diff --git a/tools/ccanlint/tests/tests_exist.c b/tools/ccanlint/tests/tests_exist.c
index 523fe99f..a90ce0c0 100644
--- 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"
@@ -94,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;
@@ -127,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 = ""
-};
-