ccanlint: run tests under valgrind initially.

[ccan] / tools / ccanlint / ccanlint.h

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index d73ffc6bade59bff35ec82a666d57afecededead..9f15ef39062060304fbb09df45151a162a717a79 100644 (file)
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -1,8 +1,10 @@
 #ifndef CCAN_LINT_H
 #define CCAN_LINT_H
+#include "config.h"
 #include <ccan/list/list.h>
 #include <stdbool.h>
 #include "../doc_extract.h"
+#include "licenses.h"
 
 #define REGISTER_TEST(name, ...) extern struct ccanlint name
 
@@ -42,6 +44,9 @@ struct manifest {
 
        /* From tests/check_depends_exist.c */
        struct list_head deps;
+
+       /* From tests/license_exists.c */
+       enum license license;
 };
 
 /* Get the manifest for a given directory. */
@@ -90,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;
 
@@ -174,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). */
@@ -190,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,
@@ -210,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, ...);
@@ -223,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;