ccanlint: run tests under valgrind initially.

[ccan] / tools / ccanlint / ccanlint.h

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index b9965f75a5852364ef923ee98ca3b2e792745ceb..9f15ef39062060304fbb09df45151a162a717a79 100644 (file)
--- 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,21 +17,6 @@
    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
-};
-
 struct manifest {
        char *dir;
        /* The module name, ie. final element of dir name */
@@ -109,7 +95,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;
 
@@ -193,8 +179,14 @@ struct ccan_file {
        /* 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 +201,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,6 +224,9 @@ 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, ...);
@@ -242,6 +240,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;