X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fcheck_build.c;h=9175b91835f5bb2271f6e645d9040038030c8663;hp=21189645280d4d2b5d6da1c8eaa9ed01218120d1;hb=70539048ba95b1bc7ade71dad4ed99d2d34638cc;hpb=747a69435d9f83c0968d9689c4951bc0233ffc5e diff --git a/tools/ccanlint/compulsory_tests/check_build.c b/tools/ccanlint/compulsory_tests/check_build.c index 21189645..9175b918 100644 --- a/tools/ccanlint/compulsory_tests/check_build.c +++ b/tools/ccanlint/compulsory_tests/check_build.c @@ -27,9 +27,10 @@ static char *obj_list(const struct manifest *m) struct ccan_file *i; /* Other CCAN deps. */ - list_for_each(&m->dep_objs, i, list) - list = talloc_asprintf_append(list, "%s ", i->name); - + list_for_each(&m->dep_dirs, i, list) { + if (i->compiled) + list = talloc_asprintf_append(list, "%s ", i->compiled); + } return list; } @@ -44,18 +45,20 @@ static char *lib_list(const struct manifest *m) 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; + 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 \n" @@ -64,30 +67,23 @@ static void *check_use_build(struct manifest *m) " 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); + score->error = compile_and_link(m, tmpfile, ccan_dir, obj_list(m), "", + lib_list(m), + maybe_temp_file(m, "", keep, tmpfile)); + if (!score->error) { + score->pass = true; + score->score = score->total; + } } struct ccanlint check_build = { - .name = "Module can be used", - .total_score = 1, + .key = "check-link", + .name = "Module can be linked against trivial program", .check = check_use_build, - .describe = describe_use_build, .can_run = can_build, };