*/
#include "ccanlint.h"
#include "../tools.h"
+#include "../read_config_header.h"
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <err.h>
#include <ctype.h>
-#include <ccan/btree/btree.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/grab_file/grab_file.h>
#include <ccan/cast/cast.h>
#include <ccan/tlist/tlist.h>
+#include <ccan/tal/path/path.h>
+#include <ccan/strmap/strmap.h>
-/* Defines struct tlist_ccanlint. */
-TLIST_TYPE(ccanlint, struct ccanlint);
+struct ccanlint_map {
+ STRMAP_MEMBERS(struct ccanlint *);
+};
int verbose = 0;
-static struct tlist_ccanlint tests = TLIST_INIT(tests);
+static struct ccanlint_map tests;
bool safe_mode = false;
+bool keep_results = false;
static bool targeting = false;
-static struct btree *cmdline_exclude;
-static struct btree *info_exclude;
static unsigned int timeout;
/* These are overridden at runtime if we can find config.h */
const char *config_header;
+const char *ccan_dir;
+
#if 0
static void indent_print(const char *string)
{
&& toupper(reply[0]) == 'Y';
}
-static const char *should_skip(struct manifest *m, struct ccanlint *i)
+/* Skip, but don't remove. */
+static bool skip_test(struct dgraph_node *node, const char *why)
{
- if (btree_lookup(cmdline_exclude, i->key))
- return "excluded on command line";
-
- if (btree_lookup(info_exclude, i->key))
- return "excluded in _info file";
-
- if (i->skip)
- return i->skip;
+ struct ccanlint *c = container_of(node, struct ccanlint, node);
+ c->skip = why;
+ return true;
+}
- if (i->skip_fail)
- return "dependency failed";
+static const char *dep_failed(struct manifest *m)
+{
+ return "dependency couldn't run";
+}
- if (i->can_run)
- return i->can_run(m);
- return NULL;
+static bool cannot_run(struct dgraph_node *node, void *unused)
+{
+ struct ccanlint *c = container_of(node, struct ccanlint, node);
+ c->can_run = dep_failed;
+ return true;
}
-static bool run_test(struct ccanlint *i,
- bool quiet,
- unsigned int *running_score,
- unsigned int *running_total,
- struct manifest *m,
- const char *prefix)
+struct run_info {
+ bool quiet;
+ unsigned int score, total;
+ struct manifest *m;
+ const char *prefix;
+ bool pass;
+};
+
+static bool run_test(struct dgraph_node *n, struct run_info *run)
{
+ struct ccanlint *i = container_of(n, struct ccanlint, node);
unsigned int timeleft;
- const struct dependent *d;
- const char *skip;
struct score *score;
- //one less test to run through
- list_for_each(&i->dependencies, d, node)
- d->dependent->num_depends--;
+ if (i->done)
+ return true;
- score = talloc(m, struct score);
+ score = tal(run->m, struct score);
list_head_init(&score->per_file_errors);
score->error = NULL;
score->pass = false;
score->score = 0;
score->total = 1;
- skip = should_skip(m, i);
-
- if (skip) {
- skip:
- if (verbose && !streq(skip, "not relevant to target"))
- printf("%s%s: skipped (%s)\n", prefix, i->name, skip);
-
- /* If we're skipping this because a prereq failed, we fail:
- * count it as a score of 1. */
- if (i->skip_fail)
- (*running_total)++;
-
- list_del(&i->list);
- list_for_each(&i->dependencies, d, node) {
- if (d->dependent->skip)
- continue;
- d->dependent->skip = "dependency was skipped";
- d->dependent->skip_fail = i->skip_fail;
+ /* We can see skipped things in two cases:
+ * (1) _info excluded them (presumably because they fail).
+ * (2) A prerequisite failed.
+ */
+ if (i->skip) {
+ if (verbose)
+ printf("%s%s: skipped (%s)\n",
+ run->prefix, i->name, i->skip);
+ /* Pass us up to the test which failed, not us. */
+ score->pass = true;
+ goto out;
+ }
+
+ if (i->can_run) {
+ i->skip = i->can_run(run->m);
+ if (i->skip) {
+ /* Test doesn't apply, or can't run? That's OK. */
+ if (verbose > 1)
+ printf("%s%s: skipped (%s)\n",
+ run->prefix, i->name, i->skip);
+ /* Mark our dependencies to skip. */
+ dgraph_traverse_from(&i->node, cannot_run, NULL);
+ score->pass = true;
+ score->total = 0;
+ goto out;
}
- return i->skip_fail ? false : true;
}
timeleft = timeout ? timeout : default_timeout_ms;
- i->check(m, i->keep_results, &timeleft, score);
+ i->check(run->m, &timeleft, score);
if (timeout && timeleft == 0) {
- skip = "timeout";
- goto skip;
+ i->skip = "timeout";
+ if (verbose)
+ printf("%s%s: skipped (%s)\n",
+ run->prefix, i->name, i->skip);
+ /* Mark our dependencies to skip. */
+ dgraph_traverse_from(&i->node, skip_test,
+ "dependency timed out");
+ score->pass = true;
+ score->total = 0;
+ goto out;
}
assert(score->score <= score->total);
- if ((!score->pass && !quiet)
+ if ((!score->pass && !run->quiet)
|| (score->score < score->total && verbose)
|| verbose > 1) {
printf("%s%s (%s): %s",
- prefix, i->name, i->key, score->pass ? "PASS" : "FAIL");
+ run->prefix, i->name, i->key,
+ score->pass ? "PASS" : "FAIL");
if (score->total > 1)
printf(" (+%u/%u)", score->score, score->total);
printf("\n");
}
- if ((!quiet && !score->pass) || verbose) {
+ if ((!run->quiet && !score->pass) || verbose) {
if (score->error) {
printf("%s%s", score->error,
strends(score->error, "\n") ? "" : "\n");
}
}
- if (!quiet && score->score < score->total && i->handle)
- i->handle(m, score);
-
- *running_score += score->score;
- *running_total += score->total;
-
- list_del(&i->list);
+ if (!run->quiet && score->score < score->total && i->handle)
+ i->handle(run->m, score);
if (!score->pass) {
/* Skip any tests which depend on this one. */
- list_for_each(&i->dependencies, d, node) {
- if (d->dependent->skip)
- continue;
- d->dependent->skip = "dependency failed";
- d->dependent->skip_fail = true;
- }
+ dgraph_traverse_from(&i->node, skip_test, "dependency failed");
+ }
+
+out:
+ run->score += score->score;
+ run->total += score->total;
+
+ /* FIXME: Free score. */
+ run->pass &= score->pass;
+ i->done = true;
+
+ if (!score->pass && i->compulsory) {
+ warnx("%s%s failed", run->prefix, i->name);
+ run->score = 0;
+ return false;
}
- return score->pass;
+ return true;
}
static void register_test(struct ccanlint *test)
{
- tlist_add(&tests, test, list);
- test->options = talloc_array(NULL, char *, 1);
+ if (!strmap_add(&tests, test->key, test))
+ err(1, "Adding test %s", test->key);
+ test->options = tal_arr(NULL, char *, 1);
test->options[0] = NULL;
- test->skip = NULL;
- test->skip_fail = false;
+ dgraph_init_node(&test->node);
+}
+
+static bool get_test(const char *member, struct ccanlint *i,
+ struct ccanlint **ret)
+{
+ if (tlist_empty(&i->node.edge[DGRAPH_TO])) {
+ *ret = i;
+ return false;
+ }
+ return true;
}
/**
**/
static inline struct ccanlint *get_next_test(void)
{
- struct ccanlint *i;
+ struct ccanlint *i = NULL;
+
+ strmap_iterate(&tests, get_test, &i);
+ if (i)
+ return i;
- if (tlist_empty(&tests))
+ if (strmap_empty(&tests))
return NULL;
- tlist_for_each(&tests, i, list) {
- if (i->num_depends == 0)
- return i;
- }
errx(1, "Can't make process; test dependency cycle");
}
static struct ccanlint *find_test(const char *key)
{
- struct ccanlint *i;
-
- tlist_for_each(&tests, i, list)
- if (streq(i->key, key))
- return i;
-
- return NULL;
+ return strmap_get(&tests, key);
}
bool is_excluded(const char *name)
{
- return btree_lookup(cmdline_exclude, name) != NULL
- || btree_lookup(info_exclude, name) != NULL
- || find_test(name)->skip != NULL;
+ return find_test(name)->skip != NULL;
}
-#undef REGISTER_TEST
-#define REGISTER_TEST(name, ...) extern struct ccanlint name
-#include "generated-testlist"
+static bool init_deps(const char *member, struct ccanlint *c, void *unused)
+{
+ char **deps = tal_strsplit(NULL, c->needs, " ", STR_EMPTY_OK);
+ unsigned int i;
+
+ for (i = 0; deps[i]; i++) {
+ struct ccanlint *dep;
+
+ dep = find_test(deps[i]);
+ if (!dep)
+ errx(1, "BUG: unknown dep '%s' for %s",
+ deps[i], c->key);
+ dgraph_add_edge(&dep->node, &c->node);
+ }
+ tal_free(deps);
+ return true;
+}
+
+static bool check_names(const char *member, struct ccanlint *c,
+ struct ccanlint_map *names)
+{
+ if (!strmap_add(names, c->name, c))
+ err(1, "Duplicate name %s", c->name);
+ return true;
+}
static void init_tests(void)
{
- struct ccanlint *c;
- struct btree *keys, *names;
+ struct ccanlint_map names;
+ struct ccanlint **table;
+ size_t i, num;
- tlist_init(&tests);
+ strmap_init(&tests);
-#undef REGISTER_TEST
-#define REGISTER_TEST(name) register_test(&name)
-#include "generated-testlist"
+ table = autodata_get(ccanlint_tests, &num);
+ for (i = 0; i < num; i++)
+ register_test(table[i]);
+ autodata_free(table);
- /* Initialize dependency lists. */
- tlist_for_each(&tests, c, list) {
- list_head_init(&c->dependencies);
- c->num_depends = 0;
- }
+ strmap_iterate(&tests, init_deps, NULL);
- /* Resolve dependencies. */
- tlist_for_each(&tests, c, list) {
- char **deps = strsplit(NULL, c->needs, " ");
- unsigned int i;
-
- for (i = 0; deps[i]; i++) {
- struct ccanlint *dep;
- struct dependent *dchild;
-
- dep = find_test(deps[i]);
- if (!dep)
- errx(1, "BUG: unknown dep '%s' for %s",
- deps[i], c->key);
- dchild = talloc(NULL, struct dependent);
- dchild->dependent = c;
- list_add_tail(&dep->dependencies, &dchild->node);
- c->num_depends++;
- }
- talloc_free(deps);
- }
+ /* Check for duplicate names. */
+ strmap_init(&names);
+ strmap_iterate(&tests, check_names, &names);
+ strmap_clear(&names);
+}
- /* Self-consistency check: make sure no two tests
- have the same key or name. */
- keys = btree_new(btree_strcmp);
- names = btree_new(btree_strcmp);
- tlist_for_each(&tests, c, list) {
- if (!btree_insert(keys, c->key))
- errx(1, "BUG: Duplicate test key '%s'",
- c->key);
- if (!btree_insert(names, c->name))
- errx(1, "BUG: Duplicate test name '%s'",
- c->name);
- }
+static bool reset_test(struct dgraph_node *node, void *unused)
+{
+ struct ccanlint *c = container_of(node, struct ccanlint, node);
+ c->skip = NULL;
+ c->done = false;
+ return true;
+}
- btree_delete(keys);
- btree_delete(names);
+static void reset_tests(struct dgraph_node *all)
+{
+ dgraph_traverse_to(all, reset_test, NULL);
+}
+
+static bool print_deps(const char *member, struct ccanlint *c, void *unused)
+{
+ if (!tlist_empty(&c->node.edge[DGRAPH_FROM])) {
+ struct dgraph_edge *e;
+
+ printf("These depend on %s:\n", c->key);
+ dgraph_for_each_edge(&c->node, e, DGRAPH_FROM) {
+ struct ccanlint *to = container_of(e->n[DGRAPH_TO],
+ struct ccanlint,
+ node);
+ printf("\t%s\n", to->key);
+ }
+ }
+ return true;
}
static void print_test_depends(void)
{
- struct ccanlint *c;
printf("Tests:\n");
- tlist_for_each(&tests, c, list) {
- if (!list_empty(&c->dependencies)) {
- const struct dependent *d;
- printf("These depend on %s:\n", c->key);
- list_for_each(&c->dependencies, d, node)
- printf("\t%s\n", d->dependent->key);
- }
- }
+ strmap_iterate(&tests, print_deps, NULL);
}
-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_test(const char *testname, void *unused)
+static char *keep_tests(void *unused)
{
- struct ccanlint *i;
-
- init_tests();
- if (streq(testname, "all")) {
- tlist_for_each(&tests, i, list)
- i->keep_results = true;
- } else {
- i = find_test(testname);
- if (!i)
- errx(1, "No test %s to --keep", testname);
- i->keep_results = true;
- }
+ 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;
}
-static char *skip_test(const char *testname, void *unused)
+static bool remove_test(struct dgraph_node *node, const char *why)
+{
+ struct ccanlint *c = container_of(node, struct ccanlint, node);
+ c->skip = why;
+ dgraph_clear_node(node);
+ return true;
+}
+
+static char *exclude_test(const char *testname, void *unused)
{
- btree_insert(cmdline_exclude, testname);
+ struct ccanlint *i = find_test(testname);
+ if (!i)
+ 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");
+ remove_test(&i->node, "excluded on command line");
return NULL;
}
+static void skip_test_and_deps(struct ccanlint *c, const char *why)
+{
+ /* Skip this, and everything which depends on us. */
+ dgraph_traverse_from(&c->node, skip_test, why);
+ skip_test(&c->node, why);
+}
+
static char *list_tests(void *arg)
{
struct ccanlint *i;
- init_tests();
-
printf("Tests:\n");
/* This makes them print in topological order. */
while ((i = get_next_test()) != NULL) {
- const struct dependent *d;
printf(" %-25s %s\n", i->key, i->name);
- list_del(&i->list);
- list_for_each(&i->dependencies, d, node)
- d->dependent->num_depends--;
+ dgraph_clear_node(&i->node);
+ strmap_del(&tests, i->key, NULL);
}
exit(0);
}
+static bool draw_test(const char *member, struct ccanlint *c, const char *style)
+{
+ /*
+ * todo: escape labels in case ccanlint test keys have
+ * characters interpreted as GraphViz syntax.
+ */
+ printf("\t\"%p\" [label=\"%s\"%s]\n", c, c->key, style);
+ return true;
+}
+
static void test_dgraph_vertices(const char *style)
{
- const struct ccanlint *i;
+ strmap_iterate(&tests, draw_test, style);
+}
+
+static bool draw_edges(const char *member, struct ccanlint *c, void *unused)
+{
+ struct dgraph_edge *e;
- tlist_for_each(&tests, i, list) {
- /*
- * todo: escape labels in case ccanlint test keys have
- * characters interpreted as GraphViz syntax.
- */
- printf("\t\"%p\" [label=\"%s\"%s]\n", i, i->key, style);
+ dgraph_for_each_edge(&c->node, e, DGRAPH_FROM) {
+ struct ccanlint *to = container_of(e->n[DGRAPH_TO],
+ struct ccanlint,
+ node);
+ printf("\t\"%p\" -> \"%p\"\n", c->name, to->name);
}
+ return true;
}
static void test_dgraph_edges(void)
{
- const struct ccanlint *i;
- const struct dependent *d;
-
- tlist_for_each(&tests, i, list)
- list_for_each(&i->dependencies, d, node)
- printf("\t\"%p\" -> \"%p\"\n", d->dependent, i);
+ strmap_iterate(&tests, draw_edges, NULL);
}
static char *test_dependency_graph(void *arg)
{
- init_tests();
puts("digraph G {");
test_dgraph_vertices("");
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)
/* Known failure? */
if (strcasecmp(words[1], "FAIL") == 0) {
if (!targeting)
- btree_insert(info_exclude, words[0]);
+ skip_test_and_deps(test,
+ "excluded in _info"
+ " file");
} else {
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);
-}
-
-static bool depends_on(struct ccanlint *i, struct ccanlint *target)
-{
- const struct dependent *d;
-
- if (i == target)
- return true;
-
- list_for_each(&i->dependencies, d, node) {
- if (depends_on(d->dependent, target))
- return true;
- }
- return false;
+ /* Shrink it to size so tal_array_length() works as expected. */
+ tal_resize(&ret, j + 1);
+ return ret;
}
-/* O(N^2), who cares? */
-static void skip_unrelated_tests(struct ccanlint *target)
+static char *opt_set_const_charp(const char *arg, const char **p)
{
- struct ccanlint *i;
-
- tlist_for_each(&tests, i, list)
- if (!depends_on(i, target))
- i->skip = "not relevant to target";
+ return opt_set_charp(arg, cast_const2(char **, p));
}
-static char *demangle_string(char *string)
+static char *opt_set_target(const char *arg, struct dgraph_node *all)
{
- unsigned int i;
- const char mapfrom[] = "abfnrtv";
- const char mapto[] = "\a\b\f\n\r\t\v";
+ struct ccanlint *t = find_test(arg);
+ if (!t)
+ return tal_fmt(NULL, "unknown --target %s", arg);
- if (!strchr(string, '"'))
- return NULL;
- string = strchr(string, '"') + 1;
- if (!strrchr(string, '"'))
- return NULL;
- *strrchr(string, '"') = '\0';
-
- for (i = 0; i < strlen(string); i++) {
- if (string[i] == '\\') {
- char repl;
- unsigned len = 0;
- const char *p = strchr(mapfrom, string[i+1]);
- if (p) {
- repl = mapto[p - mapfrom];
- len = 1;
- } else if (strlen(string+i+1) >= 3) {
- if (string[i+1] == 'x') {
- repl = (string[i+2]-'0')*16
- + string[i+3]-'0';
- len = 3;
- } else if (cisdigit(string[i+1])) {
- repl = (string[i+2]-'0')*8*8
- + (string[i+3]-'0')*8
- + (string[i+4]-'0');
- len = 3;
- }
- }
- if (len == 0) {
- repl = string[i+1];
- len = 1;
- }
-
- string[i] = repl;
- memmove(string + i + 1, string + i + len + 1,
- strlen(string + i + len + 1) + 1);
- }
- }
-
- return string;
+ targeting = true;
+ dgraph_add_edge(&t->node, all);
+ return NULL;
}
-
-static void read_config_header(void)
+static bool run_tests(struct dgraph_node *all,
+ bool summary,
+ struct manifest *m,
+ const char *prefix)
{
- char *fname = talloc_asprintf(NULL, "%s/config.h", ccan_dir);
- char **lines;
- unsigned int i;
+ struct run_info run;
- config_header = grab_file(NULL, fname, NULL);
- if (!config_header) {
- talloc_free(fname);
- return;
- }
+ run.quiet = summary;
+ run.m = m;
+ run.prefix = prefix;
+ run.score = run.total = 0;
+ run.pass = true;
- lines = strsplit(config_header, config_header, "\n");
- for (i = 0; i < talloc_array_length(lines) - 1; i++) {
- char *sym;
- const char **line = (const char **)&lines[i];
+ dgraph_traverse_to(all, run_test, &run);
- if (!get_token(line, "#"))
- continue;
- if (!get_token(line, "define"))
- continue;
- sym = get_symbol_token(lines, line);
- if (streq(sym, "CCAN_COMPILER") && !compiler) {
- compiler = demangle_string(lines[i]);
- if (!compiler)
- errx(1, "%s:%u:could not parse CCAN_COMPILER",
- fname, i+1);
- if (verbose > 1)
- printf("%s: compiler set to '%s'\n",
- fname, compiler);
- } else if (streq(sym, "CCAN_CFLAGS") && !cflags) {
- cflags = demangle_string(lines[i]);
- if (!cflags)
- errx(1, "%s:%u:could not parse CCAN_CFLAGS",
- fname, i+1);
- if (verbose > 1)
- printf("%s: compiler flags set to '%s'\n",
- fname, cflags);
- }
- }
- if (!compiler)
- compiler = CCAN_COMPILER;
- if (!cflags)
- compiler = CCAN_CFLAGS;
+ printf("%sTotal score: %u/%u\n", prefix, run.score, run.total);
+ return run.pass;
}
-static char *opt_set_const_charp(const char *arg, const char **p)
+static bool add_to_all(const char *member, struct ccanlint *c,
+ struct dgraph_node *all)
{
- return opt_set_charp(arg, cast_const2(char **, p));
+ /* If we're excluded on cmdline, don't add. */
+ if (!c->skip)
+ dgraph_add_edge(&c->node, all);
+ return true;
}
int main(int argc, char *argv[])
bool summary = false, pass = true;
unsigned int i;
struct manifest *m;
- struct ccanlint *t;
const char *prefix = "";
- char *dir = talloc_getcwd(NULL), *base_dir = dir, *target = NULL,
- *testlink;
+ char *dir = path_cwd(NULL), *base_dir = dir, *testlink;
+ struct dgraph_node all;
- cmdline_exclude = btree_new(btree_strcmp);
- info_exclude = btree_new(btree_strcmp);
+ /* Empty graph node to which we attach everything else. */
+ dgraph_init_node(&all);
opt_register_early_noarg("--verbose|-v", opt_inc_intval, &verbose,
"verbose mode (up to -vvvv)");
"list tests ccanlint performs (and exit)");
opt_register_noarg("--test-dep-graph", test_dependency_graph, NULL,
"print dependency graph of tests in Graphviz .dot format");
- opt_register_arg("-k|--keep <testname>", keep_test, NULL, NULL,
- "keep results of <testname>"
- " (can be used multiple times, or 'all')");
+ opt_register_noarg("-k|--keep", keep_tests, NULL,
+ "do not delete ccanlint working files");
opt_register_noarg("--summary|-s", opt_set_bool, &summary,
"simply give one line summary");
- opt_register_arg("-x|--exclude <testname>", skip_test, NULL, NULL,
+ opt_register_arg("-x|--exclude <testname>", exclude_test, NULL, NULL,
"exclude <testname> (can be used multiple times)");
- opt_register_arg("-t|--timeout <milleseconds>", opt_set_uintval,
+ opt_register_arg("--timeout <milleseconds>", opt_set_uintval,
NULL, &timeout,
"ignore (terminate) tests that are slower than this");
- opt_register_arg("--target <testname>", opt_set_charp,
- NULL, &target,
+ opt_register_arg("-t|--target <testname>", opt_set_target, NULL, &all,
"only run one test (and its prerequisites)");
opt_register_arg("--compiler <compiler>", opt_set_const_charp,
NULL, &compiler, "set the compiler");
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());
- opt_parse(&argc, argv, opt_log_stderr_exit);
+ init_tests();
if (verbose >= 3) {
compile_verbose = true;
if (verbose >= 4)
tools_verbose = true;
+ opt_parse(&argc, argv, opt_log_stderr_exit);
+
+ 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));
+ testlink = tal_fmt(NULL, "%s/test", temp_dir());
/* Defaults to pwd. */
if (argc == 1) {
}
for (i = 1; i < argc; i++) {
- unsigned int score, total_score;
-
dir = argv[i];
if (dir[0] != '/')
- dir = talloc_asprintf_append(NULL, "%s/%s",
- base_dir, dir);
+ dir = tal_fmt(NULL, "%s/%s", base_dir, dir);
while (strends(dir, "/"))
dir[strlen(dir)-1] = '\0';
got_dir:
- if (dir != base_dir)
- prefix = talloc_append_string(talloc_basename(NULL,dir),
- ": ");
-
- init_tests();
-
- if (target) {
- struct ccanlint *test;
-
- test = find_test(target);
- if (!test)
- errx(1, "Unknown test to run '%s'", target);
- skip_unrelated_tests(test);
+ /* 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);
}
- m = get_manifest(talloc_autofree_context(), dir);
+ if (dir != base_dir)
+ prefix = tal_strcat(NULL,
+ take(path_basename(NULL,dir)),
+ ": ");
- /* FIXME: This has to come after we've got manifest. */
- if (i == 1)
- read_config_header();
+ m = get_manifest(autofree(), 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));
-
- score = total_score = 0;
- while ((t = get_next_test()) != NULL) {
- if (!run_test(t, summary, &score, &total_score, m,
- prefix)) {
- pass = false;
- if (t->compulsory) {
- warnx("%s%s failed", prefix, t->name);
- printf("%sTotal score: 0/%u\n",
- prefix, total_score);
- goto next;
- }
- }
- }
+ if (symlink(tal_fmt(m, "%s/test", dir), testlink) != 0)
+ err(1, "Creating test symlink in %s", temp_dir());
+
+ if (!run_tests(&all, summary, m, prefix))
+ pass = false;
- printf("%sTotal score: %u/%u\n", prefix, score, total_score);
- next: ;
+ reset_tests(&all);
}
return pass ? 0 : 1;
}
projects / ccan / blobdiff