X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Frun_tests.c;h=380055c0259a8bc8d393ba0b4edbfcf11a43597d;hb=11e4a54f54b4f1f39eeabc390ae51b93b7f08e36;hp=105a3e4b10b688c8466174414101b0ee1996aaaf;hpb=c4b2c672dcb8da1c16d0e2ec918a944cf82f0553;p=ccan

diff --git a/tools/run_tests.c b/tools/run_tests.c
index 105a3e4b..380055c0 100644
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -105,28 +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(talloc_autofree_context(), dir, true); *deps; deps++) {
-		char *newobj;
-		struct stat st;
-
-		if (!strstarts(*deps, "ccan/"))
-			continue;
-
-		/* ccan/foo -> ccan/foo.o */
-		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 -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)
@@ -158,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)