X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fbuild.c;h=ec9e6de173aa6a8f040981f73dd051d1bbb7cf23;hb=304652023042670b3173de0ad5dc0eb7c836618c;hp=1b3d878928b53ca738fba2c13b2f2f394a508d19;hpb=5f44c8ca0eb66503db51e0df1b65ff173eb42f57;p=ccan-lca-2011.git diff --git a/tools/ccanlint/compulsory_tests/build.c b/tools/ccanlint/compulsory_tests/build.c index 1b3d878..ec9e6de 100644 --- a/tools/ccanlint/compulsory_tests/build.c +++ b/tools/ccanlint/compulsory_tests/build.c @@ -33,7 +33,7 @@ static char *obj_list(const struct manifest *m) return list; } -static void *do_build(struct manifest *m) +static void *do_build(struct manifest *m, unsigned int *timeleft) { char *filename, *err; @@ -44,9 +44,9 @@ static void *do_build(struct manifest *m) } filename = link_objects(m, obj_list(m), &err); if (filename) { - char *realname = talloc_asprintf(m, "../%s.o", m->basename); + char *realname = talloc_asprintf(m, "%s.o", m->dir); /* We leave this object file around, all built. */ - if (rename(filename, realname) != 0) + if (!move_file(filename, realname)) return talloc_asprintf(m, "Failed to rename %s to %s", filename, realname); return NULL; @@ -62,7 +62,8 @@ static const char *describe_build(struct manifest *m, void *check_result) } struct ccanlint build = { - .name = "Module can be built", + .key = "build", + .name = "Module can be built from object files", .total_score = 1, .check = do_build, .describe = describe_build,