X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Ftests_compile_coverage.c;h=ea46e79e1bc3d8df15cac0aeb2889ca526ff4e81;hb=061e359bfc50f006a08410d43527342025d498ad;hp=f41edc0bc6f36588a334a07c923707bbc10421d5;hpb=7bb7cd58c2d9df126dd6072e5f3bec1eb4dc916b;p=ccan diff --git a/tools/ccanlint/tests/tests_compile_coverage.c b/tools/ccanlint/tests/tests_compile_coverage.c index f41edc0b..ea46e79e 100644 --- a/tools/ccanlint/tests/tests_compile_coverage.c +++ b/tools/ccanlint/tests/tests_compile_coverage.c @@ -38,9 +38,9 @@ static bool build_module_objs_with_coverage(struct manifest *m, bool keep, char *fullfile = talloc_asprintf(m, "%s/%s", m->dir, i->name); i->cov_compiled = maybe_temp_file(m, "", keep, fullfile); - if (!compile_object(m, fullfile, ccan_dir, "", + if (!compile_object(m, fullfile, ccan_dir, compiler, cflags, i->cov_compiled, &err)) { - score_file_error(score, i, 0, err); + score_file_error(score, i, 0, "%s", err); talloc_free(i->cov_compiled); i->cov_compiled = NULL; return false; @@ -93,11 +93,12 @@ static char *cov_compile(const void *ctx, bool keep) { char *output; + char *f = talloc_asprintf(ctx, "%s %s", cflags, COVERAGE_CFLAGS); file->cov_compiled = maybe_temp_file(ctx, "", keep, file->fullname); if (!compile_and_link(ctx, file->fullname, ccan_dir, obj_list(m, modobjs), - COVERAGE_CFLAGS, + compiler, f, lib_list(m), file->cov_compiled, &output)) { talloc_free(file->cov_compiled); file->cov_compiled = NULL;