X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=f06f200b8daf0017ebe68fc655ac393747e7cbf6;hp=a5901ac318b8b00b0a160457e0f51d4370d32f4c;hb=0fe2d094b262f6e8bed798930e8c4716d33d5dc7;hpb=ca951c94fba731b878f5bb3f81bb99c397dc4e12

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index a5901ac3..f06f200b 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -19,29 +19,37 @@
  */
 #include "ccanlint.h"
 #include "../tools.h"
+#include "../read_config_header.h"
 #include <unistd.h>
-#include <stdarg.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/cast/cast.h>
+#include <ccan/tlist/tlist.h>
+#include <ccan/tal/path/path.h>
+#include <ccan/strmap/strmap.h>
+
+typedef STRMAP(struct ccanlint *) ccanlint_map_t;
 
 int verbose = 0;
-static LIST_HEAD(compulsory_tests);
-static LIST_HEAD(normal_tests);
-static LIST_HEAD(finished_tests);
+static ccanlint_map_t tests;
 bool safe_mode = false;
-static struct btree *cmdline_exclude;
-static struct btree *info_exclude;
+bool keep_results = false;
+bool non_ccan_deps = false;
+bool build_failed = false;
+static bool targeting = false;
 static unsigned int timeout;
 
+const char *config_header;
+
+const char *ccan_dir;
+
 #if 0
 static void indent_print(const char *string)
 {
@@ -68,406 +76,638 @@ bool ask(const char *question)
 		&& 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";
+	struct ccanlint *c = container_of(node, struct ccanlint, node);
+	c->skip = why;
+	return true;
+}
 
-	if (btree_lookup(info_exclude, i->key))
-		return "excluded in _info file";
-	
-	if (i->skip)
-		return i->skip;
+static const char *dep_failed(struct manifest *m UNNEEDED)
+{
+	return "dependency couldn't run";
+}
 
-	if (i->skip_fail)
-		return "dependency failed";
+static bool cannot_run(struct dgraph_node *node, void *all UNNEEDED)
+{
+	struct ccanlint *c = container_of(node, struct ccanlint, node);
+	c->can_run = dep_failed;
 
-	if (i->can_run)
-		return i->can_run(m);
-	return NULL;
+	return true;
 }
 
