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 <ms>] [-d <dirname>] [-x <tests>] [-k <test>]*\n"
+ fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <test>]* [-k <test>]*\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);
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";
else
this_score = 0;
- bad = (this_score == 0);
+ bad = (this_score == 0 && i->total_score != 0);
good = (this_score >= i->total_score);
if (verbose || (bad && !quiet)) {
d->dependent->skip_fail = true;
}
}
- return good;
+ return !bad;
}
static void register_test(struct list_head *h, struct ccanlint *test, ...)
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
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;
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? */
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)
if (optind < argc)
usage(argv[0]);
+ if (verbose >= 2)
+ compile_verbose = true;
if (verbose >= 3)
tools_verbose = true;
}
}
+ add_info_fails(m->info_file);
+
if (verbose)
printf("\nNormal tests:\n");
while ((i = get_next_test(&normal_tests)) != NULL)