X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=41a4606c40fe260644ce24471a5eca66225ca686;hp=679b00ac2bf2f87a02e4ac879fdbe1c9803b5611;hb=5f4051eaef69310d43dfdc66bb60a5979638d74c;hpb=5378c864f9c37f39d906f599285da25a7db0c9fe

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 679b00ac..41a4606c 100644
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -11,9 +11,13 @@
 
 #define REGISTER_TEST(name, ...) 
 
-/* 1 == Describe results for partial failures.
-   2 == Describe gory details.
-   3 == Describe every action. */
+/* 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 {
@@ -22,6 +26,11 @@ struct manifest {
 	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;
 
@@ -37,11 +46,25 @@ struct manifest {
 	struct list_head mangled_examples;
 
 	/* From tests/check_depends_exist.c */
-	struct list_head dep_dirs;
+	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; /* 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;
 
@@ -51,27 +74,23 @@ struct ccanlint {
 	/* 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.
-	 * keep is set if you should keep the results.
-	 * If timeleft is set to 0, means it timed out. */
-	void *(*check)(struct manifest *m, bool keep, unsigned int *timeleft);
-
-	/* 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);
+
+	/* Options from _info. */
+	char *options;
+	/* If not set, we'll give an error if they try to set options. */
+	bool takes_options;
 
 	/* Internal use fields: */
 	/* Who depends on us? */
@@ -79,7 +98,7 @@ 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? */
@@ -149,6 +168,9 @@ struct ccan_file {
 
 	/* 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). */
@@ -183,12 +205,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);
+/* 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;