#include <tools/ccanlint/ccanlint.h>
+#include <ccan/tal/str/str.h>
+#include <ccan/tal/path/path.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdlib.h>
#include <stdio.h>
#include <err.h>
-#include <ccan/talloc/talloc.h>
-extern struct ccanlint tests_exist;
+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 = tal_fmt(m, "%s/test", m->dir), *run_file;
printf(
"CCAN modules have a directory called test/ which contains tests.\n"
err(1, "Creating test/ directory");
}
- run = fopen("test/run.c", "w");
+ run_file = tal_fmt(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"
}
static void check_tests_exist(struct manifest *m,
- bool keep,
unsigned int *timeleft, struct score *score)
{
struct stat st;
- char *test_dir = talloc_asprintf(m, "%s/test", m->dir);
+ char *test_dir = path_join(m, m->dir, "test");
if (lstat(test_dir, &st) != 0) {
- score->error = "No test directory";
+ score->error = tal_strdup(score, "No test directory");
if (errno != ENOENT)
err(1, "statting %s", test_dir);
tests_exist.handle = handle_no_tests;
+ /* We "pass" this. */
+ score->pass = true;
return;
}
if (!S_ISDIR(st.st_mode)) {
- score->error = "test is not a directory";
+ score->error = tal_strdup(score, "test is not a directory");
return;
}
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 = "No tests in test directory";
- tests_exist.handle = handle_no_tests;
- } else
- score->error = "No positive tests in test directory";
+ && list_empty(&m->compile_ok_tests)
+ && list_empty(&m->compile_fail_tests)) {
+ score->error = tal_strdup(score, "No 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 = ""
-};
-
-REGISTER_TEST(tests_exist);