X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fcompile_tests.c;h=3549cdedf6611c0ce33bf4866b767a25de018e11;hb=03a596908b779bbb4b7c2f739c5e238f8c5d6390;hp=062912d427ea3bb49e2b22a71cca94082c606df3;hpb=7a163ea2dcafc056fdafc8c71ef011e2bfdbeb65;p=ccan-lca-2011.git

diff --git a/tools/ccanlint/tests/compile_tests.c b/tools/ccanlint/tests/compile_tests.c
index 062912d..3549cde 100644
--- a/tools/ccanlint/tests/compile_tests.c
+++ b/tools/ccanlint/tests/compile_tests.c
@@ -53,7 +53,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, &m->info_file->compiled);
+	char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled);
 	char *ret = talloc_strdup(m, "");
 
 	for (i = 0; i < num; i++)
@@ -71,14 +71,14 @@ static char *compile(const void *ctx,
 	char *errmsg;
 
 	file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
-	errmsg = compile_and_link(ctx, file->fullname, ccan_dir,
-				  obj_list(m, link_with_module),
-				  fail ? "-DFAIL" : "",
-				  lib_list(m), file->compiled);
-	if (errmsg) {
+	if (!compile_and_link(ctx, file->fullname, ccan_dir,
+			      obj_list(m, link_with_module),
+			      fail ? "-DFAIL" : "",
+			      lib_list(m), file->compiled, &errmsg)) {
 		talloc_free(file->compiled);
 		return errmsg;
 	}
+	talloc_free(errmsg);
 	return NULL;
 }