#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;
-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;
};
{
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)
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;
- 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 %s%s %s",
fail ? "-DFAIL" : "",
- output_name(name), name, obj_list(), externals,
+ output_name(name), name, apiobj, obj_list(), libs,
verbose ? "" : "> /dev/null 2>&1");
if (verbose)
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, 0) == 0, "%s %s", t->name, name);
+ ok(build(dir, name, "", libs, 0) == 0, "%s %s", t->name, name);
}
-static void compile_fail(const char *dir, struct test_type *t, const char *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)
{
- if (build(dir, name, 0) != 0)
+ 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,
+ const char *apiobj, const char *libs)
+{
+ 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)
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)
{ "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;
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);
err(1, "Opening '%s'", testdir);
while ((d = readdir(dir)) != NULL) {
- unsigned int i;
if (d->d_name[0] == '.' || !strends(d->d_name, ".c"))
continue;
}
}
if (i == ARRAY_SIZE(test_types)) {
- add_obj(testdir, d->d_name);
+ add_obj(testdir, d->d_name, true);
num_objs++;
}
}
/* 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();
projects / ccan / blobdiff