X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=e019c139d1a1f59deee3bc36000029cc98f5e2d8;hb=b7f7224b320e4659d0e2d9eba503a1713ede3b48;hp=9644185f5af8fba4191bdc1570800535ef6bdd30;hpb=b0f7eb297643941bd96eb209f35fbe223cd24e10;p=ccan

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 9644185f..e019c139 100644
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -5,7 +5,8 @@
 #include "../doc_extract.h"
 
 #define REGISTER_TEST(name, ...) extern struct ccanlint name
-#include "generated-init-tests"
+#include "generated-compulsory-tests"
+#include "generated-normal-tests"
 #undef REGISTER_TEST
 
 #define REGISTER_TEST(name, ...) 
@@ -22,12 +23,15 @@ 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;
 
-	/* From tests/check_depends.c */
-	struct list_head dep_obj_files;
+	/* 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);
@@ -38,9 +42,12 @@ struct ccanlint {
 	/* Unique name of test */
 	const char *name;
 
-	/* Total score that this test is worth.  0 means compulsory tests. */
+	/* 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);
 
@@ -60,6 +67,10 @@ struct ccanlint {
 	struct list_head dependencies;
 	/* 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;
+	/* Did we fail a dependency?  If so, skip and mark as fail. */
+	bool skip_fail;
 };
 
 /* Ask the user a yes/no question: the answer is NO if there's an error. */
@@ -115,6 +126,9 @@ 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;
 };
 
 /* A new ccan_file, with the given name (talloc_steal onto returned value). */