X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Frun_tests.c;h=5ba276fe4dbf7fdf517e0cb7859e9e1061218af3;hp=e50d1910a210596f09832a691c36267b492d33a2;hb=f3948bf8102ce5281460e6ed6053150a96d71a91;hpb=0c532d80a73cae44360595c762dddefcd7e0a4ec;ds=sidebyside

diff --git a/tools/run_tests.c b/tools/run_tests.c
index e50d1910..5ba276fe 100644
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -46,7 +46,7 @@ static char *output_name(const char *name)
 	return ret;
 }
 
-static char *obj_list(void)
+static char *obj_list(const char *dir)
 {
 	char *list = talloc_strdup(objs, "");
 	struct obj *i;
@@ -55,7 +55,8 @@ static char *obj_list(void)
 		list = talloc_asprintf_append(list, "%s ", i->name);
 
 	/* FIXME */
-	list = talloc_asprintf_append(list, "ccan/tap/tap.o");
+	if (!streq(dir, "tap") && !strends(dir, "/tap"))
+		list = talloc_asprintf_append(list, "ccan/tap/tap.o");
 	return list;
 }
 
@@ -110,8 +111,8 @@ static int build(const char *dir, const char *name, const char *apiobj,
 
 	cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s %s%s %s",
 			      fail ? "-DFAIL" : "",
-			      output_name(name), name, apiobj, obj_list(), libs,
-			      verbose ? "" : "> /dev/null 2>&1");
+			      output_name(name), name, apiobj, obj_list(dir),
+			      libs, verbose ? "" : "> /dev/null 2>&1");
 
 	if (verbose)
 		fprintf(stderr, "Running %s\n", cmd);