From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 30 Aug 2016 12:28:13 +0000 (+0930)
Subject: ccanlint: depends_accurate: don't detect false dependency when including test files.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=c3a4f74f5ddedd7fed3f351498a6743d2a1d9ed1;ds=sidebyside

ccanlint: depends_accurate: don't detect false dependency when including test files.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/tools/ccanlint/tests/depends_accurate.c b/tools/ccanlint/tests/depends_accurate.c
index 9ade3cba..5549fc13 100644
--- a/tools/ccanlint/tests/depends_accurate.c
+++ b/tools/ccanlint/tests/depends_accurate.c
@@ -21,8 +21,13 @@ static bool has_dep(struct manifest *m, char **deps, bool *used,
 	unsigned int i;
 
 	/* We can include ourselves, of course. */
-	if (streq(depname + strlen("ccan/"), m->modname))
-		return true;
+	if (strstarts(depname + strlen("ccan/"), m->modname)) {
+		const char *p = depname + strlen("ccan/") + strlen(m->modname);
+		/* And our own tests! */
+		if (streq(p, "/test") || streq(p, ""))
+			return true;
+		/* But not any submodules; they need an explicit dep */
+	}
 
 	for (i = 0; deps[i]; i++) {
 		if (streq(deps[i], depname)) {