Fix "make check": this is temporary until we use ccanlint for it.

[ccan] / tools / run_tests.c

diff --git a/tools/run_tests.c b/tools/run_tests.c
index 380055c0259a8bc8d393ba0b4edbfcf11a43597d..5ba276fe4dbf7fdf517e0cb7859e9e1061218af3 100644 (file)
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -9,32 +9,29 @@
 #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;
 
-struct test_type
-{
+struct test_type {
        const char *name;
-       void (*buildfn)(const char *dir, struct test_type *t, const char *name);
+       void (*buildfn)(const char *dir, struct test_type *t, const char *name,
+                       const char *apiobj, const char *libs);
        void (*runfn)(const char *name);
 };
 
-struct test
-{
+struct test {
        struct test *next;
        struct test_type *type;
        char *name;
 };
 
-struct obj
-{
+struct obj {
        struct obj *next;
+       bool generate;
        char *name;
 };
 
@@ -49,7 +46,7 @@ static char *output_name(const char *name)
        return ret;
 }
 
-static char *obj_list(void)
+static char *obj_list(const char *dir)
 {
        char *list = talloc_strdup(objs, "");
        struct obj *i;
@@ -58,7 +55,8 @@ static char *obj_list(void)
                list = talloc_asprintf_append(list, "%s ", i->name);
 
        /* FIXME */
-       list = talloc_asprintf_append(list, "ccan/tap/tap.o");
+       if (!streq(dir, "tap") && !strends(dir, "/tap"))
+               list = talloc_asprintf_append(list, "ccan/tap/tap.o");
        return list;
 }
 
@@ -78,8 +76,11 @@ static void cleanup_objs(void)
 {
        struct obj *i;
 
-       for (i = objs; i; i = i->next)
+       for (i = objs; i; i = i->next) {
+               if (!i->generate)
+                       continue;
                unlink(talloc_asprintf(i, "%s.o", output_name(i->name)));
+       }
 }
 
 static void add_test(const char *testdir, const char *name, struct test_type *t)
@@ -92,24 +93,26 @@ static void add_test(const char *testdir, const char *name, struct test_type *t)
        tests = test;
 }
 
-static void add_obj(const char *testdir, const char *name)
+static void add_obj(const char *testdir, const char *name, bool generate)
 {
        struct obj *obj = talloc(testdir, struct obj);
 
        obj->next = objs;
        obj->name = talloc_asprintf(obj, "%s/%s", testdir, name);
+       obj->generate = generate;
        objs = obj;
 }
 
-static int build(const char *dir, const char *name, int fail)
+static int build(const char *dir, const char *name, const char *apiobj,
+                const char *libs, int fail)
 {
        const char *cmd;
        int ret;
 
-       cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s -L. -lccan %s",
+       cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s %s%s %s",
                              fail ? "-DFAIL" : "",
-                             output_name(name), name, obj_list(),
-                             verbose ? "" : "> /dev/null 2>&1");
+                             output_name(name), name, apiobj, obj_list(dir),
+                             libs, verbose ? "" : "> /dev/null 2>&1");
 
        if (verbose)
                fprintf(stderr, "Running %s\n", cmd);
@@ -121,17 +124,27 @@ static int build(const char *dir, const char *name, int fail)
        return ret;
 }
 
-static void compile_ok(const char *dir, struct test_type *t, const char *name)
+static void compile_ok(const char *dir, struct test_type *t, const char *name,
+                      const char *apiobj, const char *libs)
+{
+       ok(build(dir, name, "", libs, 0) == 0, "%s %s", t->name, name);
+}
+
+/* api tests get the API obj linked in as well. */
+static void compile_api_ok(const char *dir, struct test_type *t,
+                          const char *name, const char *apiobj,
+                          const char *libs)
 {
-       ok(build(dir, name, 0) == 0, "%s %s", t->name, name);
+       ok(build(dir, name, apiobj, libs, 0) == 0, "%s %s", t->name, name);
 }
 
-static void compile_fail(const char *dir, struct test_type *t, const char *name)
+static void compile_fail(const char *dir, struct test_type *t, const char *name,
+                        const char *apiobj, const char *libs)
 {
-       if (build(dir, name, 0) != 0)
+       if (build(dir, name, "", libs, 0) != 0)
                fail("non-FAIL build %s", name);
        else
-               ok(build(dir, name, 1) > 0, "%s %s", t->name, name);
+               ok(build(dir, name, "", libs, 1) > 0, "%s %s", t->name, name);
 }
 
 static void no_run(const char *name)
@@ -153,16 +166,18 @@ static struct test_type test_types[] = {
        { "compile_ok", compile_ok, no_run },
        { "compile_fail", compile_fail, no_run },
        { "run", compile_ok, run },
-       { "api", compile_ok, run },
+       { "api", compile_api_ok, run },
 };
 
 int main(int argc, char *argv[])
 {
        DIR *dir;
        struct dirent *d;
-       char *testdir;
+       char *testdir, *cwd;
+       const char *apiobj = "";
+       char *libs = talloc_strdup(NULL, "");
        struct test *test;
-       unsigned int num_tests = 0, num_objs = 0;
+       unsigned int num_tests = 0, num_objs = 0, i;
 
        if (argc > 1 && streq(argv[1], "--verbose")) {
                verbose = 1;
@@ -170,8 +185,21 @@ int main(int argc, char *argv[])
                argv++;
        }
 
-       if (argc != 2)
-               errx(1, "Usage: run_tests [--verbose] <dir>");
+       while (argc > 1 && strstarts(argv[1], "--lib=")) {
+               libs = talloc_asprintf_append(libs, " -l%s",
+                                             argv[1] + strlen("--lib="));
+               argc--;
+               argv++;
+       }
+
+       if (argc > 1 && strstarts(argv[1], "--apiobj=")) {
+               apiobj = argv[1] + strlen("--apiobj=");
+               argc--;
+               argv++;
+       }
+
+       if (argc < 2)
+               errx(1, "Usage: run_tests [--verbose] [--apiobj=<obj>] <dir> [<extra-objs>...]");
 
        testdir = talloc_asprintf(NULL, "%s/test", argv[1]);
        dir = opendir(testdir);
@@ -179,7 +207,6 @@ int main(int argc, char *argv[])
                err(1, "Opening '%s'", testdir);
 
        while ((d = readdir(dir)) != NULL) {
-               unsigned int i;
                if (d->d_name[0] == '.' || !strends(d->d_name, ".c"))
                        continue;
 
@@ -191,7 +218,7 @@ int main(int argc, char *argv[])
                        }
                }
                if (i == ARRAY_SIZE(test_types)) {
-                       add_obj(testdir, d->d_name);
+                       add_obj(testdir, d->d_name, true);
                        num_objs++;
                }
        }
@@ -200,9 +227,15 @@ int main(int argc, char *argv[])
        /* First all the extra object compilations. */
        compile_objs();
 
+       /* Now add any object files from the command line */
+       cwd = talloc_strdup(testdir, ".");
+       for (i = 2; i < argc; i++)
+               add_obj(cwd, argv[i], false);
+
        /* Do all the test compilations. */
        for (test = tests; test; test = test->next)
-               test->type->buildfn(argv[1], test->type, test->name);
+               test->type->buildfn(argv[1], test->type, test->name,
+                                   apiobj, libs);
 
        cleanup_objs();