X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=452b44f7d8dfd6d93b14d322684873a304a0cacd;hp=b9965f75a5852364ef923ee98ca3b2e792745ceb;hb=4640e61b45d8d3cdfc5301bc58ef7c96a42077ec;hpb=8de1e8a6faef77773cbf8ed237eb4e330143d2f2

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index b9965f75..452b44f7 100644
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -4,6 +4,7 @@
 #include <ccan/list/list.h>
 #include <stdbool.h>
 #include "../doc_extract.h"
+#include "licenses.h"
 
 #define REGISTER_TEST(name, ...) extern struct ccanlint name
 
@@ -16,19 +17,11 @@
    4 == Describe every action. */
 extern int verbose;
 
-enum license {
-	LICENSE_LGPLv2_PLUS,
-	LICENSE_LGPLv2,
-	LICENSE_LGPLv3,
-	LICENSE_LGPL,
-	LICENSE_GPLv2_PLUS,
-	LICENSE_GPLv2,
-	LICENSE_GPLv3,
-	LICENSE_GPL,
-	LICENSE_BSD,
-	LICENSE_MIT,
-	LICENSE_PUBLIC_DOMAIN,
-	LICENSE_UNKNOWN
+enum compile_type {
+	COMPILE_NORMAL,
+	COMPILE_NOFEAT,
+	COMPILE_COVERAGE,
+	COMPILE_TYPES
 };
 
 struct manifest {
@@ -40,7 +33,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;
@@ -109,7 +102,7 @@ struct ccanlint {
 	void (*handle)(struct manifest *m, struct score *score);
 
 	/* Options from _info. */
-	char *options;
+	char **options;
 	/* If not set, we'll give an error if they try to set options. */
 	bool takes_options;
 
@@ -188,13 +181,16 @@ struct ccan_file {
 	struct list_head *doc_sections;
 
 	/* If this file gets compiled (eg. .C file to .o file), result here. */
-	char *compiled;
+	char *compiled[COMPILE_TYPES];
 
-	/* Compiled with coverage information. */
-	char *cov_compiled;
+	/* Filename containing output from valgrind. */
+	char *valgrind_log;
 
 	/* Leak output from valgrind. */
 	char *leak_info;
+
+	/* Simplified stream (lowercase letters and single spaces) */
+	char *simplified;
 };
 
 /* A new ccan_file, with the given name (talloc_steal onto returned value). */
@@ -209,6 +205,9 @@ char **get_ccan_file_lines(struct ccan_file *f);
 /* Use this rather than accessing f->lines directly: loads on demand. */
 struct line_info *get_ccan_line_info(struct ccan_file *f);
 
+/* Use this rather than accessing f->simplified directly: loads on demand. */
+const char *get_ccan_simplified(struct ccan_file *f);
+
 enum line_compiled {
 	NOT_COMPILED,
 	COMPILED,
@@ -229,10 +228,27 @@ char *get_symbol_token(void *ctx, const char **line);
 /* Similarly for ->doc_sections */
 struct list_head *get_ccan_file_docs(struct ccan_file *f);
 
+/* Get NULL-terminated array options for this file for this test */
+char **per_file_options(const struct ccanlint *test, struct ccan_file *f);
+
 /* Append message about this file (and line, if non-zero) to the score->error */
 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;
 
@@ -242,6 +258,9 @@ struct dependent {
 	struct ccanlint *dependent;
 };
 
+/* Is this test excluded (cmdline or _info). */
+bool is_excluded(const char *name);
+
 /* Are we happy to compile stuff, or just non-intrusive tests? */
 extern bool safe_mode;