#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
{
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
{
const char *cmd;
int ret;
- char *externals = talloc_strdup(name, "");
- char **deps;
-
- for (deps = get_deps(objs, dir); *deps; deps++) {
- char *end;
- if (!strstarts(*deps, "ccan/"))
- continue;
-
- end = strrchr(*deps, '/') + 1;
- /* ccan/foo -> ccan/libfoo.a */
- externals = talloc_asprintf_append(externals,
- " ccan/lib%s.a", end);
- }
- 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)
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)
}
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[])
/* 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);
}