#include <tools/tools.h>
#include <ccan/talloc/talloc.h>
#include <ccan/str/str.h>
+#include <ccan/foreach/foreach.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
return NULL;
}
+/* FIXME: Merge this into one place. */
static char *obj_list(const struct manifest *m, bool link_with_module)
{
- char *list = talloc_strdup(m, "../tap.o");
+ char *list = talloc_strdup(m, "");
struct ccan_file *i;
+ struct manifest *subm;
/* Objects from any other C files. */
list_for_each(&m->other_test_c_files, i, list)
- list = talloc_asprintf_append(list, " %.*s.o",
- strlen(i->name) - 2, i->name);
+ list = talloc_asprintf_append(list, " %s", i->compiled);
+ /* Our own object files. */
if (link_with_module)
- list = talloc_asprintf_append(list, " ../%s.o", m->basename);
+ list_for_each(&m->c_files, i, list)
+ list = talloc_asprintf_append(list, " %s", i->compiled);
+
+ /* Other ccan modules. */
+ list_for_each(&m->deps, subm, list) {
+ if (subm->compiled)
+ list = talloc_asprintf_append(list, " %s",
+ subm->compiled);
+ }
return list;
}
static char *lib_list(const struct manifest *m)
{
unsigned int i, num;
- char **libs = get_libs(m, ".", ".", &num);
+ char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled);
char *ret = talloc_strdup(m, "");
for (i = 0; i < num; i++)
return ret;
}
-static int cleanup_testfile(const char *testfile)
-{
- unlink(testfile);
- return 0;
-}
-
-static char *compile(const void *ctx,
- struct manifest *m, struct ccan_file *file, bool fail,
- bool link_with_module)
+static bool compile(const void *ctx,
+ struct manifest *m,
+ struct ccan_file *file,
+ bool fail,
+ bool link_with_module,
+ bool keep, char **output)
{
- file->compiled = talloc_strdup(ctx, tempnam("/tmp", "ccanlint"));
- talloc_set_destructor(file->compiled, cleanup_testfile);
-
- return run_command(m, "cc " CFLAGS " %s -o %s %s %s %s",
- fail ? "-DFAIL" : "",
- file->compiled, file->name,
- obj_list(m, link_with_module), lib_list(m));
+ file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
+ if (!compile_and_link(ctx, file->fullname, ccan_dir,
+ obj_list(m, link_with_module),
+ fail ? "-DFAIL" : "",
+ lib_list(m), file->compiled, output)) {
+ talloc_free(file->compiled);
+ return false;
+ }
+ return true;
}
-struct compile_tests_result {
- struct list_node list;
- const char *filename;
- const char *description;
- const char *output;
-};
-
-static void *do_compile_tests(struct manifest *m)
+static void do_compile_tests(struct manifest *m,
+ bool keep,
+ unsigned int *timeleft, struct score *score)
{
- struct list_head *list = talloc(m, struct list_head);
char *cmdout;
struct ccan_file *i;
- struct compile_tests_result *res;
-
- list_head_init(list);
-
- compile_tests.total_score = 0;
- list_for_each(&m->compile_ok_tests, i, list) {
- compile_tests.total_score++;
- cmdout = compile(list, m, i, false, false);
- if (cmdout) {
- res = talloc(list, struct compile_tests_result);
- res->filename = i->name;
- res->description = "failed to compile";
- res->output = talloc_steal(res, cmdout);
- list_add_tail(list, &res->list);
- }
- }
-
- list_for_each(&m->run_tests, i, list) {
- compile_tests.total_score++;
- cmdout = compile(m, m, i, false, false);
- if (cmdout) {
- res = talloc(list, struct compile_tests_result);
- res->filename = i->name;
- res->description = "failed to compile";
- res->output = talloc_steal(res, cmdout);
- list_add_tail(list, &res->list);
+ struct list_head *list;
+ bool errors = false, warnings = false;
+
+ foreach_ptr(list, &m->compile_ok_tests, &m->run_tests, &m->api_tests) {
+ list_for_each(list, i, list) {
+ if (!compile(score, m, i, false, list == &m->api_tests,
+ keep, &cmdout)) {
+ score->error = "Failed to compile tests";
+ score_file_error(score, i, 0, cmdout);
+ errors = true;
+ } else if (!streq(cmdout, "")) {
+ score->error = "Test compiled with warnings";
+ score_file_error(score, i, 0, cmdout);
+ warnings = true;
+ }
}
}
- list_for_each(&m->api_tests, i, list) {
- compile_tests.total_score++;
- cmdout = compile(m, m, i, false, true);
- if (cmdout) {
- res = talloc(list, struct compile_tests_result);
- res->filename = i->name;
- res->description = "failed to compile";
- res->output = talloc_steal(res, cmdout);
- list_add_tail(list, &res->list);
- }
- }
+ /* The compile fail tests are a bit weird, handle them separately */
+ if (errors)
+ return;
+ /* For historical reasons, "fail" often means "gives warnings" */
list_for_each(&m->compile_fail_tests, i, list) {
- compile_tests.total_score++;
- cmdout = compile(list, m, i, true, false);
- if (cmdout) {
- res = talloc(list, struct compile_tests_result);
- res->filename = i->name;
- res->description = "failed to compile without -DFAIL";
- res->output = talloc_steal(res, cmdout);
- list_add_tail(list, &res->list);
- } else {
- cmdout = compile(list, m, i, false, false);
- if (!cmdout) {
- res = talloc(list, struct compile_tests_result);
- res->filename = i->name;
- res->description = "compiled successfully"
- " with -DFAIL";
- res->output = "";
- list_add_tail(list, &res->list);
- }
+ if (!compile(score, m, i, false, false, false, &cmdout)) {
+ score->error = "Failed to compile without -DFAIL";
+ score_file_error(score, i, 0, cmdout);
+ return;
+ }
+ if (!streq(cmdout, "")) {
+ score->error = "Compile with warnigns without -DFAIL";
+ score_file_error(score, i, 0, cmdout);
+ return;
+ }
+ if (compile(score, m, i, true, false, false, &cmdout)
+ && streq(cmdout, "")) {
+ score->error = "Compiled successfully with -DFAIL?";
+ score_file_error(score, i, 0, NULL);
+ return;
}
}
- if (list_empty(list)) {
- talloc_free(list);
- list = NULL;
- }
-
- return list;
-}
-
-static unsigned int score_compile_tests(struct manifest *m,
- void *check_result)
-{
- struct list_head *list = check_result;
- struct compile_tests_result *i;
- unsigned int score = compile_tests.total_score;
-
- list_for_each(list, i, list)
- score--;
- return score;
-}
-
-static const char *describe_compile_tests(struct manifest *m,
- void *check_result)
-{
- struct list_head *list = check_result;
- struct compile_tests_result *i;
- char *descrip = talloc_strdup(list, "Compilation tests failed:\n");
-
- list_for_each(list, i, list)
- descrip = talloc_asprintf_append(descrip, "%s %s\n%s",
- i->filename, i->description,
- i->output);
- return descrip;
+ score->pass = true;
+ score->total = 2;
+ score->score = 1 + !warnings;
}
struct ccanlint compile_tests = {
- .name = "Compile tests succeed",
- .total_score = 1,
- .score = score_compile_tests,
+ .key = "compile-tests",
+ .name = "Module tests compile",
.check = do_compile_tests,
- .describe = describe_compile_tests,
.can_run = can_build,
};
-REGISTER_TEST(compile_tests, &compile_test_helpers, NULL);
+REGISTER_TEST(compile_tests, &compile_test_helpers, &build_objs, NULL);
projects / ccan / blobdiff