#include <string.h>
#include <ctype.h>
+struct ccanlint run_tests_vg;
+
/* Note: we already test safe_mode in run_tests.c */
static const char *can_run_vg(struct manifest *m)
{
score->total++;
/* FIXME: Valgrind's output sucks. XML is unreadable by
* humans, and you can't have both. */
- if (run_command(score, timeleft, &cmdout,
- "valgrind -q --leak-check=full"
- " --log-fd=3 %s %s"
- " 3> valgrind.log",
- run_tests_vg.options ?
- run_tests_vg.options : "",
- i->compiled)) {
- output = grab_file(i, "valgrind.log", NULL);
- if (!output || output[0] == '\0') {
- err = NULL;
- } else {
- i->leak_info = get_leaks(output, &err);
- }
- if (err) {
- score_file_error(score, i, 0, err);
- } else
- score->score++;
+ run_command(score, timeleft, &cmdout,
+ "valgrind -q --error-exitcode=101"
+ " --leak-check=full"
+ " --log-fd=3 %s %s"
+ " 3> valgrind.log",
+ run_tests_vg.options ?
+ run_tests_vg.options : "",
+ i->compiled);
+ output = grab_file(i, "valgrind.log", NULL);
+ if (!output || output[0] == '\0') {
+ err = NULL;
} else {
- score_file_error(score, i, 0, cmdout);
+ i->leak_info = get_leaks(output, &err);
}
+ if (err)
+ score_file_error(score, i, 0, err);
+ else
+ score->score++;
}
}
}
struct ccanlint run_tests_vg = {
- .key = "valgrind-tests",
+ .key = "tests_pass_valgrind",
.name = "Module's run and api tests succeed under valgrind",
.can_run = can_run_vg,
.check = do_run_tests_vg,
.handle = run_under_debugger_vg,
- .takes_options = true
+ .takes_options = true,
+ .needs = "tests_pass"
};
-REGISTER_TEST(run_tests_vg, &run_tests, NULL);
+REGISTER_TEST(run_tests_vg);
struct ccanlint run_tests_vg_leak = {
- .key = "valgrind-leaks",
+ .key = "tests_pass_valgrind_noleaks",
.name = "Module's run and api tests leak memory",
.check = do_leakcheck_vg,
+ .needs = "tests_pass_valgrind"
};
-REGISTER_TEST(run_tests_vg_leak, &run_tests_vg, NULL);
+REGISTER_TEST(run_tests_vg_leak);