X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=968f655e397f2719217bd4d8ed8f49002787175e;hp=9b252735f8187c3f2c3fb554bccf160f61f2a3bc;hb=32a31d9e4fb1f312a47ae8c237ac30d6c1567ccd;hpb=b0f7eb297643941bd96eb209f35fbe223cd24e10 diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c index 9b252735..968f655e 100644 --- a/tools/ccanlint/ccanlint.c +++ b/tools/ccanlint/ccanlint.c @@ -17,6 +17,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "ccanlint.h" +#include "../tools.h" #include #include #include @@ -37,13 +38,14 @@ static void usage(const char *name) { fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-d ]\n" " -v: verbose mode\n" - " -s: simply give one line per FAIL and total score\n" + " -s: simply give one line summary\n" " -d: use this directory instead of the current one\n" " -n: do not compile anything\n", name); exit(1); } +#if 0 static void indent_print(const char *string) { while (*string) { @@ -56,6 +58,7 @@ static void indent_print(const char *string) string += line; } } +#endif bool ask(const char *question) { @@ -68,8 +71,21 @@ bool ask(const char *question) && toupper(reply[0]) == 'Y'; } +static const char *should_skip(struct manifest *m, struct ccanlint *i) +{ + 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; +} + static bool run_test(struct ccanlint *i, - bool summary, + bool quiet, unsigned int *score, unsigned int *total_score, struct manifest *m) @@ -77,18 +93,38 @@ static bool run_test(struct ccanlint *i, void *result; unsigned int this_score; const struct dependent *d; + const char *skip; - if (i->total_score) - *total_score += i->total_score; //one less test to run through list_for_each(&i->dependencies, d, node) d->dependent->num_depends--; + + skip = should_skip(m, i); + if (skip) { + if (verbose) + printf(" %s: skipped (%s)\n", i->name, skip); + + /* If we're skipping this because a prereq failed, we fail. */ + if (i->skip_fail) + *total_score += i->total_score; + + list_del(&i->list); + list_add_tail(&finished_tests, &i->list); + list_for_each(&i->dependencies, d, node) { + d->dependent->skip = true; + d->dependent->skip_fail = i->skip_fail; + } + return true; + } + result = i->check(m); if (!result) { if (verbose) printf(" %s: OK\n", i->name); - if (i->total_score) + if (i->total_score) { *score += i->total_score; + *total_score += i->total_score; + } list_del(&i->list); list_add_tail(&finished_tests, &i->list); @@ -100,37 +136,34 @@ static bool run_test(struct ccanlint *i, else this_score = 0; + list_del(&i->list); + list_add_tail(&finished_tests, &i->list); + + *total_score += i->total_score; *score += this_score; - if (summary) { - printf("%s FAILED (%u/%u)\n", - i->name, this_score, i->total_score); + if (!quiet) { + printf("%s\n", i->describe(m, result)); - if (verbose) - indent_print(i->describe(m, result)); - list_del(&i->list); - list_add_tail(&finished_tests, &i->list); - return false; + if (i->handle) + i->handle(m, result); } - printf("%s\n", i->describe(m, result)); + /* Skip any tests which depend on this one. */ + list_for_each(&i->dependencies, d, node) { + d->dependent->skip = true; + d->dependent->skip_fail = true; + } - if (i->handle) - i->handle(m, result); - list_del(&i->list); - list_add_tail(&finished_tests, &i->list); return false; } -static void register_test(struct ccanlint *test, ...) +static void register_test(struct list_head *h, struct ccanlint *test, ...) { va_list ap; struct ccanlint *depends; struct dependent *dchild; - if (!test->total_score) - list_add(&compulsory_tests, &test->list); - else - list_add(&normal_tests, &test->list); + list_add(h, &test->list); va_start(ap, test); /* Careful: we might have been initialized by a dependent. */ @@ -172,8 +205,11 @@ static void init_tests(void) const struct ccanlint *i; #undef REGISTER_TEST -#define REGISTER_TEST(name, ...) register_test(&name, __VA_ARGS__) -#include "generated-init-tests" +#define REGISTER_TEST(name, ...) register_test(&normal_tests, &name, __VA_ARGS__) +#include "generated-normal-tests" +#undef REGISTER_TEST +#define REGISTER_TEST(name, ...) register_test(&compulsory_tests, &name, __VA_ARGS__) +#include "generated-compulsory-tests" if (!verbose) return; @@ -205,15 +241,20 @@ int main(int argc, char *argv[]) { int c; bool summary = false; - unsigned int score, total_score; + unsigned int score = 0, total_score = 0; struct manifest *m; struct ccanlint *i; + const char *prefix = "", *dir = "."; /* I'd love to use long options, but that's not standard. */ /* FIXME: getopt_long ccan package? */ while ((c = getopt(argc, argv, "sd:vn")) != -1) { switch (c) { case 'd': + dir = optarg; + prefix = talloc_append_string(talloc_basename(NULL, + optarg), + ": "); if (chdir(optarg) != 0) err(1, "Changing into directory '%s'", optarg); break; @@ -234,7 +275,7 @@ int main(int argc, char *argv[]) if (optind < argc) usage(argv[0]); - m = get_manifest(talloc_autofree_context()); + m = get_manifest(talloc_autofree_context(), dir); init_tests(); @@ -243,17 +284,16 @@ int main(int argc, char *argv[]) printf("Compulsory tests:\n"); while ((i = get_next_test(&compulsory_tests)) != NULL) { - if (!run_test(i, summary, &score, &total_score, m)) - exit(1); + if (!run_test(i, summary, &score, &total_score, m)) { + errx(1, "%s%s failed", prefix, i->name); + } } if (verbose) printf("\nNormal tests:\n"); - score = total_score = 0; - while ((i = get_next_test(&normal_tests)) != NULL) { - if (i->total_score) - run_test(i, summary, &score, &total_score, m); - } - printf("Total score: %u/%u\n", score, total_score); + while ((i = get_next_test(&normal_tests)) != NULL) + run_test(i, summary, &score, &total_score, m); + + printf("%sTotal score: %u/%u\n", prefix, score, total_score); return 0; }