X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Frun_tests.c;h=380055c0259a8bc8d393ba0b4edbfcf11a43597d;hp=eab42add8dfb06a6cf623181d37a30a7b3811298;hb=7eb00644b848b551b2db5d9de40893e488c2790d;hpb=41069549813a04a2875063cb12e8057f5d54d7f1

diff --git a/tools/run_tests.c b/tools/run_tests.c
index eab42add..380055c0 100644
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -4,9 +4,11 @@
 #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/string/string.h"
+#include "ccan/str/str.h"
 #include "tools.h"
 
 /* FIXME: Use build bug later. */
@@ -103,20 +105,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(objs, dir); *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 +140,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)