X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=0e57140018ffee1693bbf3f1010dd622316e1335;hp=99b0eb7cbcc69e03e55ab2ad7a4bd9b758d9263f;hb=70539048ba95b1bc7ade71dad4ed99d2d34638cc;hpb=32a31d9e4fb1f312a47ae8c237ac30d6c1567ccd

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 99b0eb7c..0e571400 100644
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -11,7 +11,13 @@
 
 #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 */
 	char *basename;
 	struct ccan_file *info_file;
@@ -27,40 +33,50 @@ 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);
 
+struct file_error {
+	struct list_node list;
+	struct ccan_file *file;
+	unsigned int line; /* 0 not to print */
+	const char *error;
+};
+
+struct score {
+	bool pass;
+	unsigned int score, total;
+	const 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. */
-	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);
-
-	/* 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);
-
-	/* Verbose description of what was wrong. */
-	const char *(*describe)(struct manifest *m, void *check_result);
+	/* 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);
 
 	/* Can we do something about it? (NULL if not) */
-	void (*handle)(struct manifest *m, void *check_result);
+	void (*handle)(struct manifest *m, struct score *score);
 
 	/* Internal use fields: */
 	/* Who depends on us? */
@@ -68,9 +84,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. */
@@ -113,10 +131,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;
 
@@ -129,10 +151,16 @@ 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, 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);
@@ -161,11 +189,9 @@ char *get_symbol_token(void *ctx, const char **line);
 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);
+/* Add an error about this file (and line, if non-zero) to the score struct */
+void score_file_error(struct score *, struct ccan_file *f, unsigned line,
+		      const char *error);
 
 /* Normal tests. */
 extern struct ccanlint trailing_whitespace;
@@ -179,4 +205,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 */