X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=31406cccbfa0386a8cda1b3f451a094b11984150;hp=01a94758f5916847b2dd9a4c8a86aac89982b75f;hb=70539048ba95b1bc7ade71dad4ed99d2d34638cc;hpb=374d3d2eaa1b29dd3f3a940ca472bb209e95155d diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c index 01a94758..31406ccc 100644 --- a/tools/ccanlint/ccanlint.c +++ b/tools/ccanlint/ccanlint.c @@ -30,6 +30,7 @@ #include #include #include +#include int verbose = 0; static LIST_HEAD(compulsory_tests); @@ -74,12 +75,12 @@ static const char *should_skip(struct manifest *m, struct ccanlint *i) if (btree_lookup(info_exclude, i->key)) return "excluded in _info file"; + if (i->skip) + return i->skip; + if (i->skip_fail) return "dependency failed"; - if (i->skip) - return "dependency was skipped"; - if (i->can_run) return i->can_run(m); return NULL; @@ -87,93 +88,101 @@ static const char *should_skip(struct manifest *m, struct ccanlint *i) static bool run_test(struct ccanlint *i, bool quiet, - unsigned int *score, - unsigned int *total_score, + unsigned int *running_score, + unsigned int *running_total, struct manifest *m) { - void *result; - unsigned int this_score, max_score, timeleft; + unsigned int timeleft; const struct dependent *d; const char *skip; - bool bad, good; + struct score *score; //one less test to run through list_for_each(&i->dependencies, d, node) d->dependent->num_depends--; + score = talloc(m, struct score); + list_head_init(&score->per_file_errors); + score->error = NULL; + score->pass = false; + score->score = 0; + score->total = 1; + skip = should_skip(m, i); if (skip) { skip: - if (verbose) - printf(" %s: skipped (%s)\n", i->name, skip); + if (verbose && !streq(skip, "not relevant to target")) + printf("%s: skipped (%s)\n", i->name, skip); - /* If we're skipping this because a prereq failed, we fail. */ + /* If we're skipping this because a prereq failed, we fail: + * count it as a score of 1. */ if (i->skip_fail) - *total_score += i->total_score; + (*running_total)++; list_del(&i->list); list_add_tail(&finished_tests, &i->list); list_for_each(&i->dependencies, d, node) { - d->dependent->skip = true; + if (d->dependent->skip) + continue; + d->dependent->skip = "dependency was skipped"; d->dependent->skip_fail = i->skip_fail; } - return true; + return i->skip_fail ? false : true; } timeleft = timeout ? timeout : default_timeout_ms; - result = i->check(m, i->keep_results, &timeleft); + i->check(m, i->keep_results, &timeleft, score); if (timeout && timeleft == 0) { skip = "timeout"; goto skip; } - max_score = i->total_score; - if (!max_score) - max_score = 1; - - if (!result) - this_score = max_score; - else if (i->score) - this_score = i->score(m, result); - else - this_score = 0; - - bad = (this_score == 0); - good = (this_score >= max_score); - - if (verbose || (!good && !quiet)) { - printf(" %s: %s", i->name, - bad ? "FAIL" : good ? "PASS" : "PARTIAL"); - if (max_score > 1) - printf(" (+%u/%u)", this_score, max_score); + assert(score->score <= score->total); + if ((!score->pass && !quiet) + || (score->score < score->total && verbose) + || verbose > 1) { + printf("%s: %s", i->name, score->pass ? "PASS" : "FAIL"); + if (score->total > 1) + printf(" (+%u/%u)", score->score, score->total); printf("\n"); } - if (!quiet && result) { - const char *desc; - if (i->describe && (desc = i->describe(m, result)) != NULL) - printf(" %s\n", desc); + if (!quiet && !score->pass) { + struct file_error *f; + + if (score->error) + printf("%s:\n", score->error); + + list_for_each(&score->per_file_errors, f, list) { + if (f->line) + printf("%s:%u:%s\n", + f->file->fullname, f->line, f->error); + else if (f->file) + printf("%s:%s\n", f->file->fullname, f->error); + else + printf("%s\n", f->error); + } if (i->handle) - i->handle(m, result); + i->handle(m, score); } - if (i->total_score) { - *score += this_score; - *total_score += i->total_score; - } + *running_score += score->score; + *running_total += score->total; list_del(&i->list); list_add_tail(&finished_tests, &i->list); - if (bad) { + if (!score->pass) { /* Skip any tests which depend on this one. */ list_for_each(&i->dependencies, d, node) { - d->dependent->skip = true; + if (d->dependent->skip) + continue; + d->dependent->skip = "dependency failed"; d->dependent->skip_fail = true; } } - return good; + return score->pass; } static void register_test(struct list_head *h, struct ccanlint *test, ...) @@ -349,6 +358,32 @@ static void add_info_fails(struct ccan_file *info) } } +static bool depends_on(struct ccanlint *i, struct ccanlint *target) +{ + const struct dependent *d; + + if (i == target) + return true; + + list_for_each(&i->dependencies, d, node) { + if (depends_on(d->dependent, target)) + return true; + } + return false; +} + +/* O(N^2), who cares? */ +static void skip_unrelated_tests(struct ccanlint *target) +{ + struct ccanlint *i; + struct list_head *list; + + foreach_ptr(list, &compulsory_tests, &normal_tests) + list_for_each(list, i, list) + if (!depends_on(i, target)) + i->skip = "not relevant to target"; +} + int main(int argc, char *argv[]) { bool summary = false; @@ -356,7 +391,7 @@ int main(int argc, char *argv[]) struct manifest *m; struct ccanlint *i; const char *prefix = ""; - char *dir = talloc_getcwd(NULL), *base_dir = dir; + char *dir = talloc_getcwd(NULL), *base_dir = dir, *target = NULL; init_tests(); @@ -380,6 +415,9 @@ int main(int argc, char *argv[]) opt_register_arg("-t|--timeout ", opt_set_uintval, NULL, &timeout, "ignore (terminate) tests that are slower than this"); + opt_register_arg("--target ", opt_set_charp, + NULL, &target, + "only run one test (and its prerequisites)"); opt_register_noarg("-?|-h|--help", opt_usage_and_exit, "\nA program for checking and guiding development" " of CCAN modules.", @@ -407,10 +445,16 @@ int main(int argc, char *argv[]) talloc_asprintf(m, "%s/test", temp_dir(NULL))) != 0) err(1, "Creating test symlink in %s", temp_dir(NULL)); - /* If you don't pass the compulsory tests, you get a score of 0. */ - if (verbose) - printf("Compulsory tests:\n"); + if (target) { + struct ccanlint *test; + test = find_test(target); + if (!test) + err(1, "Unknown test to run '%s'", target); + skip_unrelated_tests(test); + } + + /* If you don't pass the compulsory tests, you get a score of 0. */ while ((i = get_next_test(&compulsory_tests)) != NULL) { if (!run_test(i, summary, &score, &total_score, m)) { printf("%sTotal score: 0/%u\n", prefix, total_score); @@ -419,9 +463,6 @@ int main(int argc, char *argv[]) } add_info_fails(m->info_file); - - if (verbose) - printf("\nNormal tests:\n"); while ((i = get_next_test(&normal_tests)) != NULL) run_test(i, summary, &score, &total_score, m);