X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=b7aaef1c9fc0e1c915ec0bd4f8c65b266234e121;hp=a0fda1a8694f533d047db190262fc8fbd0c70095;hb=bbd7380019f3ea4629d170af24b902bf734c83ea;hpb=5f44c8ca0eb66503db51e0df1b65ff173eb42f57 diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c index a0fda1a8..b7aaef1c 100644 --- a/tools/ccanlint/ccanlint.c +++ b/tools/ccanlint/ccanlint.c @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include #include static unsigned int verbose = 0; @@ -33,14 +36,20 @@ static LIST_HEAD(compulsory_tests); static LIST_HEAD(normal_tests); static LIST_HEAD(finished_tests); bool safe_mode = false; +static struct btree *exclude; +static unsigned int timeout; static void usage(const char *name) { - fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-d ]\n" + fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t ] [-d ] [-x ] [-k ]*\n" " -v: verbose mode\n" " -s: simply give one line summary\n" " -d: use this directory instead of the current one\n" - " -n: do not compile anything\n", + " -n: do not compile anything\n" + " -l: list tests ccanlint performs\n" + " -k: keep results of this test (can be used multiple times)\n" + " -x: exclude tests (e.g. -x trailing_whitespace,valgrind)\n" + " -t: ignore (terminate) tests that are slower than this\n", name); exit(1); } @@ -73,6 +82,9 @@ bool ask(const char *question) static const char *should_skip(struct manifest *m, struct ccanlint *i) { + if (btree_lookup(exclude, i->key)) + return "excluded on command line"; + if (i->skip_fail) return "dependency failed"; @@ -91,7 +103,7 @@ static bool run_test(struct ccanlint *i, struct manifest *m) { void *result; - unsigned int this_score; + unsigned int this_score, timeleft; const struct dependent *d; const char *skip; @@ -100,7 +112,9 @@ static bool run_test(struct ccanlint *i, d->dependent->num_depends--; skip = should_skip(m, i); + if (skip) { + skip: if (verbose) printf(" %s: skipped (%s)\n", i->name, skip); @@ -117,10 +131,20 @@ static bool run_test(struct ccanlint *i, return true; } - result = i->check(m); + timeleft = timeout ? timeout : default_timeout_ms; + result = i->check(m, i->keep_results, &timeleft); + if (timeout && timeleft == 0) { + skip = "timeout"; + goto skip; + } if (!result) { - if (verbose) - printf(" %s: OK\n", i->name); + if (verbose) { + printf(" %s: OK", i->name); + if (i->total_score) + printf(" (+%u/%u)", + i->total_score, i->total_score); + printf("\n"); + } if (i->total_score) { *score += i->total_score; *total_score += i->total_score; @@ -141,6 +165,10 @@ static bool run_test(struct ccanlint *i, *total_score += i->total_score; *score += this_score; + if (verbose) { + printf(" %s: FAIL (+%u/%u)\n", + i->name, this_score, i->total_score); + } if (!quiet) { printf("%s\n", i->describe(m, result)); @@ -203,6 +231,7 @@ static inline struct ccanlint *get_next_test(struct list_head *test) static void init_tests(void) { const struct ccanlint *i; + struct btree *keys, *names; #undef REGISTER_TEST #define REGISTER_TEST(name, ...) register_test(&normal_tests, &name, __VA_ARGS__) @@ -211,6 +240,25 @@ static void init_tests(void) #define REGISTER_TEST(name, ...) register_test(&compulsory_tests, &name, __VA_ARGS__) #include "generated-compulsory-tests" + /* Self-consistency check: make sure no two tests + have the same key or name. */ + keys = btree_new(btree_strcmp); + names = btree_new(btree_strcmp); + list_for_each(&compulsory_tests, i, list) { + if (!btree_insert(keys, i->key)) + errx(1, "BUG: Duplicate test key '%s'", i->key); + if (!btree_insert(keys, i->name)) + errx(1, "BUG: Duplicate test name '%s'", i->name); + } + list_for_each(&normal_tests, i, list) { + if (!btree_insert(keys, i->key)) + errx(1, "BUG: Duplicate test key '%s'", i->key); + if (!btree_insert(keys, i->name)) + errx(1, "BUG: Duplicate test name '%s'", i->name); + } + btree_delete(keys); + btree_delete(names); + if (!verbose) return; @@ -237,6 +285,51 @@ static void init_tests(void) } } +static struct ccanlint *find_test(const char *key) +{ + struct ccanlint *i; + + list_for_each(&compulsory_tests, i, list) + if (streq(i->key, key)) + return i; + + list_for_each(&normal_tests, i, list) + if (streq(i->key, key)) + return i; + + return NULL; +} + +static void keep_test(const char *testname) +{ + struct ccanlint *i = find_test(testname); + if (!i) + errx(1, "No test %s to --keep", testname); + i->keep_results = true; +} + +static void print_tests(struct list_head *tests, const char *type) +{ + struct ccanlint *i; + + printf("%s tests:\n", type); + /* This makes them print in topological order. */ + while ((i = get_next_test(tests)) != NULL) { + const struct dependent *d; + printf(" %-25s %s\n", i->key, i->name); + list_del(&i->list); + list_for_each(&i->dependencies, d, node) + d->dependent->num_depends--; + } +} + +static void list_tests(void) +{ + print_tests(&compulsory_tests, "Compulsory"); + print_tests(&normal_tests, "Normal"); + exit(0); +} + int main(int argc, char *argv[]) { int c; @@ -244,19 +337,24 @@ int main(int argc, char *argv[]) unsigned int score = 0, total_score = 0; struct manifest *m; struct ccanlint *i; - const char *prefix = ""; + const char *prefix = "", *dir = "."; + + init_tests(); + + exclude = btree_new(btree_strcmp); /* 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) { + while ((c = getopt(argc, argv, "sd:vnlx:t:k:")) != -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; + case 'l': + list_tests(); case 's': summary = true; break; @@ -266,6 +364,21 @@ int main(int argc, char *argv[]) case 'n': safe_mode = true; break; + case 'k': + keep_test(optarg); + break; + case 'x': { + char **exclude_strs = strsplit(NULL, optarg, ",", NULL); + size_t i; + for (i = 0; exclude_strs[i]; i++) + btree_insert(exclude, exclude_strs[i]); + } break; + case 't': + timeout = atoi(optarg); + if (!timeout) + errx(1, "Invalid timeout %s: 1 ms minumum", + optarg); + break; default: usage(argv[0]); } @@ -274,9 +387,7 @@ int main(int argc, char *argv[]) if (optind < argc) usage(argv[0]); - m = get_manifest(talloc_autofree_context()); - - init_tests(); + m = get_manifest(talloc_autofree_context(), dir); /* If you don't pass the compulsory tests, you don't even get a score */ if (verbose)