X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=6fcca5fa8eb26fbf40153e244a27c4d9e66e0922;hp=b9965f75a5852364ef923ee98ca3b2e792745ceb;hb=d8c9fdc0e6b70ab4fced949ee6488dc585a711f4;hpb=8de1e8a6faef77773cbf8ed237eb4e330143d2f2 diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h index b9965f75..6fcca5fa 100644 --- a/tools/ccanlint/ccanlint.h +++ b/tools/ccanlint/ccanlint.h @@ -2,10 +2,15 @@ #define CCAN_LINT_H #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. @@ -16,56 +21,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 */ - char *basename; - struct ccan_file *info_file; - - /* Linked off deps. */ - struct list_node list; - /* Where our final compiled output is */ - char *compiled; - - 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; @@ -87,8 +42,6 @@ struct score { }; struct ccanlint { - struct list_node list; - /* More concise unique name of test. */ const char *key; @@ -98,18 +51,20 @@ struct ccanlint { /* Can we run this test? Return string explaining why, if not. */ const char *(*can_run)(struct manifest *m); - /* keep is set if you should keep the results. - * If timeleft is set to 0, means it timed out. + /* Should we stop immediately if test fails? */ + bool compulsory; + + /* 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); /* Options from _info. */ - char *options; + char **options; /* If not set, we'll give an error if they try to set options. */ bool takes_options; @@ -117,16 +72,12 @@ struct ccanlint { const char *needs; /* Internal use fields: */ - /* Who depends on us? */ - struct list_head dependencies; - /* How many things do we (still) depend on? */ - unsigned int num_depends; + /* We are a node in a dependency graph. */ + 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; }; /* Ask the user a yes/no question: the answer is NO if there's an error. */ @@ -166,49 +117,12 @@ 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; - - /* Compiled with coverage information. */ - char *cov_compiled; - - /* Leak output from valgrind. */ - char *leak_info; -}; - -/* 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); +/* 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 +143,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,11 +173,17 @@ struct dependent { struct ccanlint *dependent; }; +/* Is this test excluded (cmdline or _info). */ +bool is_excluded(const char *name); + +/* Called to add options from _info, once it's located. */ +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;