X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fcompile_tests.c;h=1d24f655a1ede9d952c5a86c4067cc94477c9af2;hp=7f0338a4a96906570db3c8518bce73afcf611206;hb=3612661714e86333ceacca7314959a5ed938dc6a;hpb=165727526f785b05f67f3d88f9518a0a840acbbf

diff --git a/tools/ccanlint/tests/compile_tests.c b/tools/ccanlint/tests/compile_tests.c
index 7f0338a4..1d24f655 100644
--- a/tools/ccanlint/tests/compile_tests.c
+++ b/tools/ccanlint/tests/compile_tests.c
@@ -40,7 +40,7 @@ static char *obj_list(const struct manifest *m, bool link_with_module)
 static char *lib_list(const struct manifest *m)
 {
 	unsigned int i, num;
-	char **libs = get_libs(m, ".", ".", &num);
+	char **libs = get_libs(m, ".", ".", &num, &m->info_file->compiled);
 	char *ret = talloc_strdup(m, "");
 
 	for (i = 0; i < num; i++)
@@ -48,23 +48,20 @@ static char *lib_list(const struct manifest *m)
 	return ret;
 }
 
-static int cleanup_testfile(const char *testfile)
-{
-	unlink(testfile);
-	return 0;
-}
-
 static char *compile(const void *ctx,
 		     struct manifest *m, struct ccan_file *file, bool fail,
 		     bool link_with_module)
 {
-	file->compiled = talloc_strdup(ctx, tempnam("/tmp", "ccanlint"));
-	talloc_set_destructor(file->compiled, cleanup_testfile);
-
-	return run_command(m, "cc " CFLAGS " %s -o %s %s %s %s",
-			   fail ? "-DFAIL" : "",
-			   file->compiled, file->name,
-			   obj_list(m, link_with_module), lib_list(m));
+	char *errmsg;
+
+	file->compiled = compile_and_link(ctx, file->name,
+					  obj_list(m, link_with_module),
+					  fail ? "-DFAIL" : "",
+					  lib_list(m), &errmsg);
+	if (!file->compiled)
+		return errmsg;
+	talloc_steal(ctx, file->compiled);
+	return NULL;
 }
 
 struct compile_tests_result {