]> git.ozlabs.org Git - ccan/blobdiff - tools/ccanlint/ccanlint.c
base64: fix for unsigned chars (e.g. ARM).
[ccan] / tools / ccanlint / ccanlint.c
index 3ffe38b2cf5f3ff54629515e76dc4b2acf1850e0..237e412817d8f99ff44d9e68afeed050365d89b6 100644 (file)
  */
 #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/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)
 {
@@ -67,501 +76,643 @@ 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): %s", i->name, i->key, 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) {
-               if (score->error)
-                       printf("%s", score->error);
-               if (!quiet && !score->pass && i->handle)
-                       i->handle(m, score);
+       if (!score->pass || verbose) {
+               if (score->error) {
+                       printf("%s%s", score->error,
+                              strends(score->error, "\n") ? "" : "\n");
+               }
        }
-
-       *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");
+       }
+
+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)
+{
+       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);
 }
 
-static void register_test(struct list_head *h, struct ccanlint *test)
+static bool get_test(const char *member UNNEEDED, struct ccanlint *i,
+                    struct ccanlint **ret)
 {
-       list_add(h, &test->list);
+       if (tlist_empty(&i->node.edge[DGRAPH_TO])) {
+               *ret = i;
+               return false;
+       }
+       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;
 
-       if (list_empty(test))
+       strmap_iterate(&tests, get_test, &i);
+       if (i)
+               return i;
+
+       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 struct ccanlint *find_test(const char *key)
 {
-       struct ccanlint *i;
+       return strmap_get(&tests, key);
+}
 
-       list_for_each(&compulsory_tests, i, list)
-               if (streq(i->key, key))
-                       return i;
+bool is_excluded(const char *name)
+{
+       return find_test(name)->skip != NULL;
+}
 
-       list_for_each(&normal_tests, i, list)
-               if (streq(i->key, key))
-                       return i;
+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;
 
-       return NULL;
+       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;
 }
 
-#undef REGISTER_TEST
-#define REGISTER_TEST(name, ...) extern struct ccanlint name
-#include "generated-normal-tests"
-#include "generated-compulsory-tests"
+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)
 {
-       struct ccanlint *c;
-       struct btree *keys, *names;
-       struct list_head *list;
-
-#undef REGISTER_TEST
-#define REGISTER_TEST(name) register_test(&normal_tests, &name)
-#include "generated-normal-tests"
-#undef REGISTER_TEST
-#define REGISTER_TEST(name) register_test(&compulsory_tests, &name)
-#include "generated-compulsory-tests"
-
-       /* Initialize dependency lists. */
-       foreach_ptr(list, &compulsory_tests, &normal_tests) {
-               list_for_each(list, c, list) {
-                       list_head_init(&c->dependencies);
-               }
-       }
+       ccanlint_map_t names;
+       struct ccanlint **table;
+       size_t i, num;
 
-       /* Resolve dependencies. */
-       foreach_ptr(list, &compulsory_tests, &normal_tests) {
-               list_for_each(list, c, list) {
-                       char **deps = strsplit(NULL, c->needs, " ", NULL);
-                       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);
-               }
-       }
+       strmap_init(&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);
-       foreach_ptr(list, &compulsory_tests, &normal_tests) {
-               list_for_each(list, 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);
-               }
-       }
-       btree_delete(keys);
-       btree_delete(names);
+       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);
+}
 
-       if (!verbose)
-               return;
+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;
+}
 
