X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fbuild.c;h=a8f7bcb6aac6303344837c59eab1648f1e84fea2;hp=1b3d878928b53ca738fba2c13b2f2f394a508d19;hb=fb4c4c3ddc24772f71a64ec02d2c9ddaeb6e9f6b;hpb=5f44c8ca0eb66503db51e0df1b65ff173eb42f57 diff --git a/tools/ccanlint/compulsory_tests/build.c b/tools/ccanlint/compulsory_tests/build.c index 1b3d8789..a8f7bcb6 100644 --- a/tools/ccanlint/compulsory_tests/build.c +++ b/tools/ccanlint/compulsory_tests/build.c @@ -33,7 +33,9 @@ static char *obj_list(const struct manifest *m) return list; } -static void *do_build(struct manifest *m) +static void *do_build(struct manifest *m, + bool keep, + unsigned int *timeleft) { char *filename, *err; @@ -43,10 +45,10 @@ static void *do_build(struct manifest *m) return NULL; } filename = link_objects(m, obj_list(m), &err); - if (filename) { - char *realname = talloc_asprintf(m, "../%s.o", m->basename); + if (filename && keep) { + 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 +64,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,