merge

[ccan] / tools / run_tests.c

diff --git a/tools/run_tests.c b/tools/run_tests.c
index aa7f90a9765e4283cbd1439526e653df8090a123..b9a6f66c4cd910acf6d4db0ff6f13e16be86b726 100644 (file)
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -19,7 +19,8 @@ static int verbose;
 struct test_type
 {
        const char *name;
-       void (*testfn)(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
@@ -98,14 +99,24 @@ static void add_obj(const char *testdir, const char *name)
        objs = obj;
 }
 
-static int build(const char *name, int fail)
+static int build(const char *dir, const char *name, int fail)
 {
        const char *cmd;
        int ret;
+       char *externals = talloc_strdup(name, "");
+       char **deps;
 
-       cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s%s",
+       for (deps = get_deps(talloc_autofree_context(), 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",
                              fail ? "-DFAIL" : "",
-                             output_name(name), name, obj_list(),
+                             output_name(name), name, obj_list(), externals,
                              verbose ? "" : "> /dev/null 2>&1");
 
        if (verbose)
@@ -118,17 +129,21 @@ static int build(const char *name, int fail)
        return ret;
 }
 
-static void compile_ok(struct test_type *t, const char *name)
+static void compile_ok(const char *dir, struct test_type *t, const char *name)
 {
-       ok(build(name, 0) == 0, "%s %s", t->name, name);
+       ok(build(dir, name, 0) == 0, "%s %s", t->name, name);
 }
 
-static void compile_fail(struct test_type *t, const char *name)
+static void compile_fail(const char *dir, struct test_type *t, const char *name)
 {
-       if (build(name, 0) != 0)
+       if (build(dir, name, 0) != 0)
                fail("non-FAIL build %s", name);
        else
-               ok(build(name, 1) > 0, "%s %s", t->name, 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)
@@ -143,9 +158,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[])
@@ -188,20 +204,19 @@ int main(int argc, char *argv[])
                }
        }
 
-       plan_tests(num_tests + num_objs);
+       plan_tests(num_tests + num_objs + (num_objs ? 1 : 0));
        /* First all the extra object compilations. */
        compile_objs();
 
        /* Do all the test compilations. */
        for (test = tests; test; test = test->next)
-               test->type->testfn(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);
        }