htable: rehash to clear delete markers

[ccan] / tools / ccanlint / ccanlint.h

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 2ddbf37ae89b199819ead3a62fa6d34cf91aa0e0..8c2ee0e8826b5ff0ba974f888f879a6953721e8e 100644 (file)
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -11,6 +11,11 @@
 
 #define REGISTER_TEST(name, ...) 
 
+/* 1 == Describe results for partial failures.
+   2 == Describe gory details.
+   3 == Describe every action. */
+extern int verbose;
+
 struct manifest {
        char *dir;
        /* The module name, ie. final element of dir name */
@@ -28,11 +33,11 @@ struct manifest {
        struct list_head other_test_files;
 
        struct list_head other_files;
+       struct list_head examples;
+       struct list_head mangled_examples;
 
        /* From tests/check_depends_exist.c */
        struct list_head dep_dirs;
-       /* From tests/check_depends_built.c */
-       struct list_head dep_objs;
 };
 
 struct manifest *get_manifest(const void *ctx, const char *dir);
@@ -53,8 +58,9 @@ struct ccanlint {
        const char *(*can_run)(struct manifest *m);
 
        /* If this returns non-NULL, it means the check failed.
+        * keep is set if you should keep the results.
         * If timeleft is set to 0, means it timed out. */
-       void *(*check)(struct manifest *m, unsigned int *timeleft);
+       void *(*check)(struct manifest *m, bool keep, unsigned int *timeleft);
 
        /* The non-NULL return from check is passed to one of these: */
 
@@ -73,9 +79,11 @@ struct ccanlint {
        /* How many things do we (still) depend on? */
        unsigned int num_depends;
        /* Did we skip a dependency?  If so, must skip this, too. */
-       bool skip;
+       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;
 };
 
 /* Ask the user a yes/no question: the answer is NO if there's an error. */
@@ -125,7 +133,7 @@ struct ccan_file {
        char *fullname;
 
        /* Pristine version of the original file.
-        * Use get_ccan_file_lines to fill this. */
+        * Use get_ccan_file_contents to fill this. */
        const char *contents;
        size_t contents_size;
 
@@ -138,11 +146,17 @@ struct ccan_file {
 
        /* If this file gets compiled (eg. .C file to .o file), result here. */
        char *compiled;
+
+       /* Compiled with coverage information. */
+       char *cov_compiled;
 };
 
 /* A new ccan_file, with the given name (talloc_steal onto returned value). */
 struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name);
 
+/* Use this rather than accessing f->contents directly: loads on demand. */
+const char *get_ccan_file_contents(struct ccan_file *f);
+
 /* Use this rather than accessing f->lines directly: loads on demand. */
 char **get_ccan_file_lines(struct ccan_file *f);