X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=6680f4f0406f8764270273bd9aeeef61a4736a95;hp=e019c139d1a1f59deee3bc36000029cc98f5e2d8;hb=1d893107b3481639bf1fc6f96972457ac6e828f7;hpb=3612661714e86333ceacca7314959a5ed938dc6a diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h index e019c139..6680f4f0 100644 --- a/tools/ccanlint/ccanlint.h +++ b/tools/ccanlint/ccanlint.h @@ -12,6 +12,7 @@ #define REGISTER_TEST(name, ...) struct manifest { + char *dir; /* The module name, ie. final element of dir name */ char *basename; struct ccan_file *info_file; @@ -30,15 +31,16 @@ struct manifest { /* 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); +struct manifest *get_manifest(const void *ctx, const char *dir); struct ccanlint { struct list_node list; + /* More concise unique name of test. */ + const char *key; + /* Unique name of test */ const char *name; @@ -48,8 +50,9 @@ struct ccanlint { /* 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); + /* If this returns non-NULL, it means the check failed. + * If timeleft is set to 0, means it timed out. */ + void *(*check)(struct manifest *m, unsigned int *timeleft); /* The non-NULL return from check is passed to one of these: */ @@ -113,8 +116,12 @@ 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. */ const char *contents; @@ -132,7 +139,7 @@ struct ccan_file { }; /* 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->lines directly: loads on demand. */ char **get_ccan_file_lines(struct ccan_file *f); @@ -179,4 +186,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 */