int verbose = 0;
static struct ccanlint_map tests;
bool safe_mode = false;
+bool keep_results = false;
static bool targeting = false;
static unsigned int timeout;
}
timeleft = timeout ? timeout : default_timeout_ms;
- i->check(run->m, i->keep_results, &timeleft, score);
+ i->check(run->m, &timeleft, score);
if (timeout && timeleft == 0) {
i->skip = "timeout";
if (verbose)
return true;
}
-#undef REGISTER_TEST
-#define REGISTER_TEST(name, ...) extern struct ccanlint name
-#include "generated-testlist"
-
static void init_tests(void)
{
struct ccanlint_map names;
+ struct ccanlint **table;
+ size_t i, num;
strmap_init(&tests);
-#undef REGISTER_TEST
-#define REGISTER_TEST(name) register_test(&name)
-#include "generated-testlist"
+ table = autodata_get(ccanlint_tests, &num);
+ for (i = 0; i < num; i++)
+ register_test(table[i]);
+ autodata_free(table);
strmap_iterate(&tests, init_deps, NULL);
return 0;
}
-static bool keep_one_test(const char *member, struct ccanlint *c, void *unused)
-{
- c->keep_results = true;
- return true;
-}
-
-static char *keep_test(const char *testname, void *unused)
+static char *keep_tests(void *unused)
{
- if (streq(testname, "all")) {
- strmap_iterate(&tests, keep_one_test, NULL);
- } else {
- struct ccanlint *i = find_test(testname);
- if (!i)
- errx(1, "No test %s to --keep", testname);
- keep_one_test(testname, i, NULL);
- }
+ keep_results = true;
/* Don't automatically destroy temporary dir. */
talloc_set_destructor(temp_dir(NULL), show_tmpdir);
"list tests ccanlint performs (and exit)");
opt_register_noarg("--test-dep-graph", test_dependency_graph, NULL,
"print dependency graph of tests in Graphviz .dot format");
- opt_register_arg("-k|--keep <testname>", keep_test, NULL, NULL,
- "keep results of <testname>"
- " (can be used multiple times, or 'all')");
+ opt_register_noarg("-k|--keep", keep_tests, NULL,
+ "do not delete ccanlint working files");
opt_register_noarg("--summary|-s", opt_set_bool, &summary,
"simply give one line summary");
opt_register_arg("-x|--exclude <testname>", exclude_test, NULL, NULL,
"exclude <testname> (can be used multiple times)");
- opt_register_arg("-t|--timeout <milleseconds>", opt_set_uintval,
+ opt_register_arg("--timeout <milleseconds>", opt_set_uintval,
NULL, &timeout,
"ignore (terminate) tests that are slower than this");
- opt_register_arg("--target <testname>", opt_set_target, NULL, &all,
+ opt_register_arg("-t|--target <testname>", opt_set_target, NULL, &all,
"only run one test (and its prerequisites)");
opt_register_arg("--compiler <compiler>", opt_set_const_charp,
NULL, &compiler, "set the compiler");