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

diff --git a/tools/ccanlint/tests/tests_exist.c b/tools/ccanlint/tests/tests_exist.c
index 86f7ef27..a90ce0c0 100644
--- 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,16 +64,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 = 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");
 
-	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,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;
 	}
 
@@ -114,24 +125,13 @@ 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;
 	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 = ""
-};
-