static char *obj_list(const struct manifest *m)
{
char *list = talloc_strdup(m, "");
- struct ccan_file *i;
+ struct manifest *i;
/* Other CCAN deps. */
- list_for_each(&m->dep_objs, i, list)
- list = talloc_asprintf_append(list, "%s ", i->name);
-
+ list_for_each(&m->deps, i, list) {
+ if (i->compiled)
+ list = talloc_asprintf_append(list, "%s ",
+ i->compiled);
+ }
return list;
}
return ret;
}
-static void *check_use_build(struct manifest *m)
+static void check_use_build(struct manifest *m,
+ bool keep,
+ unsigned int *timeleft, struct score *score)
{
char *contents;
- char *tmpfile, *err;
+ char *tmpfile, *cmdout;
+ char *basename = talloc_asprintf(m, "%s/example.c", m->dir);
int fd;
- tmpfile = temp_file(m, ".c");
+ tmpfile = maybe_temp_file(m, ".c", keep, basename);
fd = open(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0)
- return talloc_asprintf(m, "Creating temporary file: %s",
- strerror(errno));
+ err(1, "Creating temporary file %s", tmpfile);
contents = talloc_asprintf(tmpfile,
"#include <ccan/%s/%s.h>\n"
" return 0;\n"
"}\n",
m->basename, m->basename);
- if (write(fd, contents, strlen(contents)) != strlen(contents)) {
- close(fd);
- return "Failure writing to temporary file";
- }
+ if (write(fd, contents, strlen(contents)) != strlen(contents))
+ err(1, "Failure writing to temporary file %s", tmpfile);
close(fd);
- if (!compile_and_link(m, tmpfile, ccan_dir, obj_list(m), "",
- lib_list(m), &err))
- return err;
- return NULL;
-}
-
-static const char *describe_use_build(struct manifest *m, void *check_result)
-{
- return talloc_asprintf(check_result,
- "Linking against module:\n"
- "%s", (char *)check_result);
+ if (compile_and_link(score, tmpfile, ccan_dir, obj_list(m), "",
+ lib_list(m),
+ maybe_temp_file(m, "", keep, tmpfile),
+ &cmdout)) {
+ score->pass = true;
+ score->score = score->total;
+ } else {
+ score->error = cmdout;
+ }
}
struct ccanlint check_build = {
- .key = "check-link",
+ .key = "module_links",
.name = "Module can be linked against trivial program",
- .total_score = 1,
.check = check_use_build,
- .describe = describe_use_build,
.can_run = can_build,
+ .needs = "module_builds depends_build"
};
-REGISTER_TEST(check_build, &build, NULL);
+REGISTER_TEST(check_build);