#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>
static void check_tests_exist(struct manifest *m,
unsigned int *timeleft, struct score *score);
};
REGISTER_TEST(tests_exist);
-static void handle_no_tests(struct manifest *m, struct score *score)
+static void handle_no_tests(struct manifest *m, struct score *score UNNEEDED)
{
FILE *run;
struct ccan_file *i;
- char *test_dir = talloc_asprintf(m, "%s/test", m->dir), *run_file;
+ 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_file = talloc_asprintf(test_dir, "%s/run.c", test_dir);
+ 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");
}
static void check_tests_exist(struct manifest *m,
- unsigned int *timeleft, struct score *score)
+ unsigned int *timeleft UNNEEDED,
+ 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 = talloc_strdup(score, "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;
}
if (!S_ISDIR(st.st_mode)) {
- score->error = talloc_strdup(score, "test is not a directory");
+ score->error = tal_strdup(score, "test is not a directory");
return;
}
&& list_empty(&m->run_tests)
&& list_empty(&m->compile_ok_tests)
&& list_empty(&m->compile_fail_tests)) {
- score->error = talloc_strdup(score,
- "No tests in test directory");
+ score->error = tal_strdup(score, "No tests in test directory");
tests_exist.handle = handle_no_tests;
return;
}