X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=6fcca5fa8eb26fbf40153e244a27c4d9e66e0922;hp=7bd6208ba751db455faa763507c445f9b0dfae84;hb=d8c9fdc0e6b70ab4fced949ee6488dc585a711f4;hpb=1e755481cb2d7eb439c51e3522a18ec6d3885829 diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h index 7bd6208b..6fcca5fa 100644 --- a/tools/ccanlint/ccanlint.h +++ b/tools/ccanlint/ccanlint.h @@ -3,11 +3,14 @@ #include "config.h" #include #include +#include #include #include "../doc_extract.h" +#include "../manifest.h" #include "licenses.h" -#define REGISTER_TEST(name, ...) extern struct ccanlint name +AUTODATA_TYPE(ccanlint_tests, struct ccanlint); +#define REGISTER_TEST(test) AUTODATA(ccanlint_tests, &test) /* 0 == Describe failed tests. 1 == Describe results for partial failures. @@ -18,48 +21,6 @@ 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 */ - char *basename; - struct ccan_file *info_file; - - /* Linked off deps. */ - struct list_node list; - /* Where our final compiled output is */ - char *compiled[COMPILE_TYPES]; - - struct list_head c_files; - struct list_head h_files; - - struct list_head run_tests; - struct list_head api_tests; - struct list_head compile_ok_tests; - struct list_head compile_fail_tests; - struct list_head other_test_c_files; - 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 deps; - - /* From tests/license_exists.c */ - enum license license; -}; - -/* Get the manifest for a given directory. */ -struct manifest *get_manifest(const void *ctx, const char *dir); - /* Error in a particular file: stored off score->per_file_errors. */ struct file_error { struct list_node list; @@ -93,12 +54,11 @@ struct ccanlint { /* 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. + /* If timeleft is set to 0, means it timed out. * score is the result, and a talloc context freed after all our * depends are done. */ void (*check)(struct manifest *m, - bool keep, unsigned int *timeleft, struct score *score); + unsigned int *timeleft, struct score *score); /* Can we do something about it? (NULL if not) */ void (*handle)(struct manifest *m, struct score *score); @@ -116,10 +76,6 @@ struct ccanlint { 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; }; @@ -161,49 +117,6 @@ struct line_info { struct pp_conditions *cond; }; -struct ccan_file { - struct list_node list; - - /* Name (usually, within m->dir). */ - char *name; - - /* Full path name. */ - char *fullname; - - /* Pristine version of the original file. - * Use get_ccan_file_contents to fill this. */ - const char *contents; - size_t contents_size; - - /* Use get_ccan_file_lines / get_ccan_line_info to fill these. */ - unsigned int num_lines; - char **lines; - struct line_info *line_info; - - struct list_head *doc_sections; - - /* If this file gets compiled (eg. .C file to .o file), result here. */ - char *compiled[COMPILE_TYPES]; - - /* 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). */ -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); - /* Use this rather than accessing f->lines directly: loads on demand. */ struct line_info *get_ccan_line_info(struct ccan_file *f); @@ -269,8 +182,8 @@ void add_info_options(struct ccan_file *info); /* Are we happy to compile stuff, or just non-intrusive tests? */ extern bool safe_mode; -/* Where is the ccan dir? Available after first manifest. */ -extern const char *ccan_dir; +/* Did the user want to keep all the results? */ +extern bool keep_results; /* Compiler and CFLAGS, from config.h if available. */ extern const char *compiler, *cflags;