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

diff --git a/tools/ccanlint/compulsory_tests/check_depends_exist.c b/tools/ccanlint/compulsory_tests/check_depends_exist.c
index 2ac60a2a..e2437083 100644
--- a/tools/ccanlint/compulsory_tests/check_depends_exist.c
+++ b/tools/ccanlint/compulsory_tests/check_depends_exist.c
@@ -14,60 +14,51 @@
 #include <string.h>
 #include <ctype.h>
 
-static char *add_dep(char *sofar, struct manifest *m, const char *dep)
+static void add_dep(struct manifest *m, const char *dep, struct score *score)
 {
-	char *dir;
 	struct stat st;
 	struct ccan_file *f;
 
-	dir = talloc_asprintf(m, "../%s", dep);
-	if (stat(dir, &st) != 0) {
-		return talloc_asprintf_append(sofar,
-					      "ccan/%s: expected it in"
-					      " directory %s\n",
-					      dep, dir);
-	}
-
-	f = new_ccan_file(m, dir);
-	list_add_tail(&m->dep_dirs, &f->list);
-	return sofar;
+	f = new_ccan_file(m, ccan_dir, talloc_strdup(m, dep));
+	if (stat(f->fullname, &st) != 0) {
+		score->error = "Depends don't exist";
+		score_file_error(score, f, 0, "could not stat");
+	} else
+		list_add_tail(&m->dep_dirs, &f->list);
 }
 
-static void *check_depends_exist(struct manifest *m)
+static void check_depends_exist(struct manifest *m,
+				bool keep,
+				unsigned int *timeleft, struct score *score)
 {
 	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/"));
+		add_dep(m, deps[i], score);
+	}
+	if (!score->error) {
+		score->pass = true;
+		score->score = score->total;
 	}
-	return report;
-}
-
-static const char *describe_depends_exist(struct manifest *m,
-					  void *check_result)
-{
-	return talloc_asprintf(check_result,
-			       "The following dependencies are are expected:\n"
-			       "%s", (char *)check_result);
 }
 
 struct ccanlint depends_exist = {
-	.name = "CCAN dependencies are present",
-	.total_score = 1,
+	.key = "depends-exist",
+	.name = "Module's CCAN dependencies are present",
 	.check = check_depends_exist,
-	.describe = describe_depends_exist,
 };
 
 REGISTER_TEST(depends_exist, NULL);