X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fcheck_depends_exist.c;h=28f581c5758e01b3aa335e3744757996d1f659a8;hp=2ac60a2a556c8db27b309216399e496d986ea718;hb=f952b88b36e3803370825fb43385f1a42aa24b64;hpb=5f44c8ca0eb66503db51e0df1b65ff173eb42f57

diff --git a/tools/ccanlint/compulsory_tests/check_depends_exist.c b/tools/ccanlint/compulsory_tests/check_depends_exist.c
index 2ac60a2a..28f581c5 100644
--- a/tools/ccanlint/compulsory_tests/check_depends_exist.c
+++ b/tools/ccanlint/compulsory_tests/check_depends_exist.c
@@ -20,7 +20,7 @@ static char *add_dep(char *sofar, struct manifest *m, const char *dep)
 	struct stat st;
 	struct ccan_file *f;
 
-	dir = talloc_asprintf(m, "../%s", dep);
+	dir = talloc_asprintf(m, "%s/%s", ccan_dir, dep);
 	if (stat(dir, &st) != 0) {
 		return talloc_asprintf_append(sofar,
 					      "ccan/%s: expected it in"
@@ -28,7 +28,7 @@ static char *add_dep(char *sofar, struct manifest *m, const char *dep)
 					      dep, dir);
 	}
 
-	f = new_ccan_file(m, dir);
+	f = new_ccan_file(m, "", dir);
 	list_add_tail(&m->dep_dirs, &f->list);
 	return sofar;
 }
@@ -38,19 +38,21 @@ static void *check_depends_exist(struct manifest *m)
 	unsigned int i;
 	char *report = NULL;
 	char **deps;
+	char *updir = talloc_strdup(m, m->dir);
+
+	*strrchr(updir, '/') = '\0';
 
 	if (safe_mode)
-		deps = get_safe_ccan_deps(m, "..", m->basename, true,
+		deps = get_safe_ccan_deps(m, m->dir, true,
 					  &m->info_file->compiled);
 	else
-		deps = get_deps(m, "..", m->basename, true,
-				&m->info_file->compiled);
+		deps = get_deps(m, m->dir, true, &m->info_file->compiled);
 
 	for (i = 0; deps[i]; i++) {
 		if (!strstarts(deps[i], "ccan/"))
 			continue;
 
-		report = add_dep(report, m, deps[i] + strlen("ccan/"));
+		report = add_dep(report, m, deps[i]);
 	}
 	return report;
 }
@@ -64,6 +66,7 @@ static const char *describe_depends_exist(struct manifest *m,
 }
 
 struct ccanlint depends_exist = {
+	.key = "depends-exist",
 	.name = "CCAN dependencies are present",
 	.total_score = 1,
 	.check = check_depends_exist,