-static bool run_test(struct ccanlint *i,
-		     bool quiet,
-		     unsigned int *running_score,
-		     unsigned int *running_total,
-		     struct manifest *m)
+struct run_info {
+	bool noninteractive;
+	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: skipped (%s)\n", 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_add_tail(&finished_tests, &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
 	    || (score->score < score->total && verbose)
 	    || verbose > 1) {
-		printf("%s: %s", i->name, score->pass ? "PASS" : "FAIL");
+		printf("%s%s (%s): %s",
+		       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) {
-		struct file_error *f;
-
-		if (score->error)
-			printf("%s%s\n", score->error,
-			       list_empty(&score->per_file_errors) ? "" : ":");
-
-		list_for_each(&score->per_file_errors, f, list) {
-			if (f->line)
-				printf("%s:%u:%s\n",
-				       f->file->fullname, f->line, f->error);
-			else if (f->file)
-				printf("%s:%s\n", f->file->fullname, f->error);
-			else
-				printf("%s\n", f->error);
+	if (!score->pass || verbose) {
+		if (score->error) {
+			printf("%s%s", score->error,
+			       strends(score->error, "\n") ? "" : "\n");
 		}
-		if (!quiet && !score->pass && i->handle)
-			i->handle(m, score);
 	}
-
-	*running_score += score->score;
-	*running_total += score->total;
-
-	list_del(&i->list);
-	list_add_tail(&finished_tests, &i->list);
+	if (!run->noninteractive && 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");
 	}
-	return score->pass;
-}
 
-static void register_test(struct list_head *h, struct ccanlint *test, ...)
-{
-	va_list ap;
-	struct ccanlint *depends;
-	struct dependent *dchild;
+out:
+	run->score += score->score;
+	run->total += score->total;
 
-	list_add(h, &test->list);
+	/* FIXME: Free score. */
+	run->pass &= score->pass;
+	i->done = true;
 
-	va_start(ap, test);
-	/* Careful: we might have been initialized by a dependent. */
-	if (test->dependencies.n.next == NULL)
-		list_head_init(&test->dependencies);
+	if (!score->pass && i->compulsory) {
+		warnx("%s%s failed", run->prefix, i->name);
+		run->score = 0;
+		return false;
+	}
+	return true;
+}
+
+static void register_test(struct ccanlint *test)
+{
+	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;
+	dgraph_init_node(&test->node);
+}
 
-	//dependent(s) args (if any), last one is NULL
-	while ((depends = va_arg(ap, struct ccanlint *)) != NULL) {
-		dchild = malloc(sizeof(*dchild));
-		dchild->dependent = test;
-		/* The thing we depend on might not be initialized yet! */
-		if (depends->dependencies.n.next == NULL)
-			list_head_init(&depends->dependencies);
-		list_add_tail(&depends->dependencies, &dchild->node);
-		test->num_depends++;
+static bool get_test(const char *member UNNEEDED, struct ccanlint *i,
+		     struct ccanlint **ret)
+{
+	if (tlist_empty(&i->node.edge[DGRAPH_TO])) {
+		*ret = i;
+		return false;
 	}
-	va_end(ap);
+	return true;
 }
 
 /**
  * get_next_test - retrieves the next test to be processed
  **/
-static inline struct ccanlint *get_next_test(struct list_head *test)
+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 (list_empty(test))
+	if (strmap_empty(&tests))
 		return NULL;
 
-	list_for_each(test, i, list) {
-		if (i->num_depends == 0)
-			return i;
-	}
 	errx(1, "Can't make process; test dependency cycle");
 }
 
-static void init_tests(void)
+static struct ccanlint *find_test(const char *key)
 {
-	const struct ccanlint *i;
-	struct btree *keys, *names;
-
-#undef REGISTER_TEST
-#define REGISTER_TEST(name, ...) register_test(&normal_tests, &name, __VA_ARGS__, NULL)
-#include "generated-normal-tests"
-#undef REGISTER_TEST
-#define REGISTER_TEST(name, ...) register_test(&compulsory_tests, &name, __VA_ARGS__, NULL)
-#include "generated-compulsory-tests"
-
-	/* Self-consistency check: make sure no two tests
-	   have the same key or name. */
-	keys = btree_new(btree_strcmp);
-	names = btree_new(btree_strcmp);
-	list_for_each(&compulsory_tests, i, list) {
-		if (!btree_insert(keys, i->key))
-			errx(1, "BUG: Duplicate test key '%s'", i->key);
-		if (!btree_insert(keys, i->name))
-			errx(1, "BUG: Duplicate test name '%s'", i->name);
-	}
-	list_for_each(&normal_tests, i, list) {
-		if (!btree_insert(keys, i->key))
-			errx(1, "BUG: Duplicate test key '%s'", i->key);
-		if (!btree_insert(keys, i->name))
-			errx(1, "BUG: Duplicate test name '%s'", i->name);
-	}
-	btree_delete(keys);
-	btree_delete(names);
-	
-	if (!verbose)
-		return;
-
-	printf("\nCompulsory Tests\n");
-	list_for_each(&compulsory_tests, i, list) {
-		printf("%s depends on %u others\n", i->name, i->num_depends);
-		if (!list_empty(&i->dependencies)) {
-			const struct dependent *d;
-			printf("These depend on us:\n");
-			list_for_each(&i->dependencies, d, node)
-				printf("\t%s\n", d->dependent->name);
-		}
+	return strmap_get(&tests, key);
+}
+
+bool is_excluded(const char *name)
+{
+	return find_test(name)->skip != NULL;
+}
+
+static bool init_deps(const char *member UNNEEDED,
+		      struct ccanlint *c, void *unused UNNEEDED)
+{
+	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;
+}
 
-	printf("\nNormal Tests\n");
-	list_for_each(&normal_tests, i, list) {
-		printf("%s depends on %u others\n", i->name, i->num_depends);
-		if (!list_empty(&i->dependencies)) {
-			const struct dependent *d;
-			printf("These depend on us:\n");
-			list_for_each(&i->dependencies, d, node)
-				printf("\t%s\n", d->dependent->name);
+static bool check_names(const char *member UNNEEDED, struct ccanlint *c,
+			ccanlint_map_t *names)
+{
+	if (!strmap_add(names, c->name, c))
+		err(1, "Duplicate name %s", c->name);
+	return true;
+}
+
+static void init_tests(void)
+{
+	ccanlint_map_t names;
+	struct ccanlint **table;
+	size_t i, num;
+
+	strmap_init(&tests);
+
+	table = autodata_get(ccanlint_tests, &num);
+	for (i = 0; i < num; i++)
+		register_test(table[i]);
+	autodata_free(table);
+
+	strmap_iterate(&tests, init_deps, NULL);
+
+	/* Check for duplicate names. */
+	strmap_init(&names);
+	strmap_iterate(&tests, check_names, &names);
+	strmap_clear(&names);
+}
+
+static bool reset_test(struct dgraph_node *node, void *unused UNNEEDED)
+{
+	struct ccanlint *c = container_of(node, struct ccanlint, node);
+	c->skip = NULL;
+	c->done = false;
+	return true;
+}
+
+static void reset_tests(struct dgraph_node *all)
+{
+	dgraph_traverse_to(all, reset_test, NULL);
+}
+
+static bool print_deps(const char *member UNNEEDED,
+		       struct ccanlint *c, void *unused UNNEEDED)
+{
+	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 struct ccanlint *find_test(const char *key)
+static void print_test_depends(void)
 {
-	struct ccanlint *i;
+	printf("Tests:\n");
+
+	strmap_iterate(&tests, print_deps, NULL);
+}
 
-	list_for_each(&compulsory_tests, i, list)
-		if (streq(i->key, key))
-			return i;
 
-	list_for_each(&normal_tests, i, list)
-		if (streq(i->key, key))
-			return i;
+static void show_tmpdir(const char *dir)
+{
+	printf("You can find ccanlint working files in '%s'\n", dir);
+}
 
+static char *keep_tests(void *unused UNNEEDED)
+{
+	keep_results = true;
+
+	/* Don't automatically destroy temporary dir. */
+	keep_temp_dir();
+	tal_add_destructor(temp_dir(), show_tmpdir);
 	return NULL;
 }
 
-static char *keep_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 UNNEEDED)
 {
 	struct ccanlint *i = find_test(testname);
 	if (!i)
-		errx(1, "No test %s to --keep", testname);
-	i->keep_results = true;
+		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 char *skip_test(const char *testname, void *unused)
+static void skip_test_and_deps(struct ccanlint *c, const char *why)
 {
-	btree_insert(cmdline_exclude, optarg);
-	return NULL;
+	/* Skip this, and everything which depends on us. */
+	dgraph_traverse_from(&c->node, skip_test, why);
+	skip_test(&c->node, why);
 }
 
-static void print_tests(struct list_head *tests, const char *type)
+static char *list_tests(void *arg UNNEEDED)
 {
 	struct ccanlint *i;
 
-	printf("%s tests:\n", type);
+	printf("Tests:\n");
 	/* This makes them print in topological order. */
-	while ((i = get_next_test(tests)) != NULL) {
-		const struct dependent *d;
+	while ((i = get_next_test()) != NULL) {
 		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 UNNEEDED,
+		      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)
+{
+	strmap_iterate(&tests, draw_test, style);
 }
 
-static char *list_tests(void *arg)
+static bool draw_edges(const char *member UNNEEDED,
+		       struct ccanlint *c, void *unused UNNEEDED)
 {
-	print_tests(&compulsory_tests, "Compulsory");
-	print_tests(&normal_tests, "Normal");
+	struct dgraph_edge *e;
+
+	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)
+{
+	strmap_iterate(&tests, draw_edges, NULL);
+}
+
+static char *test_dependency_graph(void *arg UNNEEDED)
+{
+	puts("digraph G {");
+
+	test_dgraph_vertices("");
+	test_dgraph_edges();
+
+	puts("}");
+
 	exit(0);
 }
 
-static char *strip(const void *ctx, const char *line)
+static void add_options(struct ccanlint *test, char **options,
+			unsigned int num_options)
 {
-	line += strcspn(line, IDENT_CHARS "-");
-	return talloc_strndup(ctx, line, strspn(line, IDENT_CHARS "-"));
+	unsigned int num;
+
+	if (!test->options)
+		num = 0;
+	else
+		/* -1, because last one is NULL. */
+		num = tal_count(test->options) - 1;
+
+	tal_resize(&test->options, num + num_options + 1);
+	memcpy(&test->options[num], options, (num_options + 1)*sizeof(char *));
 }
 
-static void add_info_fails(struct ccan_file *info)
+void add_info_options(struct manifest *m)
 {
-	struct doc_section *d;
 	unsigned int i;
+	char **info_options = get_ccanlint(m, m->dir, get_or_compile_info);
+
+	for (i = 0; info_options[i]; i++) {
+		char **words = tal_strsplit(m, info_options[i], " \t",
+					    STR_NO_EMPTY);
+		struct ccanlint *test;
+
+		if (!words[0])
+			continue;
 
-	list_for_each(get_ccan_file_docs(info), d, list) {
-		if (!streq(d->type, "fails"))
+		test = find_test(words[0]);
+		if (!test) {
+			warnx("%s: unknown ccanlint test '%s'",
+			      m->info_file->fullname, words[0]);
 			continue;
+		}
+
+		if (!words[1]) {
+			warnx("%s: no argument to test '%s'",
+			      m->info_file->fullname, words[0]);
+			continue;
+		}
 
-		for (i = 0; i < d->num_lines; i++)
-			btree_insert(info_exclude, strip(info, d->lines[i]));
-		break;
+		/* Known failure? */
+		if (strcasecmp(words[1], "FAIL") == 0) {
+			if (!targeting)
+				skip_test_and_deps(test,
+						   "excluded in _info"
+						   " file");
+		} else {
+			if (!test->takes_options)
+				warnx("%s: %s doesn't take options",
+				      m->info_file->fullname, words[0]);
+			add_options(test, words+1, tal_count(words)-1);
+		}
 	}
 }
 
-static bool depends_on(struct ccanlint *i, struct ccanlint *target)
+/* If options are of form "filename:<option>" they only apply to that file */
+char **per_file_options(const struct ccanlint *test, struct ccan_file *f)
 {
-	const struct dependent *d;
+	char **ret;
+	unsigned int i, j = 0;
+
+	/* Fast path. */
+	if (!test->options[0])
+		return test->options;
+
+	ret = tal_arr(f, char *, tal_count(test->options));
+	for (i = 0; test->options[i]; i++) {
+		char *optname;
+
+		if (!test->options[i] || !strchr(test->options[i], ':')) {
+			optname = test->options[i];
+		} else if (strstarts(test->options[i], f->name)
+			   && test->options[i][strlen(f->name)] == ':') {
+			optname = test->options[i] + strlen(f->name) + 1;
+		} else
+			continue;
 
-	if (i == target)
-		return true;
+		/* FAIL overrides anything else. */
+		if (streq(optname, "FAIL")) {
+			ret = tal_arr(f, char *, 2);
+			ret[0] = (char *)"FAIL";
+			ret[1] = NULL;
+			return ret;
+		}
+		ret[j++] = optname;
+	}
+	ret[j] = NULL;
+
+	/* 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)
+{
+	return opt_set_charp(arg, cast_const2(char **, p));
+}
+
+static char *opt_set_target(const char *arg, struct dgraph_node *all)
+{
+	struct ccanlint *t = find_test(arg);
+	if (!t)
+		return tal_fmt(NULL, "unknown --target %s", arg);
+
+	targeting = true;
+	dgraph_add_edge(&t->node, all);
+	return NULL;
+}
+
+static bool run_tests(struct dgraph_node *all,
+		      bool summary,
+		      bool deps_fail_ignore,
+		      struct manifest *m,
+		      const char *prefix)
+{
+	struct run_info run;
+	const char *comment = "";
+
+	run.noninteractive = summary;
+	run.m = m;
+	run.prefix = prefix;
+	run.score = run.total = 0;
+	run.pass = true;
+
+	non_ccan_deps = build_failed = false;
 
-	list_for_each(&i->dependencies, d, node) {
-		if (depends_on(d->dependent, target))
-			return true;
+	dgraph_traverse_to(all, run_test, &run);
+
+	/* We can completely fail if we're missing external stuff: ignore */
+	if (deps_fail_ignore && non_ccan_deps && build_failed) {
+		comment = " (missing non-ccan dependencies?)";
+		run.pass = true;
+	} else if (!run.pass) {
+		comment = " FAIL!";
 	}
-	return false;
+	printf("%sTotal score: %u/%u%s\n",
+	       prefix, run.score, run.total, comment);
+
+	return run.pass;
 }
 
-/* O(N^2), who cares? */
-static void skip_unrelated_tests(struct ccanlint *target)
+static bool add_to_all(const char *member UNNEEDED, struct ccanlint *c,
+		       struct dgraph_node *all)
 {
-	struct ccanlint *i;
-	struct list_head *list;
+	/* If we're excluded on cmdline, don't add. */
+	if (!c->skip)
+		dgraph_add_edge(&c->node, all);
+	return true;
+}
 
-	foreach_ptr(list, &compulsory_tests, &normal_tests)
-		list_for_each(list, i, list)
-			if (!depends_on(i, target))
-				i->skip = "not relevant to target";
+static bool test_module(struct dgraph_node *all,
+			const char *dir, const char *prefix, bool summary,
+			bool deps_fail_ignore)
+{
+	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, deps_fail_ignore, m, prefix);
 }
 
 int main(int argc, char *argv[])
 {
-	bool summary = false;
-	unsigned int score = 0, total_score = 0;
-	struct manifest *m;
-	struct ccanlint *i;
+	bool summary = false, pass = true, deps_fail_ignore = false;
+	int i;
 	const char *prefix = "";
-	char *dir = talloc_getcwd(NULL), *base_dir = dir, *target = NULL;
+	char *cwd = path_cwd(NULL), *dir;
+	struct ccanlint top;  /* cannot_run may try to set ->can_run */
+	const char *override_compiler = NULL, *override_cflags = NULL;
 	
-	init_tests();
-
-	cmdline_exclude = btree_new(btree_strcmp);
-	info_exclude = btree_new(btree_strcmp);
+	/* Empty graph node to which we attach everything else. */
+	dgraph_init_node(&top.node);
 
-	opt_register_arg("--dir|-d", opt_set_charp, opt_show_charp, &dir,
-			 "use this directory");
+	opt_register_early_noarg("--verbose|-v", opt_inc_intval, &verbose,
+				 "verbose mode (up to -vvvv)");
 	opt_register_noarg("-n|--safe-mode", opt_set_bool, &safe_mode,
 			 "do not compile anything");
 	opt_register_noarg("-l|--list-tests", list_tests, NULL,
 			 "list tests ccanlint performs (and exit)");
-	opt_register_arg("-k|--keep <testname>", keep_test, NULL, NULL,
-			   "keep results of <testname> (can be used multiple times)");
+	opt_register_noarg("--test-dep-graph", test_dependency_graph, NULL,
+			 "print dependency graph of tests in Graphviz .dot format");
+	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_noarg("--verbose|-v", opt_inc_intval, &verbose,
-			   "verbose mode (up to -vvvv)");
-	opt_register_arg("-x|--exclude <testname>", skip_test, NULL, NULL,
+			   "give results only, no interactive correction");
+	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,
+			 &top.node,
 			 "only run one test (and its prerequisites)");
+	opt_register_arg("--compiler <compiler>", opt_set_const_charp,
+			 NULL, &override_compiler, "set the compiler");
+	opt_register_arg("--cflags <flags>", opt_set_const_charp,
+			 NULL, &override_cflags, "set the compiler flags");
+	opt_register_noarg("--deps-fail-ignore", opt_set_bool,
+			   &deps_fail_ignore,
+			   "don't fail if external dependencies are missing");
 	opt_register_noarg("-?|-h|--help", opt_usage_and_exit,
 			   "\nA program for checking and guiding development"
 			   " of CCAN modules.",
 			   "This usage message");
 
-	opt_parse(&argc, argv, opt_log_stderr_exit);
-
-	if (dir[0] != '/')
-		dir = talloc_asprintf_append(NULL, "%s/%s", base_dir, dir);
-	if (dir != base_dir)
-		prefix = talloc_append_string(talloc_basename(NULL, dir), ": ");
-	if (verbose >= 3)
-		compile_verbose = true;
-	if (verbose >= 4)
-		tools_verbose = true;
+	/* Do verbose before anything 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));
-
-	m = get_manifest(talloc_autofree_context(), dir);
-
-	/* Create a symlink from temp dir back to src dir's test directory. */
-	if (symlink(talloc_asprintf(m, "%s/test", dir),
-		    talloc_asprintf(m, "%s/test", temp_dir(NULL))) != 0)
-		err(1, "Creating test symlink in %s", temp_dir(NULL));
+	if (chdir(temp_dir()) != 0)
+		err(1, "Error changing to %s temporary dir", temp_dir());
 
-	if (target) {
-		struct ccanlint *test;
+	init_tests();
 
-		test = find_test(target);
-		if (!test)
-			err(1, "Unknown test to run '%s'", target);
-		skip_unrelated_tests(test);
+	if (verbose >= 3) {
+		compile_verbose = true;
+		print_test_depends();
 	}
+	if (verbose >= 4)
+		tools_verbose = true;
 
-	/* If you don't pass the compulsory tests, you get a score of 0. */
-	while ((i = get_next_test(&compulsory_tests)) != NULL) {
-		if (!run_test(i, summary, &score, &total_score, m)) {
-			printf("%sTotal score: 0/%u\n", prefix, total_score);
-			errx(1, "%s%s failed", prefix, i->name);
+	opt_parse(&argc, argv, opt_log_stderr_exit);
+
+	if (!targeting)
+		strmap_iterate(&tests, add_to_all, &top.node);
+
+	if (argc == 1)
+		dir = cwd;
+	else
+		dir = path_simplify(NULL, take(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, verbose > 1);
+
+	/* We do this after read_config_header has set compiler & cflags */
+	if (override_cflags)
+		cflags = override_cflags;
+	if (override_compiler)
+		compiler = override_compiler;
+
+	if (argc == 1)
+		pass = test_module(&top.node, cwd, "",
+				   summary, deps_fail_ignore);
+	else {
+		for (i = 1; i < argc; i++) {
+			dir = path_canon(NULL,
+					 take(path_join(NULL, cwd, argv[i])));
+			if (!dir)
+				err(1, "Cannot get canonical name of '%s'",
+				    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(&top.node, dir, prefix, summary,
+					    deps_fail_ignore);
+			reset_tests(&top.node);
 		}
 	}
-
-	add_info_fails(m->info_file);
-	while ((i = get_next_test(&normal_tests)) != NULL)
-		run_test(i, summary, &score, &total_score, m);
-
-	printf("%sTotal score: %u/%u\n", prefix, score, total_score);
-	return 0;
+	return pass ? 0 : 1;
 }