Hack to fix test builds, by ignoring deps with no .o's (ie.
authorRusty Russell <rusty@rustcorp.com.au>
Sat, 15 Nov 2008 12:25:25 +0000 (22:55 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Sat, 15 Nov 2008 12:25:25 +0000 (22:55 +1030)
headers-only)

tools/run_tests.c

index 4506963589f432a5836f704e274eefd85bd1abc7..105a3e4b10b688c8466174414101b0ee1996aaaf 100644 (file)
@@ -4,6 +4,8 @@
 #include <dirent.h>
 #include <assert.h>
 #include <unistd.h>
 #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"
 #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 **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 */
                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",
        }
 
        cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s%s%s",