X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=41aaec9353ae9b1d09bf063f38b4e9cd24507881;hp=d832332dc757197280b6ac3c4eb79427781a0b75;hb=020983311c9f58bee8d528f80c7c097c4405975c;hpb=61088f5c752c555172e2ab6cf93a7967f79f3f2c diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h index d832332d..41aaec93 100644 --- a/tools/ccanlint/ccanlint.h +++ b/tools/ccanlint/ccanlint.h @@ -5,16 +5,27 @@ #include "../doc_extract.h" #define REGISTER_TEST(name, ...) extern struct ccanlint name -#include "generated-init-tests" -#undef REGISTER_TEST -#define REGISTER_TEST(name, ...) +/* 0 == Describe failed tests. + 1 == Describe results for partial failures. + 2 == One line per test, plus details of failures. + + Mainly for debugging ccanlint: + 3 == Describe every object built. + 4 == Describe every action. */ +extern int verbose; 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; @@ -22,43 +33,61 @@ struct manifest { 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 dep_dirs; - /* From tests/check_depends_built.c */ - struct list_head dep_objs; + struct list_head deps; +}; + +struct manifest *get_manifest(const void *ctx, const char *dir); + +struct file_error { + struct list_node list; + struct ccan_file *file; + unsigned int line; }; -struct manifest *get_manifest(const void *ctx); +struct score { + bool pass; + unsigned int score, total; + char *error; + struct list_head per_file_errors; +}; struct ccanlint { struct list_node list; + /* More concise unique name of test. */ + const char *key; + /* Unique name of test */ const char *name; - /* Total score that this test is worth. 0 means compulsory tests. */ - unsigned int total_score; - /* Can we run this test? Return string explaining why, if not. */ const char *(*can_run)(struct manifest *m); - /* If this returns non-NULL, it means the check failed. */ - void *(*check)(struct manifest *m); + /* keep is set if you should keep the results. + * 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); - /* The non-NULL return from check is passed to one of these: */ - - /* So, what did this get out of the total_score? (NULL means 0). */ - unsigned int (*score)(struct manifest *m, void *check_result); + /* Can we do something about it? (NULL if not) */ + void (*handle)(struct manifest *m, struct score *score); - /* Verbose description of what was wrong. */ - const char *(*describe)(struct manifest *m, void *check_result); + /* Options from _info. */ + char *options; + /* If not set, we'll give an error if they try to set options. */ + bool takes_options; - /* Can we do something about it? (NULL if not) */ - void (*handle)(struct manifest *m, void *check_result); + /* comma-separated list of dependency keys. */ + const char *needs; /* Internal use fields: */ /* Who depends on us? */ @@ -66,9 +95,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. */ @@ -111,10 +142,14 @@ struct line_info { 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_lines to fill this. */ + * Use get_ccan_file_contents to fill this. */ const char *contents; size_t contents_size; @@ -124,10 +159,22 @@ struct ccan_file { 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, char *name); +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); @@ -155,12 +202,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); - -/* Call the reporting on every line in the file. sofar contains - * previous results. */ -char *report_on_lines(struct list_head *files, - char *(*report)(const char *), - char *sofar); +/* 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, ...); /* Normal tests. */ extern struct ccanlint trailing_whitespace; @@ -174,4 +218,7 @@ struct dependent { /* 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; + #endif /* CCAN_LINT_H */