X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_exist.c;h=088b1e0cd6472a702bd974c1051b7770eb1b0597;hp=d869cbb7f38cb53a539359e21f8d5f212cfaef07;hb=2512fecb742a1cfd0ce31d81c98bba0a97f3cbe2;hpb=1842f55199e6a5da273ca21b6fbe8afa6ecdfe11

diff --git a/tools/ccanlint/tests/depends_exist.c b/tools/ccanlint/tests/depends_exist.c
index d869cbb7..088b1e0c 100644
--- a/tools/ccanlint/tests/depends_exist.c
+++ b/tools/ccanlint/tests/depends_exist.c
@@ -1,7 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/tal/path/path.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -14,22 +14,33 @@
 #include <string.h>
 #include <ctype.h>
 
-static bool add_dep(struct manifest *m, const char *dep, struct score *score)
+static bool have_dep(struct manifest *m, const char *dep)
+{
+	struct manifest *i;
+
+	list_for_each(&m->deps, i, list)
+		if (streq(i->modname, dep + strlen("ccan/")))
+			return true;
+
+	return false;
+}
+
+static bool add_dep(struct manifest *m,
+		    struct list_head *deplist,
+		    const char *dep, struct score *score)
 {
 	struct stat st;
 	struct manifest *subm;
-	char *dir = talloc_asprintf(m, "%s/%s", ccan_dir, dep);
+	char *dir = path_join(m, ccan_dir, dep);
 
 	/* FIXME: get_manifest has a tendency to exit. */
 	if (stat(dir, &st) != 0) {
-		score->error
-			= talloc_asprintf(m,
-					  "Could not stat dependency %s: %s",
-					  dir, strerror(errno));
+		score->error = tal_fmt(m, "Could not stat dependency %s: %s",
+				       dir, strerror(errno));
 		return false;
 	}
 	subm = get_manifest(m, dir);
-	list_add_tail(&m->deps, &subm->list);
+	list_add_tail(deplist, &subm->list);
 	return true;
 }
 
@@ -39,14 +50,42 @@ static void check_depends_exist(struct manifest *m,
 {
 	unsigned int i;
 	char **deps;
-	char *updir = talloc_strdup(m, m->dir);
-	bool needs_tap;
 
-	if (strrchr(updir, '/'))
-		*strrchr(updir, '/') = '\0';
+	if (safe_mode)
+		deps = get_safe_ccan_deps(m, m->dir, "depends", true);
+	else
+		deps = get_deps(m, m->dir, "depends", true,
+				get_or_compile_info);
+
+	if (!deps) {
+		score->error = tal_fmt(m, "Could not extract dependencies");
+		return;
+	}
+
+	for (i = 0; deps[i]; i++) {
+		if (!strstarts(deps[i], "ccan/")) {
+			non_ccan_deps = true;
+			continue;
+		}
+
+		if (!add_dep(m, &m->deps, deps[i], score))
+			return;
+	}
+
+	score->pass = true;
+	score->score = score->total;
+}
+
+static void check_test_depends_exist(struct manifest *m,
+				     unsigned int *timeleft,
+				     struct score *score)
+{
+	unsigned int i;
+	char **deps;
+	bool needs_tap;
 
 	/* We may need libtap for testing, unless we're "tap" */
-	if (streq(m->basename, "tap")) {
+	if (streq(m->modname, "tap")) {
 		needs_tap = false;
 	} else if (list_empty(&m->run_tests) && list_empty(&m->api_tests)) {
 		needs_tap = false;
@@ -55,16 +94,21 @@ static void check_depends_exist(struct manifest *m,
 	}
 
 	if (safe_mode)
-		deps = get_safe_ccan_deps(m, m->dir, "depends", true);
+		deps = get_safe_ccan_deps(m, m->dir, "testdepends", true);
 	else
-		deps = get_deps(m, m->dir, "depends", true,
+		deps = get_deps(m, m->dir, "testdepends", true,
 				get_or_compile_info);
 
 	for (i = 0; deps[i]; i++) {
 		if (!strstarts(deps[i], "ccan/"))
 			continue;
 
-		if (!add_dep(m, deps[i], score))
+		/* Don't add dependency twice: we can only be on one list!
+		 * Also, it's possible to have circular test depends, so drop
+		 * self-refs. */
+		if (!have_dep(m, deps[i])
+		    && !streq(deps[i] + strlen("ccan/"), m->modname)
+		    && !add_dep(m, &m->test_deps, deps[i], score))
 			return;
 
 		if (streq(deps[i], "ccan/tap")) {
@@ -72,7 +116,8 @@ static void check_depends_exist(struct manifest *m,
 		}
 	}
 
-	if (needs_tap && !add_dep(m, "ccan/tap", score)) {
+	if (needs_tap && !have_dep(m, "ccan/tap")
+	    && !add_dep(m, &m->test_deps, "ccan/tap", score)) {
 		return;
 	}
 
@@ -85,7 +130,17 @@ struct ccanlint depends_exist = {
 	.name = "Module's CCAN dependencies can be found",
 	.compulsory = true,
 	.check = check_depends_exist,
-	.needs = "info_exists"
+	.needs = "info_compiles"
 };
 
 REGISTER_TEST(depends_exist);
+
+struct ccanlint test_depends_exist = {
+	.key = "test_depends_exist",
+	.name = "Module's CCAN test dependencies can be found",
+	.compulsory = false,
+	.check = check_test_depends_exist,
+	.needs = "depends_exist"
+};
+
+REGISTER_TEST(test_depends_exist);