int verbose = 0;
static struct ccanlint_map tests;
bool safe_mode = false;
+bool keep_results = false;
static bool targeting = false;
static unsigned int timeout;
const char *config_header;
+const char *ccan_dir;
+
#if 0
static void indent_print(const char *string)
{
}
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);
static bool add_to_all(const char *member, struct ccanlint *c,
struct dgraph_node *all)
{
- dgraph_add_edge(&c->node, all);
+ /* If we're excluded on cmdline, don't add. */
+ if (!c->skip)
+ dgraph_add_edge(&c->node, all);
return true;
}
"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,
dir[strlen(dir)-1] = '\0';
got_dir:
+ /* We assume there's a ccan/ in there somewhere... */
+ if (i == 1) {
+ ccan_dir = find_ccan_dir(dir);
+ if (!ccan_dir)
+ errx(1, "Cannot find ccan/ base directory in %s",
+ dir);
+ read_config_header();
+ }
+
if (dir != base_dir)
prefix = talloc_append_string(talloc_basename(NULL,dir),
": ");
m = get_manifest(talloc_autofree_context(), dir);
- /* FIXME: This has to come after we've got manifest. */
- if (i == 1)
- read_config_header();
-
/* Create a symlink from temp dir back to src dir's
* test directory. */
unlink(testlink);