#include <tools/ccanlint/ccanlint.h>
#include <tools/tools.h>
#include <ccan/str/str.h>
+#include <ccan/tal/path/path.h>
+#include <ccan/tal/grab_file/grab_file.h>
#include <ccan/foreach/foreach.h>
#include <sys/types.h>
#include <sys/stat.h>
apostrophe = strchr(filename, '\'');
*apostrophe = '\0';
if (lines_matter) {
- file = tal_grab_file(score, filename, NULL);
+ file = grab_file(score, filename);
if (!file) {
score->error = tal_fmt(score,
"Reading %s",
{
struct ccan_file *i;
char *cmdout, *outdir;
- char *covcmd;
+ char *covargs;
bool full_gcov = (verbose > 1);
struct list_head *list;
bool ran_some = false;
/* This tells gcov where we put those .gcno files. */
- outdir = tal_dirname(score,
- m->info_file->compiled[COMPILE_NORMAL]);
- covcmd = tal_fmt(m, "gcov %s -o %s",
- full_gcov ? "" : "-n",
- outdir);
+ outdir = path_dirname(score,
+ m->info_file->compiled[COMPILE_NORMAL]);
+ covargs = tal_fmt(m, "%s -o %s", full_gcov ? "" : "-n", outdir);
/* Run them all. */
foreach_ptr(list, &m->run_tests, &m->api_tests) {
list_for_each(list, i, list) {
if (run_command(score, timeleft, &cmdout,
"%s", i->compiled[COMPILE_COVERAGE])) {
- tal_append_fmt(&covcmd, " %s", i->fullname);
+ tal_append_fmt(&covargs, " %s", i->fullname);
} else {
score_file_error(score, i, 0,
"Running test with coverage"
}
/* Now run gcov: we want output even if it succeeds. */
- if (!run_command(score, timeleft, &cmdout, "%s", covcmd)) {
+ if (!run_gcov(score, timeleft, &cmdout, "%s", covargs)) {
score->error = tal_fmt(score, "Running gcov: %s", cmdout);
return;
}