X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_build.c;h=24fb7ca3d68de7e281a8cdfdac123d19ea423958;hp=e7faa1f1503ed8632c02534ab3ca34d4aa86218a;hb=HEAD;hpb=441a3cb13e428cfa4973d83acb68e231a7cd4cf4

diff --git a/tools/ccanlint/tests/depends_build.c b/tools/ccanlint/tests/depends_build.c
index e7faa1f1..24fb7ca3 100644
--- a/tools/ccanlint/tests/depends_build.c
+++ b/tools/ccanlint/tests/depends_build.c
@@ -1,6 +1,6 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/foreach/foreach.h>
 #include <ccan/str/str.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -13,9 +13,9 @@
 #include <err.h>
 #include <string.h>
 #include <ctype.h>
-#include "../compulsory_tests/build.h"
+#include "build.h"
 
-static const char *can_build(struct manifest *m)
+static const char *can_build(struct manifest *m UNNEEDED)
 {
 	if (safe_mode)
 		return "Safe mode enabled";
@@ -35,18 +35,17 @@ static char *build_subdir_objs(struct manifest *m,
 	struct ccan_file *i;
 
 	list_for_each(&m->c_files, i, list) {
-		char *fullfile = talloc_asprintf(m, "%s/%s", m->dir, i->name);
+		char *fullfile = tal_fmt(m, "%s/%s", m->dir, i->name);
 		char *output;
 
-		i->compiled[ctype] = maybe_temp_file(m, "", false, fullfile);
+		i->compiled[ctype] = temp_file(m, "", fullfile);
 		if (!compile_object(m, fullfile, ccan_dir, compiler, flags,
 				    i->compiled[ctype], &output)) {
-			talloc_free(i->compiled[ctype]);
+			tal_free(i->compiled[ctype]);
 			i->compiled[ctype] = NULL;
-			return talloc_asprintf(m,
-					       "Dependency %s"
-					       " did not build:\n%s",
-					       m->basename, output);
+			return tal_fmt(m,
+				       "Dependency %s did not build:\n%s",
+				       m->modname, output);
 		}
 	}
 	return NULL;
@@ -70,27 +69,34 @@ char *build_submodule(struct manifest *m, const char *flags,
 	if (errstr)
 		return errstr;
 
-	m->compiled[ctype] = build_module(m, false, ctype, &errstr);
+	m->compiled[ctype] = build_module(m, ctype, &errstr);
 	if (!m->compiled[ctype])
 		return errstr;
 	return NULL;
 }
 
 static void check_depends_built(struct manifest *m,
-				bool keep,
-				unsigned int *timeleft, struct score *score)
+				unsigned int *timeleft UNNEEDED,
+				struct score *score)
 {
-	struct manifest *i;
+	struct list_head *list;
 
-	list_for_each(&m->deps, i, list) {
-		char *errstr = build_submodule(i, cflags, COMPILE_NORMAL);
+	foreach_ptr(list, &m->deps, &m->test_deps) {
+		struct manifest *i;
+		list_for_each(list, i, list) {
+			char *errstr;
 
-		if (errstr) {
-			score->error = talloc_asprintf(score,
+			errstr = build_submodule(i, cflags, COMPILE_NORMAL);
+
+			if (errstr) {
+				score->error = tal_fmt(score,
 						       "Dependency %s"
-						       " did not build:\n%s",
-						       i->basename, errstr);
-			return;
+						       " did not"
+						       " build:\n%s",
+						       i->modname,
+						       errstr);
+				return;
+			}
 		}
 	}
 
@@ -103,7 +109,7 @@ struct ccanlint depends_build = {
 	.name = "Module's CCAN dependencies can be found or built",
 	.check = check_depends_built,
 	.can_run = can_build,
-	.needs = "depends_exist"
+	.needs = "depends_exist test_depends_exist info_ported"
 };
 
 REGISTER_TEST(depends_build);