#include <err.h>
#include <ctype.h>
#include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/take/take.h>
#include <ccan/opt/opt.h>
#include <ccan/foreach/foreach.h>
#include <ccan/cast/cast.h>
#include <ccan/tlist/tlist.h>
+#include <ccan/tal/path/path.h>
#include <ccan/strmap/strmap.h>
struct ccanlint_map {
if (i->done)
return true;
- score = talloc(run->m, struct score);
+ score = tal(run->m, struct score);
list_head_init(&score->per_file_errors);
score->error = NULL;
score->pass = false;
{
if (!strmap_add(&tests, test->key, test))
err(1, "Adding test %s", test->key);
- test->options = talloc_array(NULL, char *, 1);
+ test->options = tal_arr(NULL, char *, 1);
test->options[0] = NULL;
dgraph_init_node(&test->node);
}
static bool init_deps(const char *member, struct ccanlint *c, void *unused)
{
- char **deps = strsplit(NULL, c->needs, " ");
+ char **deps = tal_strsplit(NULL, c->needs, " ", STR_EMPTY_OK);
unsigned int i;
for (i = 0; deps[i]; i++) {
deps[i], c->key);
dgraph_add_edge(&dep->node, &c->node);
}
- talloc_free(deps);
+ tal_free(deps);
return true;
}
}
-static int show_tmpdir(const char *dir)
+static void show_tmpdir(const char *dir)
{
printf("You can find ccanlint working files in '%s'\n", dir);
- return 0;
}
static char *keep_tests(void *unused)
keep_results = true;
/* Don't automatically destroy temporary dir. */
- talloc_set_destructor(temp_dir(NULL), show_tmpdir);
+ keep_temp_dir();
+ tal_add_destructor(temp_dir(), show_tmpdir);
return NULL;
}
{
struct ccanlint *i = find_test(testname);
if (!i)
- return talloc_asprintf(NULL, "No test %s to --exclude",
- testname);
+ return tal_fmt(NULL, "No test %s to --exclude", testname);
/* Remove this, and everything which depends on it. */
dgraph_traverse_from(&i->node, remove_test, "excluded on command line");
exit(0);
}
-/* Remove empty lines. */
-static char **collapse(char **lines, unsigned int *nump)
-{
- unsigned int i, j;
- for (i = j = 0; lines[i]; i++) {
- if (lines[i][0])
- lines[j++] = lines[i];
- }
- lines[j] = NULL;
- if (nump)
- *nump = j;
- return lines;
-}
-
-
static void add_options(struct ccanlint *test, char **options,
unsigned int num_options)
{
num = 0;
else
/* -1, because last one is NULL. */
- num = talloc_array_length(test->options) - 1;
+ num = tal_count(test->options) - 1;
- test->options = talloc_realloc(NULL, test->options,
- char *,
- num + num_options + 1);
+ tal_resize(&test->options, num + num_options + 1);
memcpy(&test->options[num], options, (num_options + 1)*sizeof(char *));
}
continue;
for (i = 0; i < d->num_lines; i++) {
- unsigned int num_words;
- char **words = collapse(strsplit(d, d->lines[i], " \t"),
- &num_words);
- if (num_words == 0)
+ char **words = tal_strsplit(d, d->lines[i], " \t",
+ STR_NO_EMPTY);
+ if (!words[0])
continue;
if (strncmp(words[0], "//", 2) == 0)
if (!test->takes_options)
warnx("%s: %s doesn't take options",
info->fullname, words[0]);
- add_options(test, words+1, num_words-1);
+ add_options(test, words+1, tal_count(words)-1);
}
}
}
if (!test->options[0])
return test->options;
- ret = talloc_array(f, char *, talloc_array_length(test->options));
+ ret = tal_arr(f, char *, tal_count(test->options));
for (i = 0; test->options[i]; i++) {
char *optname;
/* FAIL overrides anything else. */
if (streq(optname, "FAIL")) {
- ret = talloc_array(f, char *, 2);
+ ret = tal_arr(f, char *, 2);
ret[0] = (char *)"FAIL";
ret[1] = NULL;
return ret;
}
ret[j] = NULL;
- /* Shrink it to size so talloc_array_length() works as expected. */
- return talloc_realloc(NULL, ret, char *, j + 1);
+ /* Shrink it to size so tal_array_length() works as expected. */
+ tal_resize(&ret, j + 1);
+ return ret;
}
static char *opt_set_const_charp(const char *arg, const char **p)
{
struct ccanlint *t = find_test(arg);
if (!t)
- return talloc_asprintf(NULL, "unknown --target %s", arg);
+ return tal_fmt(NULL, "unknown --target %s", arg);
targeting = true;
dgraph_add_edge(&t->node, all);
return true;
}
+static bool test_module(struct dgraph_node *all,
+ const char *dir, const char *prefix, bool summary)
+{
+ struct manifest *m = get_manifest(autofree(), dir);
+ char *testlink = path_join(NULL, temp_dir(), "test");
+
+ /* Create a symlink from temp dir back to src dir's
+ * test directory. */
+ unlink(testlink);
+ if (symlink(path_join(m, dir, "test"), testlink) != 0)
+ err(1, "Creating test symlink in %s", temp_dir());
+
+ return run_tests(all, summary, m, prefix);
+}
+
int main(int argc, char *argv[])
{
bool summary = false, pass = true;
unsigned int i;
- struct manifest *m;
const char *prefix = "";
- char *dir = talloc_getcwd(NULL), *base_dir = dir, *testlink;
+ char *cwd = path_cwd(NULL), *dir;
struct dgraph_node all;
/* Empty graph node to which we attach everything else. */
opt_early_parse(argc, argv, opt_log_stderr_exit);
/* We move into temporary directory, so gcov dumps its files there. */
- if (chdir(temp_dir(talloc_autofree_context())) != 0)
- err(1, "Error changing to %s temporary dir", temp_dir(NULL));
+ if (chdir(temp_dir()) != 0)
+ err(1, "Error changing to %s temporary dir", temp_dir());
init_tests();
if (!targeting)
strmap_iterate(&tests, add_to_all, &all);
- /* This links back to the module's test dir. */
- testlink = talloc_asprintf(NULL, "%s/test", temp_dir(NULL));
-
- /* Defaults to pwd. */
- if (argc == 1) {
- i = 1;
- goto got_dir;
- }
-
- for (i = 1; i < argc; i++) {
- dir = argv[i];
-
- if (dir[0] != '/')
- dir = talloc_asprintf_append(NULL, "%s/%s",
- base_dir, dir);
- while (strends(dir, "/"))
- dir[strlen(dir)-1] = '\0';
-
- got_dir:
- /* We assume there's a ccan/ in there somewhere... */
- if (i == 1) {
- ccan_dir = find_ccan_dir(dir);
- if (!ccan_dir)
- errx(1, "Cannot find ccan/ base directory in %s",
- dir);
- config_header = read_config_header(ccan_dir,
- &compiler, &cflags,
- verbose > 1);
+ if (argc == 1)
+ dir = cwd;
+ else
+ dir = path_join(NULL, cwd, argv[1]);
+
+ ccan_dir = find_ccan_dir(dir);
+ if (!ccan_dir)
+ errx(1, "Cannot find ccan/ base directory in %s", dir);
+ config_header = read_config_header(ccan_dir, &compiler, &cflags,
+ verbose > 1);
+
+ if (argc == 1)
+ pass = test_module(&all, cwd, "", summary);
+ else {
+ for (i = 1; i < argc; i++) {
+ dir = path_canon(NULL,
+ take(path_join(NULL, cwd, argv[i])));
+
+ prefix = path_join(NULL, ccan_dir, "ccan");
+ prefix = path_rel(NULL, take(prefix), dir);
+ prefix = tal_strcat(NULL, take(prefix), ": ");
+
+ pass &= test_module(&all, dir, prefix, summary);
+ reset_tests(&all);
}
-
- if (dir != base_dir)
- prefix = talloc_append_string(talloc_basename(NULL,dir),
- ": ");
-
- m = get_manifest(talloc_autofree_context(), dir);
-
- /* Create a symlink from temp dir back to src dir's
- * test directory. */
- unlink(testlink);
- if (symlink(talloc_asprintf(m, "%s/test", dir), testlink) != 0)
- err(1, "Creating test symlink in %s", temp_dir(NULL));
-
- if (!run_tests(&all, summary, m, prefix))
- pass = false;
-
- reset_tests(&all);
}
return pass ? 0 : 1;
}
projects / ccan / blobdiff