X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fccanlint%2Fccanlint.c;h=7747a4976e7cd1ea748191ff5246480806cb027b;hb=ec73dece4ef3bc4d9664aae6c2fa7c5cc26da7d3;hp=17f7a9c640c07f77208b30b2f3752ad4cd62e018;hpb=dc8042b42500f79f613b1197df6cdf739615a89f;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 17f7a9c6..7747a497 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -32,6 +32,7 @@
 #include <ccan/foreach/foreach.h>
 #include <ccan/cast/cast.h>
 #include <ccan/tlist/tlist.h>
+#include <ccan/tal/path/path.h>
 #include <ccan/strmap/strmap.h>
 
 struct ccanlint_map {
@@ -45,10 +46,6 @@ bool keep_results = false;
 static bool targeting = false;
 static unsigned int timeout;
 
-/* These are overridden at runtime if we can find config.h */
-const char *compiler = NULL;
-const char *cflags = NULL;
-
 const char *config_header;
 
 const char *ccan_dir;
@@ -92,10 +89,11 @@ static const char *dep_failed(struct manifest *m)
 	return "dependency couldn't run";
 }
 
-static bool cannot_run(struct dgraph_node *node, void *unused)
+static bool cannot_run(struct dgraph_node *node, void *all)
 {
 	struct ccanlint *c = container_of(node, struct ccanlint, node);
 	c->can_run = dep_failed;
+
 	return true;
 }
 
@@ -584,17 +582,32 @@ static bool add_to_all(const char *member, struct ccanlint *c,
 	return true;
 }
 
+static bool test_module(struct dgraph_node *all,
+			const char *dir, const char *prefix, bool summary)
+{
+	struct manifest *m = get_manifest(autofree(), dir);
+	char *testlink = path_join(NULL, temp_dir(), "test");
+
+	/* Create a symlink from temp dir back to src dir's
+	 * test directory. */
+	unlink(testlink);
+	if (symlink(path_join(m, dir, "test"), testlink) != 0)
+		err(1, "Creating test symlink in %s", temp_dir());
+
+	return run_tests(all, summary, m, prefix);
+}
+
 int main(int argc, char *argv[])
 {
 	bool summary = false, pass = true;
 	unsigned int i;
-	struct manifest *m;
 	const char *prefix = "";
-	char *dir = tal_getcwd(NULL), *base_dir = dir, *testlink;
-	struct dgraph_node all;
+	char *cwd = path_cwd(NULL), *dir;
+	struct ccanlint top;  /* cannot_run may try to set ->can_run */
+	const char *override_compiler = NULL, *override_cflags = NULL;
 	
 	/* Empty graph node to which we attach everything else. */
-	dgraph_init_node(&all);
+	dgraph_init_node(&top.node);
 
 	opt_register_early_noarg("--verbose|-v", opt_inc_intval, &verbose,
 				 "verbose mode (up to -vvvv)");
@@ -613,12 +626,13 @@ int main(int argc, char *argv[])
 	opt_register_arg("--timeout <milleseconds>", opt_set_uintval,
 			 NULL, &timeout,
 			 "ignore (terminate) tests that are slower than this");
-	opt_register_arg("-t|--target <testname>", opt_set_target, NULL, &all,
+	opt_register_arg("-t|--target <testname>", opt_set_target, NULL,
+			 &top.node,
 			 "only run one test (and its prerequisites)");
 	opt_register_arg("--compiler <compiler>", opt_set_const_charp,
-			 NULL, &compiler, "set the compiler");
+			 NULL, &override_compiler, "set the compiler");
 	opt_register_arg("--cflags <flags>", opt_set_const_charp,
-			 NULL, &cflags, "set the compiler flags");
+			 NULL, &override_cflags, "set the compiler flags");
 	opt_register_noarg("-?|-h|--help", opt_usage_and_exit,
 			   "\nA program for checking and guiding development"
 			   " of CCAN modules.",
@@ -643,53 +657,41 @@ int main(int argc, char *argv[])
 	opt_parse(&argc, argv, opt_log_stderr_exit);
 
 	if (!targeting)
-		strmap_iterate(&tests, add_to_all, &all);
-
-	/* This links back to the module's test dir. */
-	testlink = tal_fmt(NULL, "%s/test", temp_dir());
+		strmap_iterate(&tests, add_to_all, &top.node);
 
-	/* Defaults to pwd. */
-	if (argc == 1) {
-		i = 1;
-		goto got_dir;
-	}
-
-	for (i = 1; i < argc; i++) {
-		dir = argv[i];
-
-		if (dir[0] != '/')
-			dir = tal_fmt(NULL, "%s/%s", base_dir, dir);
-		while (strends(dir, "/"))
-			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);
-			config_header = read_config_header(ccan_dir,
-							   &compiler, &cflags,
-							   verbose > 1);
+	if (argc == 1)
+		dir = cwd;
+	else
+		dir = path_join(NULL, cwd, argv[1]);
+
+	ccan_dir = find_ccan_dir(dir);
+	if (!ccan_dir)
+		errx(1, "Cannot find ccan/ base directory in %s", dir);
+	config_header = read_config_header(ccan_dir, verbose > 1);
+
+	/* We do this after read_config_header has set compiler & cflags */
+	if (override_cflags)
+		cflags = override_cflags;
+	if (override_compiler)
+		compiler = override_compiler;
+
+	if (argc == 1)
+		pass = test_module(&top.node, cwd, "", summary);
+	else {
+		for (i = 1; i < argc; i++) {
+			dir = path_canon(NULL,
+					 take(path_join(NULL, cwd, argv[i])));
+			if (!dir)
+				err(1, "Cannot get canonical name of '%s'",
+				    argv[i]);
+
+			prefix = path_join(NULL, ccan_dir, "ccan");
+			prefix = path_rel(NULL, take(prefix), dir);
+			prefix = tal_strcat(NULL, take(prefix), ": ");
+
+			pass &= test_module(&top.node, dir, prefix, summary);
+			reset_tests(&top.node);
 		}
-
-		if (dir != base_dir)
-			prefix = tal_strcat(NULL, take(tal_basename(NULL,dir)),
-					    ": ");
-
-		m = get_manifest(autofree(), dir);
-
-		/* Create a symlink from temp dir back to src dir's
-		 * test directory. */
-		unlink(testlink);
-		if (symlink(tal_fmt(m, "%s/test", dir), testlink) != 0)
-			err(1, "Creating test symlink in %s", temp_dir());
-
-		if (!run_tests(&all, summary, m, prefix))
-			pass = false;
-
-		reset_tests(&all);
 	}
 	return pass ? 0 : 1;
 }