#include <err.h>
#include <string.h>
#include <ctype.h>
+#include "reduce_features.h"
+#include "tests_compile.h"
static const char *can_build(struct manifest *m)
{
return NULL;
}
-/* FIXME: Merge this into one place. */
-static char *obj_list(const struct manifest *m, bool link_with_module)
+char *test_obj_list(const struct manifest *m, bool link_with_module,
+ enum compile_type ctype, enum compile_type own_ctype)
{
char *list = talloc_strdup(m, "");
struct ccan_file *i;
/* Objects from any other C files. */
list_for_each(&m->other_test_c_files, i, list)
- list = talloc_asprintf_append(list, " %s", i->compiled);
+ list = talloc_asprintf_append(list, " %s",
+ i->compiled[ctype]);
/* Our own object files. */
if (link_with_module)
list_for_each(&m->c_files, i, list)
- list = talloc_asprintf_append(list, " %s", i->compiled);
+ list = talloc_asprintf_append(list, " %s",
+ i->compiled[own_ctype]);
/* Other ccan modules. */
list_for_each(&m->deps, subm, list) {
- if (subm->compiled)
+ if (subm->compiled[ctype])
list = talloc_asprintf_append(list, " %s",
- subm->compiled);
+ subm->compiled[ctype]);
}
return list;
}
-static char *lib_list(const struct manifest *m)
+char *lib_list(const struct manifest *m, enum compile_type ctype)
{
unsigned int i, num;
- char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled);
+ char **libs = get_libs(m, m->dir, &num,
+ &m->info_file->compiled[ctype]);
char *ret = talloc_strdup(m, "");
for (i = 0; i < num; i++)
struct ccan_file *file,
bool fail,
bool link_with_module,
- bool keep, char **output)
+ bool keep,
+ enum compile_type ctype,
+ char **output)
{
- char *f = talloc_asprintf(ctx, "%s%s",
- fail ? "-DFAIL " : "", cflags);
+ char *fname, *flags;
+
+ flags = talloc_asprintf(ctx, "%s%s%s",
+ fail ? "-DFAIL " : "",
+ cflags,
+ ctype == COMPILE_NOFEAT
+ ? " "REDUCE_FEATURES_FLAGS : "");
- file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
+ fname = maybe_temp_file(ctx, "", keep, file->fullname);
if (!compile_and_link(ctx, file->fullname, ccan_dir,
- obj_list(m, link_with_module), compiler, f,
- lib_list(m), file->compiled, output)) {
- talloc_free(file->compiled);
+ test_obj_list(m, link_with_module,
+ ctype, ctype),
+ compiler, flags, lib_list(m, ctype), fname,
+ output)) {
+ talloc_free(fname);
return false;
}
+
+ file->compiled[ctype] = fname;
return true;
}
-static void do_compile_tests(struct manifest *m,
- bool keep,
- unsigned int *timeleft, struct score *score)
+static void compile_async(const void *ctx,
+ struct manifest *m,
+ struct ccan_file *file,
+ bool link_with_module,
+ bool keep,
+ enum compile_type ctype,
+ unsigned int time_ms)
+{
+ char *flags;
+
+ file->compiled[ctype] = maybe_temp_file(ctx, "", keep, file->fullname);
+ flags = talloc_asprintf(ctx, "%s%s",
+ cflags,
+ ctype == COMPILE_NOFEAT
+ ? " "REDUCE_FEATURES_FLAGS : "");
+
+ compile_and_link_async(file, time_ms, file->fullname, ccan_dir,
+ test_obj_list(m, link_with_module, ctype, ctype),
+ compiler, flags, lib_list(m, ctype),
+ file->compiled[ctype]);
+}
+
+static void compile_tests(struct manifest *m, bool keep,
+ struct score *score,
+ enum compile_type ctype,
+ unsigned int time_ms)
{
char *cmdout;
struct ccan_file *i;
struct list_head *list;
- bool errors = false, warnings = false;
+ bool errors = false, warnings = false, ok;
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_file_error(score, i, 0,
- "Compile failed:\n%s",
- cmdout);
- errors = true;
- } else if (!streq(cmdout, "")) {
- score_file_error(score, i, 0,
- "Compile gave warnings:\n%s",
- cmdout);
- warnings = true;
- }
+ compile_async(score, m, i,
+ list == &m->api_tests, keep,
+ ctype, time_ms);
+ }
+ }
+
+ while ((i = collect_command(&ok, &cmdout)) != NULL) {
+ if (!ok) {
+ score_file_error(score, i, 0,
+ "Compile failed:\n%s",
+ cmdout);
+ errors = true;
+ } else if (!streq(cmdout, "")) {
+ score_file_error(score, i, 0,
+ "Compile gave warnings:\n%s",
+ cmdout);
+ warnings = true;
}
}
/* For historical reasons, "fail" often means "gives warnings" */
list_for_each(&m->compile_fail_tests, i, list) {
- if (!compile(score, m, i, false, false, false, &cmdout)) {
+ if (!compile(score, m, i, false, false, false,
+ ctype, &cmdout)) {
score_file_error(score, i, 0,
"Compile without -DFAIL failed:\n%s",
cmdout);
cmdout);
return;
}
- if (compile(score, m, i, true, false, false, &cmdout)
+ if (compile(score, m, i, true, false, false,
+ ctype, &cmdout)
&& streq(cmdout, "")) {
score_file_error(score, i, 0,
"Compiled successfully with -DFAIL?");
return;
}
+ score->total++;
}
score->pass = true;
- score->total = 2;
- score->score = 1 + !warnings;
+ score->score = score->total - warnings;
+}
+
+/* FIXME: If we time out, set *timeleft to 0 */
+static void do_compile_tests(struct manifest *m,
+ bool keep,
+ unsigned int *timeleft, struct score *score)
+{
+ compile_tests(m, keep, score, COMPILE_NORMAL, *timeleft);
}
struct ccanlint tests_compile = {
};
REGISTER_TEST(tests_compile);
+
+static const char *features_reduced(struct manifest *m)
+{
+ if (features_were_reduced)
+ return NULL;
+ return "No features to turn off";
+}
+
+static void do_compile_tests_without_features(struct manifest *m,
+ bool keep,
+ unsigned int *timeleft,
+ struct score *score)
+{
+ compile_tests(m, keep, score, COMPILE_NOFEAT, *timeleft);
+}
+
+struct ccanlint tests_compile_without_features = {
+ .key = "tests_compile_without_features",
+ .name = "Module tests compile (without features)",
+ .check = do_compile_tests_without_features,
+ .can_run = features_reduced,
+ .needs = "tests_helpers_compile_without_features objects_build_without_features"
+};
+REGISTER_TEST(tests_compile_without_features);