X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_compile.c;h=0bafcc64e5ddb6124d956eb265c24fe62eff7ce9;hp=3114f2f1bc6de31ea7b7afdf4a382a36cfdde72e;hb=HEAD;hpb=199023653cd6020218fbc4d0712591fc7ee0c5e1

diff --git a/tools/ccanlint/tests/tests_compile.c b/tools/ccanlint/tests/tests_compile.c
index 3114f2f1..0bafcc64 100644
--- a/tools/ccanlint/tests/tests_compile.c
+++ b/tools/ccanlint/tests/tests_compile.c
@@ -1,6 +1,5 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>
@@ -17,7 +16,7 @@
 #include "reduce_features.h"
 #include "tests_compile.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";
@@ -27,40 +26,54 @@ static const char *can_build(struct manifest *m)
 char *test_obj_list(const struct manifest *m, bool link_with_module,
 		    enum compile_type ctype, enum compile_type own_ctype)
 {
-	char *list = talloc_strdup(m, "");
+	char *list = tal_strdup(m, "");
 	struct ccan_file *i;
 	struct manifest *subm;
 
 	/* Objects from any other C files. */
 	list_for_each(&m->other_test_c_files, i, list)
-		list = talloc_asprintf_append(list, " %s",
-					      i->compiled[ctype]);
+		tal_append_fmt(&list, " %s", i->compiled[ctype]);
 
 	/* Our own object files. */
 	if (link_with_module)
 		list_for_each(&m->c_files, i, list)
-			list = talloc_asprintf_append(list, " %s",
-						      i->compiled[own_ctype]);
+			tal_append_fmt(&list, " %s", i->compiled[own_ctype]);
 
-	/* Other ccan modules. */
+	/* Other ccan modules (normal depends). */
 	list_for_each(&m->deps, subm, list) {
 		if (subm->compiled[ctype])
-			list = talloc_asprintf_append(list, " %s",
-						      subm->compiled[ctype]);
+			tal_append_fmt(&list, " %s", subm->compiled[ctype]);
+	}
+
+	/* Other ccan modules (test depends). */
+	list_for_each(&m->test_deps, subm, list) {
+		if (subm->compiled[ctype])
+			tal_append_fmt(&list, " %s", subm->compiled[ctype]);
 	}
 
 	return list;
 }
 
-char *lib_list(const struct manifest *m, enum compile_type ctype)
+char *test_lib_list(const struct manifest *m, enum compile_type ctype UNNEEDED)
 {
 	unsigned int i;
 	char **libs;
-	char *ret = talloc_strdup(m, "");
+	char *ret = tal_strdup(m, "");
 
-	libs = get_libs(m, m->dir, "depends", get_or_compile_info);
+	libs = get_libs(m, m->dir, "testdepends", get_or_compile_info);
 	for (i = 0; libs[i]; i++)
-		ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
+		tal_append_fmt(&ret, "-l%s ", libs[i]);
+	return ret;
+}
+
+static char *cflags_list(const struct manifest *m, const char *iflags)
+{
+	unsigned int i;
+	char *ret = tal_strdup(m, iflags);
+
+	char **flags = get_cflags(m, m->dir, get_or_compile_info);
+	for (i = 0; flags[i]; i++)
+		tal_append_fmt(&ret, " %s", flags[i]);
 	return ret;
 }
 
@@ -74,19 +87,20 @@ static bool compile(const void *ctx,
 {
 	char *fname, *flags;
 
-	flags = talloc_asprintf(ctx, "%s%s%s",
-				fail ? "-DFAIL " : "",
-				cflags,
-				ctype == COMPILE_NOFEAT
-				? " "REDUCE_FEATURES_FLAGS : "");
+	flags = tal_fmt(ctx, "%s%s%s",
+			fail ? "-DFAIL " : "",
+			cflags,
+			ctype == COMPILE_NOFEAT
+			? " "REDUCE_FEATURES_FLAGS : "");
+	flags = cflags_list(m, flags);
 
 	fname = temp_file(ctx, "", file->fullname);
 	if (!compile_and_link(ctx, file->fullname, ccan_dir,
 			      test_obj_list(m, link_with_module,
 					    ctype, ctype),
-			      compiler, flags, lib_list(m, ctype), fname,
+			      compiler, flags, test_lib_list(m, ctype), fname,
 			      output)) {
-		talloc_free(fname);
+		tal_free(fname);
 		return false;
 	}
 
@@ -104,14 +118,15 @@ static void compile_async(const void *ctx,
 	char *flags;
 
 	file->compiled[ctype] = temp_file(ctx, "", file->fullname);
-	flags = talloc_asprintf(ctx, "%s%s",
-				cflags,
-				ctype == COMPILE_NOFEAT
-				? " "REDUCE_FEATURES_FLAGS : "");
+	flags = tal_fmt(ctx, "%s%s",
+			cflags,
+			ctype == COMPILE_NOFEAT
+			? " "REDUCE_FEATURES_FLAGS : "");
+	flags = cflags_list(m, flags);
 
 	compile_and_link_async(file, time_ms, file->fullname, ccan_dir,
 			       test_obj_list(m, link_with_module, ctype, ctype),
-			       compiler, flags, lib_list(m, ctype),
+			       compiler, flags, test_lib_list(m, ctype),
 			       file->compiled[ctype]);
 }
 
@@ -196,7 +211,7 @@ struct ccanlint tests_compile = {
 
 REGISTER_TEST(tests_compile);
 
-static const char *features_reduced(struct manifest *m)
+static const char *features_reduced(struct manifest *m UNNEEDED)
 {
 	if (features_were_reduced)
 		return NULL;