X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fcheck_depends_built.c;h=04ef54eb2c79a0060d5b0a43982653b4c671004a;hp=d902a98525c30c7641f6d26ad33be165fbabee25;hb=bbd7380019f3ea4629d170af24b902bf734c83ea;hpb=747a69435d9f83c0968d9689c4951bc0233ffc5e diff --git a/tools/ccanlint/compulsory_tests/check_depends_built.c b/tools/ccanlint/compulsory_tests/check_depends_built.c index d902a985..04ef54eb 100644 --- a/tools/ccanlint/compulsory_tests/check_depends_built.c +++ b/tools/ccanlint/compulsory_tests/check_depends_built.c @@ -35,28 +35,25 @@ static bool expect_obj_file(const char *dir) return has_c_files; } -static void *check_depends_built(struct manifest *m) +static void *check_depends_built(struct manifest *m, + bool keep, + unsigned int *timeleft) { struct ccan_file *i; struct stat st; char *report = NULL; list_for_each(&m->dep_dirs, i, list) { - char *objfile; - if (!expect_obj_file(i->fullname)) continue; - objfile = talloc_asprintf(m, "%s.o", i->fullname); - if (stat(objfile, &st) != 0) { + i->compiled = talloc_asprintf(i, "%s.o", i->fullname); + if (stat(i->compiled, &st) != 0) { report = talloc_asprintf_append(report, "object file %s\n", - objfile); - } else { - struct ccan_file *f = new_ccan_file(m, "", objfile); - list_add_tail(&m->dep_objs, &f->list); - } - + i->compiled); + i->compiled = NULL; + } } /* We may need libtap for testing, unless we're "tap" */ @@ -83,7 +80,8 @@ static const char *describe_depends_built(struct manifest *m, } struct ccanlint depends_built = { - .name = "CCAN dependencies are built", + .key = "depends-built", + .name = "Module's CCAN dependencies are already built", .total_score = 1, .check = check_depends_built, .describe = describe_depends_built,