ccanlint: use traversal to trim tests we want to skip.

[ccan] / tools / ccanlint / ccanlint.h

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 452b44f7d8dfd6d93b14d322684873a304a0cacd..bf01161faf10c365428ed33b5954bd043f508294 100644 (file)
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -2,6 +2,7 @@
 #define CCAN_LINT_H
 #include "config.h"
 #include <ccan/list/list.h>
+#include <ccan/dgraph/dgraph.h>
 #include <stdbool.h>
 #include "../doc_extract.h"
 #include "licenses.h"
@@ -80,8 +81,6 @@ struct score {
 };
 
 struct ccanlint {
-       struct list_node list;
-
        /* More concise unique name of test. */
        const char *key;
 
@@ -91,6 +90,9 @@ struct ccanlint {
        /* Can we run this test?  Return string explaining why, if not. */
        const char *(*can_run)(struct manifest *m);
 
+       /* Should we stop immediately if test fails? */
+       bool compulsory;
+
        /* keep is set if you should keep the results.
         * If timeleft is set to 0, means it timed out.
         * score is the result, and a talloc context freed after all our
@@ -110,16 +112,14 @@ struct ccanlint {
        const char *needs;
 
        /* Internal use fields: */
-       /* Who depends on us? */
-       struct list_head dependencies;
-       /* How many things do we (still) depend on? */
-       unsigned int num_depends;
+       /* We are a node in a dependency graph. */
+       struct dgraph_node node;
        /* Did we skip a dependency?  If so, must skip this, too. */
        const char *skip;
-       /* Did we fail a dependency?  If so, skip and mark as fail. */
-       bool skip_fail;
        /* Did the user want to keep these results? */
        bool keep_results;
+       /* Have we already run this? */
+       bool done;
 };
 
 /* Ask the user a yes/no question: the answer is NO if there's an error. */
@@ -261,6 +261,9 @@ struct dependent {
 /* Is this test excluded (cmdline or _info). */
 bool is_excluded(const char *name);
 
+/* Called to add options from _info, once it's located. */
+void add_info_options(struct ccan_file *info);
+
 /* Are we happy to compile stuff, or just non-intrusive tests? */
 extern bool safe_mode;