X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Frun_tests.c;h=278b65227a3bdeddbe9631c116c5e31a8b643cd5;hp=a1fbc614918851e50657adb8bfa53caeba695297;hb=504c6dab8d2c94575f14ccb542af7433936e7af2;hpb=16b7eb13fbcb1a04a71622e6310020baccc3c39c

diff --git a/tools/run_tests.c b/tools/run_tests.c
index a1fbc614..278b6522 100644
--- 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/string/string.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;
@@ -19,7 +19,8 @@ static int verbose;
 struct test_type
 {
 	const char *name;
-	void (*testfn)(const char *dir, struct test_type *t, const char *name);
+	void (*buildfn)(const char *dir, struct test_type *t, const char *name);
+	void (*runfn)(const char *name);
 };
 
 struct test
@@ -102,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(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)
@@ -141,10 +132,14 @@ static void compile_fail(const char *dir, struct test_type *t, const char *name)
 		ok(build(dir, name, 1) > 0, "%s %s", t->name, name);
 }
 
+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)
@@ -153,9 +148,10 @@ static void cleanup(const char *name)
 }
 
 static struct test_type test_types[] = {
-	{ "compile_ok", compile_ok },
-	{ "compile_fail", compile_fail },
-	{ "run", compile_ok },
+	{ "compile_ok", compile_ok, no_run },
+	{ "compile_fail", compile_fail, no_run },
+	{ "run", compile_ok, run },
+	{ "api", compile_ok, run },
 };
 
 int main(int argc, char *argv[])
@@ -204,14 +200,13 @@ int main(int argc, char *argv[])
 
 	/* Do all the test compilations. */
 	for (test = tests; test; test = test->next)
-		test->type->testfn(argv[1], test->type, test->name);
+		test->type->buildfn(argv[1], test->type, test->name);
 
 	cleanup_objs();
 
 	/* Now run all the ones which wanted to run. */
 	for (test = tests; test; test = test->next) {
-		if (streq(test->type->name, "run"))
-			run(test->name);
+		test->type->runfn(test->name);
 		cleanup(test->name);
 	}