X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=d19ede6200e01ac2856c162f42c1c8f7c8936727;hp=3555ad2a09d1ea083c1fba68aafbaed98f24cbc1;hb=b6425505ff03ea9336692adf0ebd5fa14560fb5f;hpb=e9d8020e0300f586bef1ef27bfff3593ac1317c2 diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c index 3555ad2a..d19ede62 100644 --- a/tools/ccanlint/ccanlint.c +++ b/tools/ccanlint/ccanlint.c @@ -31,24 +31,25 @@ #include #include -static unsigned int verbose = 0; +unsigned int verbose = 0; static LIST_HEAD(compulsory_tests); static LIST_HEAD(normal_tests); static LIST_HEAD(finished_tests); bool safe_mode = false; -static struct btree *exclude; +static struct btree *cmdline_exclude; +static struct btree *info_exclude; static unsigned int timeout; static void usage(const char *name) { - fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t ] [-d ] [-x ] [-k ]*\n" - " -v: verbose mode\n" + fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t ] [-d ] [-x ]* [-k ]*\n" + " -v: verbose mode (can specify more than once)\n" " -s: simply give one line summary\n" " -d: use this directory instead of the current one\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" + " -x: exclude tests (can be used multiple times)\n" " -t: ignore (terminate) tests that are slower than this\n", name); exit(1); @@ -82,8 +83,11 @@ bool ask(const char *question) static const char *should_skip(struct manifest *m, struct ccanlint *i) { - if (btree_lookup(exclude, i->key)) + if (btree_lookup(cmdline_exclude, i->key)) return "excluded on command line"; + + if (btree_lookup(info_exclude, i->key)) + return "excluded in _info file"; if (i->skip_fail) return "dependency failed"; @@ -103,10 +107,10 @@ static bool run_test(struct ccanlint *i, struct manifest *m) { void *result; - unsigned int this_score, timeleft; + unsigned int this_score, max_score, timeleft; const struct dependent *d; const char *skip; - bool failed; + bool bad, good; //one less test to run through list_for_each(&i->dependencies, d, node) @@ -139,26 +143,32 @@ static bool run_test(struct ccanlint *i, goto skip; } + max_score = i->total_score; + if (!max_score) + max_score = 1; + if (!result) - this_score = i->total_score ? i->total_score : 1; + this_score = max_score; else if (i->score) this_score = i->score(m, result); else this_score = 0; - failed = (this_score == 0); + bad = (this_score == 0); + good = (this_score >= max_score); - if (verbose) { - printf(" %s: %s", i->name, failed ? "FAIL" : "OK"); - if (i->total_score) - printf(" (+%u/%u)", - this_score, i->total_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); printf("\n"); } if (!quiet && result) { - if (i->describe && (failed || verbose)) - printf(" %s\n", i->describe(m, result)); + const char *desc; + if (i->describe && (desc = i->describe(m, result)) != NULL) + printf(" %s\n", desc); if (i->handle) i->handle(m, result); } @@ -171,14 +181,14 @@ static bool run_test(struct ccanlint *i, list_del(&i->list); list_add_tail(&finished_tests, &i->list); - if (failed) { + if (bad) { /* Skip any tests which depend on this one. */ list_for_each(&i->dependencies, d, node) { d->dependent->skip = true; d->dependent->skip_fail = true; } } - return !failed; + return good; } static void register_test(struct list_head *h, struct ccanlint *test, ...) @@ -230,10 +240,10 @@ static void init_tests(void) struct btree *keys, *names; #undef REGISTER_TEST -#define REGISTER_TEST(name, ...) register_test(&normal_tests, &name, __VA_ARGS__) +#define REGISTER_TEST(name, ...) register_test(&normal_tests, &name, __VA_ARGS__, NULL) #include "generated-normal-tests" #undef REGISTER_TEST -#define REGISTER_TEST(name, ...) register_test(&compulsory_tests, &name, __VA_ARGS__) +#define REGISTER_TEST(name, ...) register_test(&compulsory_tests, &name, __VA_ARGS__, NULL) #include "generated-compulsory-tests" /* Self-consistency check: make sure no two tests @@ -326,6 +336,27 @@ static void list_tests(void) exit(0); } +static char *strip(const void *ctx, const char *line) +{ + line += strcspn(line, IDENT_CHARS "-"); + return talloc_strndup(ctx, line, strspn(line, IDENT_CHARS "-")); +} + +static void add_info_fails(struct ccan_file *info) +{ + struct doc_section *d; + unsigned int i; + + list_for_each(get_ccan_file_docs(info), d, list) { + if (!streq(d->type, "fails")) + continue; + + for (i = 0; i < d->num_lines; i++) + btree_insert(info_exclude, strip(info, d->lines[i])); + break; + } +} + int main(int argc, char *argv[]) { int c; @@ -333,18 +364,23 @@ int main(int argc, char *argv[]) unsigned int score = 0, total_score = 0; struct manifest *m; struct ccanlint *i; - const char *prefix = "", *dir = "."; + const char *prefix = "", *dir = talloc_getcwd(NULL); init_tests(); - exclude = btree_new(btree_strcmp); + cmdline_exclude = btree_new(btree_strcmp); + info_exclude = btree_new(btree_strcmp); /* I'd love to use long options, but that's not standard. */ /* FIXME: popt ccan package? */ while ((c = getopt(argc, argv, "sd:vnlx:t:k:")) != -1) { switch (c) { case 'd': - dir = optarg; + if (optarg[0] != '/') + dir = talloc_asprintf_append(NULL, "%s/%s", + dir, optarg); + else + dir = optarg; prefix = talloc_append_string(talloc_basename(NULL, optarg), ": "); @@ -363,12 +399,9 @@ int main(int argc, char *argv[]) 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 'x': + btree_insert(cmdline_exclude, optarg); + break; case 't': timeout = atoi(optarg); if (!timeout) @@ -383,8 +416,22 @@ int main(int argc, char *argv[]) if (optind < argc) usage(argv[0]); + if (verbose >= 2) + compile_verbose = true; + if (verbose >= 3) + tools_verbose = true; + + /* We move into temporary directory, so gcov dumps its files there. */ + if (chdir(temp_dir(talloc_autofree_context())) != 0) + err(1, "Error changing to %s temporary dir", temp_dir(NULL)); + m = get_manifest(talloc_autofree_context(), dir); + /* Create a symlink from temp dir back to src dir's test directory. */ + if (symlink(talloc_asprintf(m, "%s/test", dir), + 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 don't even get a score */ if (verbose) printf("Compulsory tests:\n"); @@ -395,6 +442,8 @@ 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)