Use array_size module

[ccan] / tools / run_tests.c

diff --git a/tools/run_tests.c b/tools/run_tests.c
index 4506963589f432a5836f704e274eefd85bd1abc7..278b65227a3bdeddbe9631c116c5e31a8b643cd5 100644 (file)
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -4,14 +4,14 @@
 #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/array_size/array_size.h"
 #include "tools.h"
 
-/* FIXME: Use build bug later. */
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
 static struct test *tests = NULL;
 static struct obj *objs = NULL;
 static int verbose;
@@ -103,20 +103,10 @@ static int build(const char *dir, const char *name, int fail)
 {
        const char *cmd;
        int ret;
-       char *externals = talloc_strdup(name, "");
-       char **deps;
-
-       for (deps = get_deps(talloc_autofree_context(), dir, true); *deps; deps++) {
-               if (!strstarts(*deps, "ccan/"))
-                       continue;
-
-               /* ccan/foo -> ccan/foo.o */
-               externals = talloc_asprintf_append(externals, " %s.o", *deps);
-       }
 
-       cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s%s%s",
+       cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s -L. -lccan %s",
                              fail ? "-DFAIL" : "",
-                             output_name(name), name, obj_list(), externals,
+                             output_name(name), name, obj_list(),
                              verbose ? "" : "> /dev/null 2>&1");
 
        if (verbose)
@@ -148,8 +138,8 @@ static void no_run(const char *name)
 
 static void run(const char *name)
 {
-       if (system(output_name(name)) == -1)
-               fail("running %s had error %m", name);
+       if (system(output_name(name)) != 0)
+               fail("running %s had error", name);
 }
 
 static void cleanup(const char *name)