X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=67412df34e184301cd3894e78080ab546cb8c480;hb=6c1d3e2739e97674069862ec7369677d25e80312;hp=5b0195d6ca2a526dd877f63bd8035a0798b915e6;hpb=2d4243996a4ace6d4eac1da460dd5bbcb31304ce;p=ccan diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c index 5b0195d6..67412df3 100644 --- a/tools/ccanlint/tests/examples_compile.c +++ b/tools/ccanlint/tests/examples_compile.c @@ -121,7 +121,11 @@ static bool compile(const void *ctx, file->compiled = maybe_temp_file(ctx, "", keep, file->fullname); if (!compile_and_link(ctx, file->fullname, ccan_dir, obj_list(m, file), - "", lib_list(m), file->compiled, output)) { + compiler, cflags, + lib_list(m), file->compiled, output)) { + /* Don't keep failures. */ + if (keep) + unlink(file->compiled); talloc_free(file->compiled); file->compiled = NULL; return false; @@ -542,25 +546,23 @@ static void build_examples(struct manifest *m, bool keep, prev = lines[j]; score->score++; warnings = true; - score->error = "Compiling extracted example" - " gave warnings"; - error = talloc_asprintf(score, - "Example:\n" - "%s\n" - "Compiler:\n" - "%s", - get_ccan_file_contents(file[j]), - err[j]); - score_file_error(score, file[j], 0, error); + score_file_error(score, file[j], 0, + "Compiling extracted example" + " gave warnings:\n" + "Example:\n" + "%s\n" + "Compiler:\n" + "%s", + get_ccan_file_contents(file[j]), + err[j]); goto next; } } score->pass = false; - score->error = "Compiling extracted examples failed"; if (!verbose) { if (num == 3) - error = "Standalone, adding headers, " + error = "Compiling standalone, adding headers, " "and including previous " "example all failed"; else @@ -598,7 +600,7 @@ static void build_examples(struct manifest *m, bool keep, err[1]); } } - score_file_error(score, i, 0, error); + score_file_error(score, i, 0, "%s", error); /* This didn't work, so not a candidate for combining. */ prev = NULL; @@ -615,10 +617,11 @@ static void build_examples(struct manifest *m, bool keep, } struct ccanlint examples_compile = { - .key = "examples-compile", + .key = "examples_compile", .name = "Module examples compile", .check = build_examples, .can_run = can_run, + .needs = "examples_exist module_builds" }; -REGISTER_TEST(examples_compile, &has_examples, &build, NULL); +REGISTER_TEST(examples_compile);