X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_accurate.c;h=0ed1e654cd9324199e045a867b41b4d219593a0f;hp=e13eb1168bcb28568ee6e0aea349d49e021885df;hb=453fdc02ce54ff965f9971a3bfd0e1a79b6c98f9;hpb=678cd10db6d6b81d97f3b98ea0a54657141632ad

diff --git a/tools/ccanlint/tests/depends_accurate.c b/tools/ccanlint/tests/depends_accurate.c
index e13eb116..0ed1e654 100644
--- a/tools/ccanlint/tests/depends_accurate.c
+++ b/tools/ccanlint/tests/depends_accurate.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <ctype.h>
 
-static bool has_dep(struct manifest *m, const char *depname)
+static bool has_dep(struct manifest *m, bool test_depend, const char *depname)
 {
 	struct manifest *i;
 
@@ -28,45 +28,68 @@ static bool has_dep(struct manifest *m, const char *depname)
 		if (streq(i->basename, depname))
 			return true;
 	}
+
+	if (test_depend) {
+		list_for_each(&m->test_deps, i, list) {
+			if (streq(i->basename, depname))
+				return true;
+		}
+	}
+
 	return false;
 }
 
+static void check_dep_includes(struct manifest *m, struct score *score,
+			       struct ccan_file *f, bool test_depend)
+{
+	unsigned int i;
+	char **lines = get_ccan_file_lines(f);
+	struct line_info *li = get_ccan_line_info(f);
+
+	for (i = 0; lines[i]; i++) {
+		char *mod;
+		if (!strreg(f, lines[i],
+			    "^[ \t]*#[ \t]*include[ \t]*[<\"]"
+			    "ccan/+([^/]+)/", &mod))
+			continue;
+
+		if (has_dep(m, test_depend, mod))
+			continue;
+
+		/* FIXME: we can't be sure about
+		 * conditional includes, so don't
+		 * complain. */
+		if (!li[i].cond) {
+			score_file_error(score, f, i+1,
+					 "%s not listed in _info", mod);
+		}
+	}
+}
+
 static void check_depends_accurate(struct manifest *m,
-				   bool keep,
 				   unsigned int *timeleft, struct score *score)
 {
 	struct list_head *list;
 
-	/* FIXME: This isn't reliable enough with #ifdefs, so we don't fail. */
-	score->pass = true;
+	foreach_ptr(list, &m->c_files, &m->h_files) {
+		struct ccan_file *f;
+
+		list_for_each(list, f, list)
+			check_dep_includes(m, score, f, false);
+	}
 
-	foreach_ptr(list, &m->c_files, &m->h_files,
-		    &m->run_tests, &m->api_tests,
+	foreach_ptr(list, &m->run_tests, &m->api_tests,
 		    &m->compile_ok_tests, &m->compile_fail_tests,
 		    &m->other_test_c_files) {
 		struct ccan_file *f;
 
-		list_for_each(list, f, list) {
-			unsigned int i;
-			char **lines = get_ccan_file_lines(f);
-
-			for (i = 0; lines[i]; i++) {
-				char *mod;
-				if (!strreg(f, lines[i],
-					    "^[ \t]*#[ \t]*include[ \t]*[<\"]"
-					    "ccan/+([^/]+)/", &mod))
-					continue;
-				if (has_dep(m, mod))
-					continue;
-				score_file_error(score, f, i+1,
-						 "%s not listed in _info",
-						 mod);
-			}
-		}
+		list_for_each(list, f, list)
+			check_dep_includes(m, score, f, true);
 	}
 
 	if (!score->error) {
 		score->score = score->total;
+		score->pass = true;
 	}
 }
 
@@ -74,7 +97,7 @@ struct ccanlint depends_accurate = {
 	.key = "depends_accurate",
 	.name = "Module's CCAN dependencies are the only CCAN files #included",
 	.check = check_depends_accurate,
-	.needs = "depends_exist"
+	.needs = "depends_exist test_depends_exist"
 };
 
 REGISTER_TEST(depends_accurate);