-       foreach_ptr(list, &compulsory_tests, &normal_tests) {
-               printf("\%s Tests\n",
-                      list == &compulsory_tests ? "Compulsory" : "Normal");
+static void reset_tests(struct dgraph_node *all)
+{
+       dgraph_traverse_to(all, reset_test, NULL);
+}
 
-               if (!list_empty(&c->dependencies)) {
-                       const struct dependent *d;
-                       printf("These depend on us:\n");
-                       list_for_each(&c->dependencies, d, node)
-                               printf("\t%s\n", d->dependent->name);
+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 int show_tmpdir(char *dir)
+static void print_test_depends(void)
 {
-       printf("You can find ccanlint working files in '%s'\n", dir);
-       return 0;
+       printf("Tests:\n");
+
+       strmap_iterate(&tests, print_deps, NULL);
 }
 
-static char *keep_test(const char *testname, void *unused)
+
+static void show_tmpdir(const char *dir)
 {
-       struct ccanlint *i;
+       printf("You can find ccanlint working files in '%s'\n", dir);
+}
 
-       if (streq(testname, "all")) {
-               struct list_head *list;
-               foreach_ptr(list, &compulsory_tests, &normal_tests) {
-                       list_for_each(list, 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;
-       }
+static char *keep_tests(void *unused UNNEEDED)
+{
+       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 UNNEEDED)
 {
-       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 print_tests(struct list_head *tests, const char *type)
+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 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 char *list_tests(void *arg)
+static bool draw_test(const char *member UNNEEDED,
+                     struct ccanlint *c, const char *style)
 {
-       print_tests(&compulsory_tests, "Compulsory");
-       print_tests(&normal_tests, "Normal");
-       exit(0);
+       /*
+        * 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(struct list_head *tests, const char *style)
+static void test_dgraph_vertices(const char *style)
 {
-       const struct ccanlint *i;
+       strmap_iterate(&tests, draw_test, style);
+}
 
-       list_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);
+static bool draw_edges(const char *member UNNEEDED,
+                      struct ccanlint *c, void *unused UNNEEDED)
+{
+       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(struct list_head *tests)
+static void test_dgraph_edges(void)
 {
-       const struct ccanlint *i;
-       const struct dependent *d;
-
-       list_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)
+static char *test_dependency_graph(void *arg UNNEEDED)
 {
        puts("digraph G {");
 
-       test_dgraph_vertices(&compulsory_tests, ", style=filled, fillcolor=yellow");
-       test_dgraph_vertices(&normal_tests,     "");
-
-       test_dgraph_edges(&compulsory_tests);
-       test_dgraph_edges(&normal_tests);
+       test_dgraph_vertices("");
+       test_dgraph_edges();
 
        puts("}");
 
        exit(0);
 }
 
-/* Remove empty lines. */
-static char **collapse(char **lines, unsigned int *nump)
+static void add_options(struct ccanlint *test, char **options,
+                       unsigned int num_options)
 {
-       unsigned int i, j;
-       for (i = j = 0; lines[i]; i++) {
-               if (lines[i][0])
-                       lines[j++] = lines[i];
-       }
-       if (nump)
-               *nump = j;
-       return lines;
+       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_options(struct ccan_file *info, bool mark_fails)
+void add_info_options(struct manifest *m)
 {
-       struct doc_section *d;
        unsigned int i;
-       struct ccanlint *test;
+       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;
 
-       list_for_each(get_ccan_file_docs(info), d, list) {
-               if (!streq(d->type, "ccanlint"))
+               if (!words[0])
                        continue;
 
-               for (i = 0; i < d->num_lines; i++) {
-                       char **words = collapse(strsplit(d, d->lines[i], " \t",
-                                                        NULL), NULL);
-                       if (!words[0])
-                               continue;
-
-                       if (strncmp(words[0], "//", 2) == 0)
-                               continue;
-
-                       test = find_test(words[0]);
-                       if (!test) {
-                               warnx("%s: unknown ccanlint test '%s'",
-                                     info->fullname, words[0]);
-                               continue;
-                       }
-
-                       if (!words[1]) {
-                               warnx("%s: no argument to test '%s'",
-                                     info->fullname, words[0]);
-                               continue;
-                       }
-
-                       /* Known failure? */
-                       if (strcasecmp(words[1], "FAIL") == 0) {
-                               if (mark_fails)
-                                       btree_insert(info_exclude, words[0]);
-                       } else {
-                               if (!test->takes_options)
-                                       warnx("%s: %s doesn't take options",
-                                             info->fullname, words[0]);
-                               /* Copy line exactly into options. */
-                               test->options = strstr(d->lines[i], words[0])
-                                       + strlen(words[0]);
-                       }
+               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;
+               }
+
+               /* 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;
+}
 
-       list_for_each(&i->dependencies, d, node) {
-               if (depends_on(d->dependent, target))
-                       return true;
+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;
+
+       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;
+       const char *override_gcov = NULL;
        
-       init_tests();
+       /* Empty graph node to which we attach everything else. */
+       dgraph_init_node(&top.node);
 
-       cmdline_exclude = btree_new(btree_strcmp);
-       info_exclude = btree_new(btree_strcmp);
-
-       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_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_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_arg("--gcov <coverage tool>", opt_set_const_charp,
+                        NULL, &override_gcov, "set the coverage tool");
+       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");
 
+       /* 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));
+       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 (dir[0] != '/')
-               dir = talloc_asprintf_append(NULL, "%s/%s", base_dir, dir);
-       while (strends(dir, "/"))
-               dir[strlen(dir)-1] = '\0';
-       if (dir != base_dir)
-               prefix = talloc_append_string(talloc_basename(NULL, dir), ": ");
-       if (verbose >= 3)
+       if (verbose >= 3) {
                compile_verbose = true;
+               print_test_depends();
+       }
        if (verbose >= 4)
                tools_verbose = true;
 
-       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 (target) {
-               struct ccanlint *test;
-
-               test = find_test(target);
-               if (!test)
-                       errx(1, "Unknown test to run '%s'", target);
-               skip_unrelated_tests(test);
-       }
+       opt_parse(&argc, argv, opt_log_stderr_exit);
 
-       /* 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);
+       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 (override_gcov)
+               gcov = override_gcov;
+
+       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);
                }
        }
-
-       /* --target overrides known FAIL from _info */
-       add_info_options(m->info_file, !target);
-
-       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;
 }