X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=7a7f5b8be17d3187f51b29d19de71c448471db0d;hb=43ea89157d6cf730d44050548cb60407da60cb0f;hp=5f443d6fafd4ec4f9cbea5b62ebf054be0d92a98;hpb=b1524d16e5e98dafee5a192511a557ace0b5afb3;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 5f443d6f..7a7f5b8b 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -33,12 +33,17 @@
 #include <ccan/foreach/foreach.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/cast/cast.h>
+#include <ccan/tlist/tlist.h>
+#include <ccan/strmap/strmap.h>
+
+struct ccanlint_map {
+	STRMAP_MEMBERS(struct ccanlint *);
+};
 
 int verbose = 0;
-static LIST_HEAD(compulsory_tests);
-static LIST_HEAD(normal_tests);
-static LIST_HEAD(finished_tests);
+static struct ccanlint_map tests;
 bool safe_mode = false;
+static bool targeting = false;
 static struct btree *cmdline_exclude;
 static struct btree *info_exclude;
 static unsigned int timeout;
@@ -94,20 +99,37 @@ static const char *should_skip(struct manifest *m, struct ccanlint *i)
 	return NULL;
 }
 
+static bool skip_node(struct dgraph_node *to, const char *failmsg)
+{
+	struct ccanlint *c = container_of(to, struct ccanlint, node);
+	if (!c->skip) {
+		if (failmsg) {
+			c->skip = failmsg;
+			c->skip_fail = true;
+		} else {
+			c->skip = "dependency was skipped";
+		}
+	}
+	return true;
+}
+
 static bool run_test(struct ccanlint *i,
 		     bool quiet,
 		     unsigned int *running_score,
 		     unsigned int *running_total,
-		     struct manifest *m)
+		     struct manifest *m,
+		     const char *prefix)
 {
 	unsigned int timeleft;
-	const struct dependent *d;
 	const char *skip;
 	struct score *score;
 
-	//one less test to run through
-	list_for_each(&i->dependencies, d, node)
-		d->dependent->num_depends--;
+	strmap_del(&tests, i->key, NULL);
+
+	if (!i->should_run) {
+		dgraph_clear_node(&i->node);
+		return true;
+	}
 
 	score = talloc(m, struct score);
 	list_head_init(&score->per_file_errors);
@@ -120,22 +142,17 @@ static bool run_test(struct ccanlint *i,
 
 	if (skip) {
 	skip:
-		if (verbose && !streq(skip, "not relevant to target"))
-			printf("%s: skipped (%s)\n", i->name, skip);
+		if (verbose)
+			printf("%s%s: skipped (%s)\n", prefix, i->name, skip);
 
 		/* If we're skipping this because a prereq failed, we fail:
 		 * count it as a score of 1. */
 		if (i->skip_fail)
 			(*running_total)++;
-			
-		list_del(&i->list);
-		list_add_tail(&finished_tests, &i->list);
-		list_for_each(&i->dependencies, d, node) {
-			if (d->dependent->skip)
-				continue;
-			d->dependent->skip = "dependency was skipped";
-			d->dependent->skip_fail = i->skip_fail;
-		}
+
+		dgraph_traverse_from(&i->node, skip_node,
+				     i->skip_fail ? "dependency failed" : NULL);
+		dgraph_clear_node(&i->node);
 		return i->skip_fail ? false : true;
 	}
 
@@ -150,7 +167,8 @@ static bool run_test(struct ccanlint *i,
 	if ((!score->pass && !quiet)
 	    || (score->score < score->total && verbose)
 	    || verbose > 1) {
-		printf("%s (%s): %s", i->name, i->key, score->pass ? "PASS" : "FAIL");
+		printf("%s%s (%s): %s",
+		       prefix, i->name, i->key, score->pass ? "PASS" : "FAIL");
 		if (score->total > 1)
 			printf(" (+%u/%u)", score->score, score->total);
 		printf("\n");
@@ -168,58 +186,53 @@ static bool run_test(struct ccanlint *i,
 	*running_score += score->score;
 	*running_total += score->total;
 
-	list_del(&i->list);
-	list_add_tail(&finished_tests, &i->list);
-
 	if (!score->pass) {
 		/* Skip any tests which depend on this one. */
-		list_for_each(&i->dependencies, d, node) {
-			if (d->dependent->skip)
-				continue;
-			d->dependent->skip = "dependency failed";
-			d->dependent->skip_fail = true;
-		}
+		dgraph_traverse_from(&i->node, skip_node, "dependency failed");
 	}
+	dgraph_clear_node(&i->node);
 	return score->pass;
 }
 
-static void register_test(struct list_head *h, struct ccanlint *test)
+static void register_test(struct ccanlint *test)
 {
-	list_add(h, &test->list);
+	if (!strmap_add(&tests, test->key, test))
+		err(1, "Adding test %s", test->key);
 	test->options = talloc_array(NULL, char *, 1);
 	test->options[0] = NULL;
+	dgraph_init_node(&test->node);
+}
+
+static bool get_test(const char *member, struct ccanlint *i,
+		     struct ccanlint **ret)
+{
+	if (tlist_empty(&i->node.edge[DGRAPH_TO])) {
+		*ret = i;
+		return false;
+	}
+	return true;
 }
 
 /**
  * get_next_test - retrieves the next test to be processed
  **/
-static inline struct ccanlint *get_next_test(struct list_head *test)
+static inline struct ccanlint *get_next_test(void)
 {
-	struct ccanlint *i;
+	struct ccanlint *i = NULL;
 
-	if (list_empty(test))
+	strmap_iterate(&tests, get_test, &i);
+	if (i)
+		return i;
+
+	if (strmap_empty(&tests))
 		return NULL;
 
-	list_for_each(test, i, list) {
-		if (i->num_depends == 0)
-			return i;
-	}
 	errx(1, "Can't make process; test dependency cycle");
 }
 
 static struct ccanlint *find_test(const char *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;
+	return strmap_get(&tests, key);
 }
 
 bool is_excluded(const char *name)
@@ -229,114 +242,101 @@ bool is_excluded(const char *name)
 		|| find_test(name)->skip != NULL;
 }
 
+static bool reset_deps(const char *member, struct ccanlint *c, void *unused)
+{
+	char **deps = strsplit(NULL, c->needs, " ");
+	unsigned int i;
+
+	c->skip = NULL;
+	c->skip_fail = false;
+	for (i = 0; deps[i]; i++) {
+		struct ccanlint *dep;
+
+		dep = find_test(deps[i]);
+		if (!dep)
+			errx(1, "BUG: unknown dep '%s' for %s",
+			     deps[i], c->key);
+		dgraph_add_edge(&dep->node, &c->node);
+	}
+	talloc_free(deps);
+	return true;
+}
+
+static bool check_names(const char *member, struct ccanlint *c,
+			struct ccanlint_map *names)
+{
+	if (!strmap_add(names, c->name, c))
+		err(1, "Duplicate name %s", c->name);
+	return true;
+}
+
 #undef REGISTER_TEST
 #define REGISTER_TEST(name, ...) extern struct ccanlint name
-#include "generated-normal-tests"
-#include "generated-compulsory-tests"
+#include "generated-testlist"
 
 static void init_tests(void)
 {
-	struct ccanlint *c;
-	struct btree *keys, *names;
-	struct list_head *list;
+	struct ccanlint_map names;
+
+	strmap_init(&tests);
 
 #undef REGISTER_TEST
-#define REGISTER_TEST(name) register_test(&normal_tests, &name)
-#include "generated-normal-tests"
-#undef REGISTER_TEST
-#define REGISTER_TEST(name) register_test(&compulsory_tests, &name)
-#include "generated-compulsory-tests"
+#define REGISTER_TEST(name) register_test(&name)
+#include "generated-testlist"
 
-	/* Initialize dependency lists. */
-	foreach_ptr(list, &compulsory_tests, &normal_tests) {
-		list_for_each(list, c, list) {
-			list_head_init(&c->dependencies);
-		}
-	}
+	strmap_iterate(&tests, reset_deps, NULL);
 
-	/* Resolve dependencies. */
-	foreach_ptr(list, &compulsory_tests, &normal_tests) {
-		list_for_each(list, c, list) {
-			char **deps = strsplit(NULL, c->needs, " ");
-			unsigned int i;
-
-			for (i = 0; deps[i]; i++) {
-				struct ccanlint *dep;
-				struct dependent *dchild;
-
-				dep = find_test(deps[i]);
-				if (!dep)
-					errx(1, "BUG: unknown dep '%s' for %s",
-					     deps[i], c->key);
-				dchild = talloc(NULL, struct dependent);
-				dchild->dependent = c;
-				list_add_tail(&dep->dependencies,
-					      &dchild->node);
-				c->num_depends++;
-			}
-			talloc_free(deps);
-		}
-	}
+	/* Check for duplicate names. */
+	strmap_init(&names);
+	strmap_iterate(&tests, check_names, &names);
+	strmap_clear(&names);
+}
 
-	/* Self-consistency check: make sure no two tests
-	   have the same key or name. */
-	keys = btree_new(btree_strcmp);
-	names = btree_new(btree_strcmp);
-	foreach_ptr(list, &compulsory_tests, &normal_tests) {
-		list_for_each(list, c, list) {
-			if (!btree_insert(keys, c->key))
-				errx(1, "BUG: Duplicate test key '%s'",
-				     c->key);
-			if (!btree_insert(names, c->name))
-				errx(1, "BUG: Duplicate test name '%s'",
-				     c->name);
+static bool print_deps(const char *member, struct ccanlint *c, void *unused)
+{
+	if (!tlist_empty(&c->node.edge[DGRAPH_FROM])) {
+		struct dgraph_edge *e;
+
+		printf("These depend on %s:\n", c->key);
+		dgraph_for_each_edge(&c->node, e, DGRAPH_FROM) {
+			struct ccanlint *to = container_of(e->n[DGRAPH_TO],
+							   struct ccanlint,
+							   node);
+			printf("\t%s\n", to->key);
 		}
 	}
-	btree_delete(keys);
-	btree_delete(names);
+	return true;
 }
 
 static void print_test_depends(void)
 {
-	struct list_head *list;
+	printf("Tests:\n");
 
-	foreach_ptr(list, &compulsory_tests, &normal_tests) {
-		struct ccanlint *c;
-		printf("\%s Tests\n",
-		       list == &compulsory_tests ? "Compulsory" : "Normal");
-
-		list_for_each(list, c, list) {
-			if (!list_empty(&c->dependencies)) {
-				const struct dependent *d;
-				printf("These depend on %s:\n", c->key);
-				list_for_each(&c->dependencies, d, node)
-					printf("\t%s\n", d->dependent->key);
-			}
-		}
-	}
+	strmap_iterate(&tests, print_deps, NULL);
 }
 
+
 static int show_tmpdir(const char *dir)
 {
 	printf("You can find ccanlint working files in '%s'\n", dir);
 	return 0;
 }
 
-static char *keep_test(const char *testname, void *unused)
+static bool keep_one_test(const char *member, struct ccanlint *c, void *unused)
 {
-	struct ccanlint *i;
+	c->keep_results = true;
+	return true;
+}
 
+static char *keep_test(const char *testname, void *unused)
+{
 	if (streq(testname, "all")) {
-		struct list_head *list;
-		foreach_ptr(list, &compulsory_tests, &normal_tests) {
-			list_for_each(list, i, list)
-				i->keep_results = true;
-		}
+		strmap_iterate(&tests, keep_one_test, NULL);
 	} else {
-		i = find_test(testname);
+		struct ccanlint *i = find_test(testname);
 		if (!i)
 			errx(1, "No test %s to --keep", testname);
-		i->keep_results = true;
+		keep_one_test(testname, i, NULL);
 	}
 
 	/* Don't automatically destroy temporary dir. */
@@ -350,60 +350,59 @@ static char *skip_test(const char *testname, void *unused)
 	return NULL;
 }
 
-static void print_tests(struct list_head *tests, const char *type)
+static char *list_tests(void *arg)
 {
 	struct ccanlint *i;
 
-	printf("%s tests:\n", type);
+	printf("Tests:\n");
 	/* This makes them print in topological order. */
-	while ((i = get_next_test(tests)) != NULL) {
-		const struct dependent *d;
+	while ((i = get_next_test()) != NULL) {
 		printf("   %-25s %s\n", i->key, i->name);
-		list_del(&i->list);
-		list_for_each(&i->dependencies, d, node)
-			d->dependent->num_depends--;
+		dgraph_clear_node(&i->node);
+		strmap_del(&tests, i->key, NULL);
 	}
+	exit(0);
 }
 
-static char *list_tests(void *arg)
+static bool draw_test(const char *member, struct ccanlint *c, const char *style)
 {
-	print_tests(&compulsory_tests, "Compulsory");
-	print_tests(&normal_tests, "Normal");
-	exit(0);
+	/*
+	 * todo: escape labels in case ccanlint test keys have
+	 *       characters interpreted as GraphViz syntax.
+	 */
+	printf("\t\"%p\" [label=\"%s\"%s]\n", c, c->key, style);
+	return true;
+}
+
+static void test_dgraph_vertices(const char *style)
+{
+	strmap_iterate(&tests, draw_test, style);
 }
 
-static void test_dgraph_vertices(struct list_head *tests, const char *style)
+static bool draw_edges(const char *member, struct ccanlint *c, void *unused)
 {
-	const struct ccanlint *i;
+	struct dgraph_edge *e;
 
-	list_for_each(tests, i, list) {
-		/*
-		 * todo: escape labels in case ccanlint test keys have
-		 *       characters interpreted as GraphViz syntax.
-		 */
-		printf("\t\"%p\" [label=\"%s\"%s]\n", i, i->key, style);
+	dgraph_for_each_edge(&c->node, e, DGRAPH_FROM) {
+		struct ccanlint *to = container_of(e->n[DGRAPH_TO],
+						   struct ccanlint,
+						   node);
+		printf("\t\"%p\" -> \"%p\"\n", c->name, to->name);
 	}
+	return true;
 }
 
-static void test_dgraph_edges(struct list_head *tests)
+static void test_dgraph_edges(void)
 {
-	const struct ccanlint *i;
-	const struct dependent *d;
-
-	list_for_each(tests, i, list)
-		list_for_each(&i->dependencies, d, node)
-			printf("\t\"%p\" -> \"%p\"\n", d->dependent, i);
+	strmap_iterate(&tests, draw_edges, NULL);
 }
 
 static char *test_dependency_graph(void *arg)
 {
 	puts("digraph G {");
 
-	test_dgraph_vertices(&compulsory_tests, ", style=filled, fillcolor=yellow");
-	test_dgraph_vertices(&normal_tests,     "");
-
-	test_dgraph_edges(&compulsory_tests);
-	test_dgraph_edges(&normal_tests);
+	test_dgraph_vertices("");
+	test_dgraph_edges();
 
 	puts("}");
 
@@ -442,7 +441,7 @@ static void add_options(struct ccanlint *test, char **options,
 	memcpy(&test->options[num], options, (num_options + 1)*sizeof(char *));
 }
 
-static void add_info_options(struct ccan_file *info, bool mark_fails)
+void add_info_options(struct ccan_file *info)
 {
 	struct doc_section *d;
 	unsigned int i;
@@ -477,7 +476,7 @@ static void add_info_options(struct ccan_file *info, bool mark_fails)
 
 			/* Known failure? */
 			if (strcasecmp(words[1], "FAIL") == 0) {
-				if (mark_fails)
+				if (!targeting)
 					btree_insert(info_exclude, words[0]);
 			} else {
 				if (!test->takes_options)
@@ -526,32 +525,6 @@ char **per_file_options(const struct ccanlint *test, struct ccan_file *f)
 	return talloc_realloc(NULL, ret, char *, j + 1);
 }
 
-static bool depends_on(struct ccanlint *i, struct ccanlint *target)
-{
-	const struct dependent *d;
-
-	if (i == target)
-		return true;
-
-	list_for_each(&i->dependencies, d, node) {
-		if (depends_on(d->dependent, target))
-			return true;
-	}
-	return false;
-}
-
-/* O(N^2), who cares? */
-static void skip_unrelated_tests(struct ccanlint *target)
-{
-	struct ccanlint *i;
-	struct list_head *list;
-
-	foreach_ptr(list, &compulsory_tests, &normal_tests)
-		list_for_each(list, i, list)
-			if (!depends_on(i, target))
-				i->skip = "not relevant to target";
-}
-
 static char *demangle_string(char *string)
 {
 	unsigned int i;
@@ -651,22 +624,45 @@ static char *opt_set_const_charp(const char *arg, const char **p)
 	return opt_set_charp(arg, cast_const2(char **, p));
 }
 
+static bool should_run_ccanlint(const char *name, struct ccanlint *c,
+				void *unused)
+{
+	c->should_run = true;
+	return true;
+}
+
+static bool should_run_node(struct dgraph_node *to, void *unused)
+{
+	should_run_ccanlint(NULL, container_of(to, struct ccanlint, node),
+			    unused);
+	return true;
+}
+
+static char *add_target(const char *arg, bool *targeting)
+{
+	struct ccanlint *c = find_test(arg);
+	if (!c)
+		return talloc_asprintf(NULL, "Unknown test %s", arg);
+
+	dgraph_traverse_to(&c->node, should_run_node, NULL);
+	*targeting = true;
+	return NULL;
+}
+
 int main(int argc, char *argv[])
 {
-	bool summary = false, pass = true;
-	unsigned int score = 0, total_score = 0;
+	bool summary = false, pass = true, targeting = false;
+	unsigned int i;
 	struct manifest *m;
-	struct ccanlint *i;
+	struct ccanlint *t;
 	const char *prefix = "";
-	char *dir = talloc_getcwd(NULL), *base_dir = dir, *target = NULL;
+	char *dir = talloc_getcwd(NULL), *base_dir = dir, *testlink;
 	
-	init_tests();
-
 	cmdline_exclude = btree_new(btree_strcmp);
 	info_exclude = btree_new(btree_strcmp);
 
-	opt_register_arg("--dir|-d", opt_set_charp, opt_show_charp, &dir,
-			 "use this directory");
+	opt_register_early_noarg("--verbose|-v", opt_inc_intval, &verbose,
+				 "verbose mode (up to -vvvv)");
 	opt_register_noarg("-n|--safe-mode", opt_set_bool, &safe_mode,
 			 "do not compile anything");
 	opt_register_noarg("-l|--list-tests", list_tests, NULL,
@@ -678,16 +674,13 @@ int main(int argc, char *argv[])
 			 " (can be used multiple times, or 'all')");
 	opt_register_noarg("--summary|-s", opt_set_bool, &summary,
 			   "simply give one line summary");
-	opt_register_noarg("--verbose|-v", opt_inc_intval, &verbose,
-			   "verbose mode (up to -vvvv)");
 	opt_register_arg("-x|--exclude <testname>", skip_test, NULL, NULL,
 			 "exclude <testname> (can be used multiple times)");
 	opt_register_arg("-t|--timeout <milleseconds>", opt_set_uintval,
 			 NULL, &timeout,
 			 "ignore (terminate) tests that are slower than this");
-	opt_register_arg("--target <testname>", opt_set_charp,
-			 NULL, &target,
-			 "only run one test (and its prerequisites)");
+	opt_register_arg("--target <testname>", add_target, NULL, &targeting,
+			 "run this test and prerequisites (can specify multiple times)");
 	opt_register_arg("--compiler <compiler>", opt_set_const_charp,
 			 NULL, &compiler, "set the compiler");
 	opt_register_arg("--cflags <flags>", opt_set_const_charp,
@@ -697,18 +690,15 @@ int main(int argc, char *argv[])
 			   " of CCAN modules.",
 			   "This usage message");
 
+	/* Do verbose before anything else... */
+	opt_early_parse(argc, argv, opt_log_stderr_exit);
+
 	/* 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));
 
-	opt_parse(&argc, argv, opt_log_stderr_exit);
+	init_tests();
 
-	if (dir[0] != '/')
-		dir = talloc_asprintf_append(NULL, "%s/%s", base_dir, dir);
-	while (strends(dir, "/"))
-		dir[strlen(dir)-1] = '\0';
-	if (dir != base_dir)
-		prefix = talloc_append_string(talloc_basename(NULL, dir), ": ");
 	if (verbose >= 3) {
 		compile_verbose = true;
 		print_test_depends();
@@ -716,38 +706,67 @@ int main(int argc, char *argv[])
 	if (verbose >= 4)
 		tools_verbose = true;
 
-	m = get_manifest(talloc_autofree_context(), dir);
-	read_config_header();
+	opt_parse(&argc, argv, opt_log_stderr_exit);
 
-	/* 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));
+	/* This links back to the module's test dir. */
+	testlink = talloc_asprintf(NULL, "%s/test", temp_dir(NULL));
 
-	if (target) {
-		struct ccanlint *test;
+	/* If no --target, run all tests. */
+	if (!targeting)
+		strmap_iterate(&tests, should_run_ccanlint, NULL);
 
-		test = find_test(target);
-		if (!test)
-			errx(1, "Unknown test to run '%s'", target);
-		skip_unrelated_tests(test);
+	/* Defaults to pwd. */
+	if (argc == 1) {
+		i = 1;
+		goto got_dir;
 	}
 
-	/* If you don't pass the compulsory tests, you get a score of 0. */
-	while ((i = get_next_test(&compulsory_tests)) != NULL) {
-		if (!run_test(i, summary, &score, &total_score, m)) {
-			printf("%sTotal score: 0/%u\n", prefix, total_score);
-			errx(1, "%s%s failed", prefix, i->name);
+	for (i = 1; i < argc; i++) {
+		unsigned int score, total_score;
+
+		dir = argv[i];
+
+		if (dir[0] != '/')
+			dir = talloc_asprintf_append(NULL, "%s/%s",
+						     base_dir, dir);
+		while (strends(dir, "/"))
+			dir[strlen(dir)-1] = '\0';
+
+	got_dir:
+		if (dir != base_dir)
+			prefix = talloc_append_string(talloc_basename(NULL,dir),
+						      ": ");
+
+		init_tests();
+
+		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);
+		if (symlink(talloc_asprintf(m, "%s/test", dir), testlink) != 0)
+			err(1, "Creating test symlink in %s", temp_dir(NULL));
+
+		score = total_score = 0;
+		while ((t = get_next_test()) != NULL) {
+			if (!run_test(t, summary, &score, &total_score, m,
+				      prefix)) {
+				pass = false;
+				if (t->compulsory) {
+					warnx("%s%s failed", prefix, t->name);
+					printf("%sTotal score: 0/%u\n",
+					       prefix, total_score);
+					goto next;
+				}
+			}
 		}
-	}
 
-	/* --target overrides known FAIL from _info */
-	if (m->info_file)
-		add_info_options(m->info_file, !target);
-
-	while ((i = get_next_test(&normal_tests)) != NULL)
-		pass &= run_test(i, summary, &score, &total_score, m);
-
-	printf("%sTotal score: %u/%u\n", prefix, score, total_score);
+		printf("%sTotal score: %u/%u\n", prefix, score, total_score);
+	next: ;
+	}
 	return pass ? 0 : 1;
 }