#include <tools/ccanlint/ccanlint.h>
#include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/take/take.h>
#include <ccan/str/str.h>
#include <ccan/foreach/foreach.h>
+#include <ccan/tal/path/path.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "tests_pass.h"
bool do_valgrind = false;
+const char *valgrind_suppress = "";
static const char *can_run(struct manifest *m)
{
if (!is_excluded("tests_pass_valgrind")
&& run_command(m, &timeleft, &output,
- "valgrind -q true"))
+ "valgrind -q true")) {
+ const char *sfile;
+
do_valgrind = true;
+ /* Check for suppressions file for all of CCAN. */
+ sfile = path_join(m, ccan_dir, ".valgrind_suppressions");
+ if (path_is_file(sfile))
+ valgrind_suppress = tal_fmt(m, "--suppressions=%s",
+ sfile);
+ }
+
return NULL;
}
static const char *concat(struct score *score, char *bits[])
{
unsigned int i;
- char *ret = talloc_strdup(score, "");
+ char *ret = tal_strdup(score, "");
for (i = 0; bits[i]; i++) {
if (i)
- ret = talloc_append_string(ret, " ");
- ret = talloc_append_string(ret, bits[i]);
+ ret = tal_strcat(score, take(ret), " ");
+ ret = tal_strcat(score, take(ret), bits[i]);
}
return ret;
}
/* FIXME: Valgrind's output sucks. XML is
* unreadable by humans *and* doesn't support
* children reporting. */
- i->valgrind_log = talloc_asprintf(m,
+ i->valgrind_log = tal_fmt(m,
"%s.valgrind-log",
i->compiled[COMPILE_NORMAL]);
run_command_async(i, *timeleft,
"valgrind -q"
" --leak-check=full"
- " --log-fd=3 %s %s"
+ " --log-fd=3 %s %s %s"
" 3> %s",
- options,
+ valgrind_suppress, options,
i->compiled[COMPILE_NORMAL],
i->valgrind_log);
return;
if (!ask("Should I run the first failing test under the debugger?"))
return;
- command = talloc_asprintf(m, "gdb -ex 'break tap.c:139' -ex 'run' %s",
- first->file->compiled[COMPILE_NORMAL]);
- if (system(command))
+ command = tal_fmt(m, "gdb -ex 'break tap.c:139' -ex 'run' %s",
+ first->file->compiled[COMPILE_NORMAL]);
+ if (system(command)) {
doesnt_matter();
+ }
}
struct ccanlint tests_pass = {