X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=158195cbdef04adf4c6ca1323ccc68c3862b1f1b;hb=daf9ee7d8e2b683ff05283beb1843611ad8c9e8a;hp=1a847deb4c7e326203ba33ca2b5189a58c34bece;hpb=0248fa2c84bdf4b5117d2672a68d89505aacae8f;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 1a847deb..158195cb 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -43,6 +43,8 @@ int verbose = 0;
 static struct ccanlint_map tests;
 bool safe_mode = false;
 bool keep_results = false;
+bool non_ccan_deps = false;
+bool build_failed = false;
 static bool targeting = false;
 static unsigned int timeout;
 
@@ -89,10 +91,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;
 }
 
@@ -555,10 +558,12 @@ static char *opt_set_target(const char *arg, struct dgraph_node *all)
 
 static bool run_tests(struct dgraph_node *all,
 		      bool summary,
+		      bool deps_fail_ignore,
 		      struct manifest *m,
 		      const char *prefix)
 {
 	struct run_info run;
+	const char *comment = "";
 
 	run.quiet = summary;
 	run.m = m;
@@ -566,9 +571,18 @@ static bool run_tests(struct dgraph_node *all,
 	run.score = run.total = 0;
 	run.pass = true;
 
+	non_ccan_deps = build_failed = false;
+
 	dgraph_traverse_to(all, run_test, &run);
 
-	printf("%sTotal score: %u/%u\n", prefix, run.score, run.total);
+	/* We can completely fail if we're missing external stuff: ignore */
+	if (deps_fail_ignore && non_ccan_deps && build_failed) {
+		comment = " (missing non-ccan dependencies?)";
+		run.pass = true;
+	}
+	printf("%sTotal score: %u/%u%s\n",
+	       prefix, run.score, run.total, comment);
+
 	return run.pass;
 }
 
@@ -582,7 +596,8 @@ static bool add_to_all(const char *member, struct ccanlint *c,
 }
 
 static bool test_module(struct dgraph_node *all,
-			const char *dir, const char *prefix, bool summary)
+			const char *dir, const char *prefix, bool summary,
+			bool deps_fail_ignore)
 {
 	struct manifest *m = get_manifest(autofree(), dir);
 	char *testlink = path_join(NULL, temp_dir(), "test");
@@ -593,20 +608,20 @@ static bool test_module(struct dgraph_node *all,
 	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);
+	return run_tests(all, summary, deps_fail_ignore, m, prefix);
 }
 
 int main(int argc, char *argv[])
 {
-	bool summary = false, pass = true;
+	bool summary = false, pass = true, deps_fail_ignore = false;
 	unsigned int i;
 	const char *prefix = "";
 	char *cwd = path_cwd(NULL), *dir;
-	struct dgraph_node all;
+	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)");
@@ -625,12 +640,16 @@ 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, &override_compiler, "set the compiler");
 	opt_register_arg("--cflags <flags>", opt_set_const_charp,
 			 NULL, &override_cflags, "set the compiler flags");
+	opt_register_noarg("--deps-fail-ignore", opt_set_bool,
+			   &deps_fail_ignore,
+			   "don't fail if external dependencies are missing");
 	opt_register_noarg("-?|-h|--help", opt_usage_and_exit,
 			   "\nA program for checking and guiding development"
 			   " of CCAN modules.",
@@ -655,12 +674,12 @@ int main(int argc, char *argv[])
 	opt_parse(&argc, argv, opt_log_stderr_exit);
 
 	if (!targeting)
-		strmap_iterate(&tests, add_to_all, &all);
+		strmap_iterate(&tests, add_to_all, &top.node);
 
 	if (argc == 1)
 		dir = cwd;
 	else
-		dir = path_join(NULL, cwd, argv[1]);
+		dir = path_simplify(NULL, take(path_join(NULL, cwd, argv[1])));
 
 	ccan_dir = find_ccan_dir(dir);
 	if (!ccan_dir)
@@ -674,18 +693,23 @@ int main(int argc, char *argv[])
 		compiler = override_compiler;
 
 	if (argc == 1)
-		pass = test_module(&all, cwd, "", summary);
+		pass = test_module(&top.node, cwd, "",
+				   summary, deps_fail_ignore);
 	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(&all, dir, prefix, summary);
-			reset_tests(&all);
+			pass &= test_module(&top.node, dir, prefix, summary,
+					    deps_fail_ignore);
+			reset_tests(&top.node);
 		}
 	}
 	return pass ? 0 : 1;