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 <dirname>]\n"
+ fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <tests>] [-k <test>]*\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"
" -l: list tests ccanlint performs\n"
- " -x: exclude tests (e.g. -x trailing_whitespace,valgrind)\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);
}
struct manifest *m)
{
void *result;
- unsigned int this_score;
+ unsigned int this_score, timeleft;
const struct dependent *d;
const char *skip;
d->dependent->num_depends--;
skip = should_skip(m, i);
+
if (skip) {
+ skip:
if (verbose)
printf(" %s: skipped (%s)\n", i->name, skip);
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", i->name);
}
}
-static void print_test(const struct ccanlint *i)
+static struct ccanlint *find_test(const char *key)
{
- int space = 25 - strlen(i->key);
-
- if (space >= 2) {
- printf(" %s", i->key);
- while (space--)
- putchar(' ');
- } else {
- printf(" %s ", i->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--;
}
-
- printf("%s\n", i->name);
}
static void list_tests(void)
{
- const struct ccanlint *i;
-
- init_tests();
-
- printf("Compulsory tests:\n");
- list_for_each(&compulsory_tests, i, list)
- print_test(i);
- printf("Normal tests:\n");
- list_for_each(&normal_tests, i, list)
- print_test(i);
-
+ print_tests(&compulsory_tests, "Compulsory");
+ print_tests(&normal_tests, "Normal");
exit(0);
}
struct ccanlint *i;
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:vnlx:")) != -1) {
+ while ((c = getopt(argc, argv, "sd:vnlx:t:k:")) != -1) {
switch (c) {
case 'd':
dir = optarg;
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]);
}
m = get_manifest(talloc_autofree_context(), dir);
- init_tests();
-
/* If you don't pass the compulsory tests, you don't even get a score */
if (verbose)
printf("Compulsory tests:\n");