X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Frun_tests.c;h=e50d1910a210596f09832a691c36267b492d33a2;hb=863dd63fcc45b7b6596861a97f72158678635feb;hp=380055c0259a8bc8d393ba0b4edbfcf11a43597d;hpb=b776447468fc28a0bbf9ff997d784e7a4cd0018e;p=ccan diff --git a/tools/run_tests.c b/tools/run_tests.c index 380055c0..e50d1910 100644 --- 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; }; @@ -78,8 +75,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,23 +92,25 @@ 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(), + output_name(name), name, apiobj, obj_list(), libs, verbose ? "" : "> /dev/null 2>&1"); if (verbose) @@ -121,17 +123,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 +165,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 +184,21 @@ int main(int argc, char *argv[]) argv++; } - if (argc != 2) - errx(1, "Usage: run_tests [--verbose]