X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_build_without_features.c;h=faa3b21d115b28fc31066d7456f9b0f5e3eefbee;hp=65728fc8f1fee779de2163175a880e035b1ff714;hb=453fdc02ce54ff965f9971a3bfd0e1a79b6c98f9;hpb=b931f4765272d68de3b5e35d70c1933c27bcdea4

diff --git a/tools/ccanlint/tests/depends_build_without_features.c b/tools/ccanlint/tests/depends_build_without_features.c
index 65728fc8..faa3b21d 100644
--- a/tools/ccanlint/tests/depends_build_without_features.c
+++ b/tools/ccanlint/tests/depends_build_without_features.c
@@ -2,6 +2,7 @@
 #include <tools/tools.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/foreach/foreach.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -13,7 +14,8 @@
 #include <err.h>
 #include <string.h>
 #include <ctype.h>
-#include "../compulsory_tests/build.h"
+#include "reduce_features.h"
+#include "build.h"
 
 static const char *can_build(struct manifest *m)
 {
@@ -23,24 +25,30 @@ static const char *can_build(struct manifest *m)
 }
 
 static void check_depends_built_without_features(struct manifest *m,
-						 bool keep,
 						 unsigned int *timeleft,
 						 struct score *score)
 {
+	struct list_head *list;
 	struct manifest *i;
 	char *flags;
 
-	flags = talloc_asprintf(score, "%s -I.", cflags);
+	flags = talloc_asprintf(score, "%s %s", cflags,
+				REDUCE_FEATURES_FLAGS);
 
-	list_for_each(&m->deps, i, list) {
-		char *errstr = build_submodule(i, flags, COMPILE_NOFEAT);
+	foreach_ptr(list, &m->deps, &m->test_deps) {
+		list_for_each(list, i, list) {
+			char *errstr = build_submodule(i, flags,
+						       COMPILE_NOFEAT);
 
-		if (errstr) {
-			score->error = talloc_asprintf(score,
-						       "Dependency %s"
-						       " did not build:\n%s",
-						       i->basename, errstr);
-			return;
+			if (errstr) {
+				score->error = talloc_asprintf(score,
+							       "Dependency %s"
+							       " did not"
+							       " build:\n%s",
+							       i->basename,
+							       errstr);
+				return;
+			}
 		}
 	}
 
@@ -53,7 +61,7 @@ struct ccanlint depends_build_without_features = {
 	.name = "Module's CCAN dependencies can be found or built (reduced features)",
 	.check = check_depends_built_without_features,
 	.can_run = can_build,
-	.needs = "depends_exist"
+	.needs = "depends_build reduce_features"
 };
 
 REGISTER_TEST(depends_build_without_features);