X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fcompile_tests.c;h=c8f303b797844f2141173c325778243fa855d6be;hp=1d24f655a1ede9d952c5a86c4067cc94477c9af2;hb=687cde2a8c561b68f17609b615eb930ea02f5aac;hpb=5b7e9d904afa72961340c225de39daab29ff7d0e

diff --git a/tools/ccanlint/tests/compile_tests.c b/tools/ccanlint/tests/compile_tests.c
index 1d24f655..c8f303b7 100644
--- a/tools/ccanlint/tests/compile_tests.c
+++ b/tools/ccanlint/tests/compile_tests.c
@@ -23,13 +23,18 @@ static const char *can_build(struct manifest *m)
 
 static char *obj_list(const struct manifest *m, bool link_with_module)
 {
-	char *list = talloc_strdup(m, "../tap.o");
+	char *list;
 	struct ccan_file *i;
 
+	/* We expect to be linked with tap, unless that's us. */
+	if (!streq(m->basename, "tap"))
+		list = talloc_strdup(m, "../tap.o");
+	else
+		list = talloc_strdup(m, "");
+
 	/* Objects from any other C files. */
 	list_for_each(&m->other_test_c_files, i, list)
-		list = talloc_asprintf_append(list, " %.*s.o",
-					      strlen(i->name) - 2, i->name);
+		list = talloc_asprintf_append(list, " %s", i->compiled);
 
 	if (link_with_module)
 		list = talloc_asprintf_append(list, " ../%s.o", m->basename);
@@ -118,7 +123,7 @@ static void *do_compile_tests(struct manifest *m)
 
 	list_for_each(&m->compile_fail_tests, i, list) {
 		compile_tests.total_score++;
-		cmdout = compile(list, m, i, true, false);
+		cmdout = compile(list, m, i, false, false);
 		if (cmdout) {
 			res = talloc(list, struct compile_tests_result);
 			res->filename = i->name;
@@ -126,7 +131,7 @@ static void *do_compile_tests(struct manifest *m)
 			res->output = talloc_steal(res, cmdout);
 			list_add_tail(list, &res->list);
 		} else {
-			cmdout = compile(list, m, i, false, false);
+			cmdout = compile(list, m, i, true, false);
 			if (!cmdout) {
 				res = talloc(list, struct compile_tests_result);
 				res->filename = i->name;