ccanlint: use -t for --target not --timeout

[ccan] / tools / ccanlint / ccanlint.h

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 9f15ef39062060304fbb09df45151a162a717a79..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"
@@ -17,6 +18,13 @@
    4 == Describe every action. */
 extern int verbose;
 
+enum compile_type {
+       COMPILE_NORMAL,
+       COMPILE_NOFEAT,
+       COMPILE_COVERAGE,
+       COMPILE_TYPES
+};
+
 struct manifest {
        char *dir;
        /* The module name, ie. final element of dir name */
@@ -26,7 +34,7 @@ struct manifest {
        /* Linked off deps. */
        struct list_node list;
        /* Where our final compiled output is */
-       char *compiled;
+       char *compiled[COMPILE_TYPES];
 
        struct list_head c_files;
        struct list_head h_files;
@@ -73,8 +81,6 @@ struct score {
 };
 
 struct ccanlint {
-       struct list_node list;
-
        /* More concise unique name of test. */
        const char *key;
 
@@ -84,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
@@ -103,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. */
@@ -174,10 +181,7 @@ struct ccan_file {
        struct list_head *doc_sections;
 
        /* If this file gets compiled (eg. .C file to .o file), result here. */
-       char *compiled;
-
-       /* Compiled with coverage information. */
-       char *cov_compiled;
+       char *compiled[COMPILE_TYPES];
 
        /* Filename containing output from valgrind. */
        char *valgrind_log;
@@ -231,6 +235,20 @@ char **per_file_options(const struct ccanlint *test, struct ccan_file *f);
 void score_file_error(struct score *, struct ccan_file *f, unsigned line,
                      const char *errorfmt, ...);
 
+/* Start a command in the background. */
+void run_command_async(const void *ctx, unsigned int time_ms,
+                      const char *fmt, ...);
+
+/* Async version of compile_and_link. */
+void compile_and_link_async(const void *ctx, unsigned int time_ms,
+                           const char *cfile, const char *ccandir,
+                           const char *objs, const char *compiler,
+                           const char *cflags,
+                           const char *libs, const char *outfile);
+
+/* Get results of a command, returning ctx (and free it). */
+void *collect_command(bool *ok, char **output);
+
 /* Normal tests. */
 extern struct ccanlint trailing_whitespace;
 
@@ -243,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;