X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Frun_tests.c;fp=tools%2Frun_tests.c;h=105a3e4b10b688c8466174414101b0ee1996aaaf;hp=4506963589f432a5836f704e274eefd85bd1abc7;hb=c4b2c672dcb8da1c16d0e2ec918a944cf82f0553;hpb=0c492447b997ad50c289314a7ba41cca6bcc1c3c

diff --git a/tools/run_tests.c b/tools/run_tests.c
index 45069635..105a3e4b 100644
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -4,6 +4,8 @@
 #include <dirent.h>
 #include <assert.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <errno.h>
 #include "ccan/tap/tap.h"
 #include "ccan/talloc/talloc.h"
 #include "ccan/str/str.h"
@@ -107,11 +109,19 @@ static int build(const char *dir, const char *name, int fail)
 	char **deps;
 
 	for (deps = get_deps(talloc_autofree_context(), dir, true); *deps; deps++) {
+		char *newobj;
+		struct stat st;
+
 		if (!strstarts(*deps, "ccan/"))
 			continue;
 
 		/* ccan/foo -> ccan/foo.o */
-		externals = talloc_asprintf_append(externals, " %s.o", *deps);
+		newobj = talloc_asprintf(name, "%s.o", *deps);
+
+		/* Only if it exists.  Makefile sorts this out. */
+		if (stat(newobj, &st) == 0 || errno != ENOENT)
+			externals = talloc_asprintf_append(externals,
+							   " %s", newobj);
 	}
 
 	cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s%s%s",