#include <string.h>
#include <ctype.h>
-struct ccanlint run_tests_vg;
+REGISTER_TEST(tests_pass_valgrind);
/* Note: we already test safe_mode in run_tests.c */
static const char *can_run_vg(struct manifest *m)
static char *get_leaks(const char *output, char **errs)
{
char *leaks = talloc_strdup(output, "");
- unsigned int i, num;
- char **lines = strsplit(output, output, "\n", &num);
+ unsigned int i;
+ char **lines = strsplit(output, output, "\n");
*errs = talloc_strdup(output, "");
- for (i = 0; i < num; i++) {
+ for (i = 0; i < talloc_array_length(lines) - 1; i++) {
if (strstr(lines[i], " lost ")) {
/* A leak... */
if (strstr(lines[i], " definitely lost ")) {
* humans, and you can't have both. */
run_command(score, timeleft, &cmdout,
"valgrind -q --error-exitcode=101"
+ " --child-silent-after-fork=yes"
" --leak-check=full"
" --log-fd=3 %s %s"
" 3> valgrind.log",
- run_tests_vg.options ?
- run_tests_vg.options : "",
+ tests_pass_valgrind.options ?
+ tests_pass_valgrind.options : "",
i->compiled);
output = grab_file(i, "valgrind.log", NULL);
if (!output || output[0] == '\0') {
err = NULL;
+ i->leak_info = NULL;
} else {
i->leak_info = get_leaks(output, &err);
}
if (err)
- score_file_error(score, i, 0, err);
+ score_file_error(score, i, 0, "%s", err);
else
score->score++;
}
foreach_ptr(list, &m->run_tests, &m->api_tests) {
list_for_each(list, i, list) {
if (i->leak_info) {
- score_file_error(score, i, 0, i->leak_info);
+ score_file_error(score, i, 0, "%s",
+ i->leak_info);
leaks = true;
}
}
}
+ /* FIXME: We don't fail for this, since many tests leak. */
+ score->pass = true;
if (!leaks) {
score->score = 1;
- score->pass = true;
}
}
first = list_top(&score->per_file_errors, struct file_error, list);
command = talloc_asprintf(m, "valgrind --db-attach=yes%s %s",
- run_tests_vg.options ?
- run_tests_vg.options : "",
+ tests_pass_valgrind.options ?
+ tests_pass_valgrind.options : "",
first->file->compiled);
if (system(command))
doesnt_matter();
.needs = "tests_pass"
};
-REGISTER_TEST(tests_pass_valgrind);
-
struct ccanlint tests_pass_valgrind_noleaks = {
.key = "tests_pass_valgrind_noleaks",
.name = "Module's run and api tests have no memory leaks",