- struct ccan_file *i;
-
- *modobjs = talloc_strdup(m, "");
- list_for_each(&m->c_files, i, list) {
- char *err;
- char *fullfile = talloc_asprintf(m, "%s/%s", m->dir, i->name);
-
- i->cov_compiled = maybe_temp_file(m, "", keep, fullfile);
- if (!compile_object(m, fullfile, ccan_dir, "",
- i->cov_compiled, &err)) {
- score_file_error(score, i, 0, err);
- talloc_free(i->cov_compiled);
- i->cov_compiled = NULL;
- return false;
- }
- *modobjs = talloc_asprintf_append(*modobjs,
- " %s", i->cov_compiled);
- }
- return true;
-}
-
-/* FIXME: Merge this into one place. */
-static char *obj_list(const struct manifest *m, const char *modobjs)
-{
- char *list = talloc_strdup(m, "");
- struct ccan_file *i;
- struct manifest *subm;
-
- /* Objects from any other C files. */
- list_for_each(&m->other_test_c_files, i, list)
- list = talloc_asprintf_append(list, " %s", i->compiled);
-
- if (modobjs)
- list = talloc_append_string(list, modobjs);
-
- /* Other ccan modules (don't need coverage versions of those). */
- list_for_each(&m->deps, subm, list) {
- if (subm->compiled)
- list = talloc_asprintf_append(list, " %s",
- subm->compiled);
- }
-
- return list;
-}
-
-static char *lib_list(const struct manifest *m)
-{
- unsigned int i, num;
- char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled);
- char *ret = talloc_strdup(m, "");
-
- for (i = 0; i < num; i++)
- ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
- return ret;
-}
-
-static char *cov_compile(const void *ctx,
- struct manifest *m,
- struct ccan_file *file,
- const char *modobjs,
- bool keep)
-{
- char *output;
-
- file->cov_compiled = maybe_temp_file(ctx, "", keep, file->fullname);
- if (!compile_and_link(ctx, file->fullname, ccan_dir,
- obj_list(m, modobjs),
- COVERAGE_CFLAGS,
- lib_list(m), file->cov_compiled, &output)) {
- talloc_free(file->cov_compiled);
- file->cov_compiled = NULL;
- return output;
- }
- talloc_free(output);
- return NULL;
+ char *flags = talloc_asprintf(ctx, "%s %s", cflags, COVERAGE_CFLAGS);
+
+ file->compiled[COMPILE_COVERAGE] = temp_file(ctx, "", file->fullname);
+ compile_and_link_async(file, time_ms, file->fullname, ccan_dir,
+ test_obj_list(m, link_with_module,
+ COMPILE_NORMAL,
+ COMPILE_COVERAGE),
+ compiler, flags,
+ lib_list(m, COMPILE_NORMAL),
+ file->compiled[COMPILE_COVERAGE]);