X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fccanlint%2Fcompulsory_tests%2Fbuild_objs.c;h=d26844941c859e10d85fa2e7ae27148fefea98da;hb=3d4c75ff37b1c5a7bfd8847a788aa1d09b07d466;hp=aa8e7b36a5ebce098d9967d359eb86147395cf8e;hpb=a40b318e7a07a452ae7456053727bd11b2fa49b4;p=ccan diff --git a/tools/ccanlint/compulsory_tests/build_objs.c b/tools/ccanlint/compulsory_tests/build_objs.c index aa8e7b36..d2684494 100644 --- a/tools/ccanlint/compulsory_tests/build_objs.c +++ b/tools/ccanlint/compulsory_tests/build_objs.c @@ -26,25 +26,34 @@ static void check_objs_build(struct manifest *m, unsigned int *timeleft, struct score *score) { struct ccan_file *i; + bool errors = false, warnings = false; if (list_empty(&m->c_files)) score->total = 0; + else + score->total = 2; list_for_each(&m->c_files, i, list) { - char *err; + char *output; char *fullfile = talloc_asprintf(m, "%s/%s", m->dir, i->name); i->compiled = maybe_temp_file(m, "", keep, fullfile); - err = compile_object(m, fullfile, ccan_dir, "", i->compiled); - if (err) { + if (!compile_object(score, fullfile, ccan_dir, "", i->compiled, + &output)) { talloc_free(i->compiled); score->error = "Compiling object files"; - score_file_error(score, i, 0, err); + score_file_error(score, i, 0, output); + errors = true; + } else if (!streq(output, "")) { + score->error = "Compiling object files gave warnings"; + score_file_error(score, i, 0, output); + warnings = true; } } - if (!score->error) { + + if (!errors) { score->pass = true; - score->score = score->total; + score->score = score->total - warnings; } }