X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_accurate.c;h=986fb3bcc398df429e3b09d05cd081dc22e9d039;hp=e13eb1168bcb28568ee6e0aea349d49e021885df;hb=87c679ff36d7b198862cd2652a384d90f89f3b2b;hpb=678cd10db6d6b81d97f3b98ea0a54657141632ad

diff --git a/tools/ccanlint/tests/depends_accurate.c b/tools/ccanlint/tests/depends_accurate.c
index e13eb116..986fb3bc 100644
--- a/tools/ccanlint/tests/depends_accurate.c
+++ b/tools/ccanlint/tests/depends_accurate.c
@@ -32,14 +32,10 @@ static bool has_dep(struct manifest *m, const char *depname)
 }
 
 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,
 		    &m->run_tests, &m->api_tests,
 		    &m->compile_ok_tests, &m->compile_fail_tests,
@@ -49,6 +45,7 @@ static void check_depends_accurate(struct manifest *m,
 		list_for_each(list, f, list) {
 			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;
@@ -56,17 +53,25 @@ static void check_depends_accurate(struct manifest *m,
 					    "^[ \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);
+
+				/* 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);
+				}
 			}
 		}
 	}
 
 	if (!score->error) {
 		score->score = score->total;
+		score->pass = true;
 	}
 }