#include <ccan/foreach/foreach.h>
#include <ccan/grab_file/grab_file.h>
#include <ccan/str_talloc/str_talloc.h>
+#include "tests_pass.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h>
REGISTER_TEST(tests_pass_valgrind);
+REGISTER_TEST(tests_pass_valgrind_noleaks);
/* Note: we already test safe_mode in run_tests.c */
static const char *can_run_vg(struct manifest *m)
{
- unsigned int timeleft = default_timeout_ms;
- char *output;
-
- if (!run_command(m, &timeleft, &output,
- "valgrind -q --error-exitcode=0 true"))
- return talloc_asprintf(m, "No valgrind support: %s", output);
+ if (!do_valgrind)
+ return talloc_asprintf(m, "No valgrind support");
return NULL;
}
return line[strspn(line, "=0123456789 ")] == '\0';
}
-static char *get_leaks(const char *output, char **errs)
+/* Removes matching lines from lines array, returns them. FIXME: Hacky. */
+static char **extract_matching(const char *prefix, char *lines[])
{
- char *leaks = talloc_strdup(output, "");
+ unsigned int i, num_ret = 0;
+ char **ret = talloc_array(lines, char *, talloc_array_length(lines));
+
+ for (i = 0; i < talloc_array_length(lines) - 1; i++) {
+ if (strstarts(lines[i], prefix)) {
+ ret[num_ret++] = talloc_steal(ret, lines[i]);
+ lines[i] = (char *)"";
+ }
+ }
+ ret[num_ret++] = NULL;
+
+ /* Make sure length is correct! */
+ return talloc_realloc(NULL, ret, char *, num_ret);
+}
+
+static char *get_leaks(char *lines[], char **errs)
+{
+ char *leaks = talloc_strdup(lines, "");
unsigned int i;
- char **lines = strsplit(output, output, "\n");
- *errs = talloc_strdup(output, "");
for (i = 0; i < talloc_array_length(lines) - 1; i++) {
if (strstr(lines[i], " lost ")) {
/* A leak... */
}
}
}
+ return leaks;
+}
+
+/* Returns leaks, and sets errs[] */
+static char *analyze_output(const char *output, char **errs)
+{
+ char *leaks = talloc_strdup(output, "");
+ unsigned int i;
+ char **lines = strsplit(output, output, "\n");
+
+ *errs = talloc_strdup(output, "");
+ for (i = 0; i < talloc_array_length(lines) - 1; i++) {
+ unsigned int preflen = strspn(lines[i], "=0123456789");
+ char *prefix, **sublines;
+
+ /* Ignore erased lines, or weird stuff. */
+ if (preflen == 0)
+ continue;
+
+ prefix = talloc_strndup(output, lines[i], preflen);
+ sublines = extract_matching(prefix, lines);
+
+ leaks = talloc_append_string(leaks, get_leaks(sublines, errs));
+ }
+
if (!leaks[0]) {
talloc_free(leaks);
leaks = NULL;
return leaks;
}
+static const char *concat(struct score *score, char *bits[])
+{
+ unsigned int i;
+ char *ret = talloc_strdup(score, "");
+
+ for (i = 0; bits[i]; i++) {
+ if (i)
+ ret = talloc_append_string(ret, " ");
+ ret = talloc_append_string(ret, bits[i]);
+ }
+ return ret;
+}
+
/* FIXME: Run examples, too! */
static void do_run_tests_vg(struct manifest *m,
- bool keep,
+ bool keep,
unsigned int *timeleft,
struct score *score)
{
struct ccan_file *i;
struct list_head *list;
- char *cmdout;
/* This is slow, so we run once but grab leak info. */
score->total = 0;
+ score->pass = true;
foreach_ptr(list, &m->run_tests, &m->api_tests) {
list_for_each(list, i, list) {
- char *output, *err;
+ char *err, *output;
+ const char *options;
+
score->total++;
- /* FIXME: Valgrind's output sucks. XML is unreadable by
- * 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",
- tests_pass_valgrind.options ?
- tests_pass_valgrind.options : "",
- i->compiled);
- output = grab_file(i, "valgrind.log", NULL);
+ options = concat(score,
+ per_file_options(&tests_pass_valgrind,
+ i));
+ if (streq(options, "FAIL"))
+ continue;
+
+ if (keep)
+ talloc_set_destructor(i->valgrind_log, NULL);
+
+ output = grab_file(i, i->valgrind_log, NULL);
+ /* No valgrind errors? */
if (!output || output[0] == '\0') {
err = NULL;
i->leak_info = NULL;
} else {
- i->leak_info = get_leaks(output, &err);
+ i->leak_info = analyze_output(output, &err);
}
- if (err)
+ if (err) {
score_file_error(score, i, 0, "%s", err);
- else
+ score->pass = false;
+ } else
score->score++;
}
}
-
- if (score->score == score->total)
- score->pass = true;
}
static void do_leakcheck_vg(struct manifest *m,
{
struct ccan_file *i;
struct list_head *list;
+ char **options;
bool leaks = false;
foreach_ptr(list, &m->run_tests, &m->api_tests) {
list_for_each(list, i, list) {
+ options = per_file_options(&tests_pass_valgrind_noleaks,
+ i);
+ if (options[0]) {
+ if (streq(options[0], "FAIL")) {
+ leaks = true;
+ continue;
+ }
+ errx(1, "Unknown leakcheck options '%s'",
+ options[0]);
+ }
+
if (i->leak_info) {
score_file_error(score, i, 0, "%s",
i->leak_info);
struct file_error *first;
char *command;
+ /* Don't ask anything if they suppressed tests. */
+ if (score->pass)
+ return;
+
if (!ask("Should I run the first failing test under the debugger?"))
return;
first = list_top(&score->per_file_errors, struct file_error, list);
- command = talloc_asprintf(m, "valgrind --db-attach=yes%s %s",
- tests_pass_valgrind.options ?
- tests_pass_valgrind.options : "",
+ command = talloc_asprintf(m, "valgrind --leak-check=full --db-attach=yes%s %s",
+ concat(score,
+ per_file_options(&tests_pass_valgrind,
+ first->file)),
first->file->compiled);
if (system(command))
doesnt_matter();
.key = "tests_pass_valgrind_noleaks",
.name = "Module's run and api tests have no memory leaks",
.check = do_leakcheck_vg,
+ .takes_options = true,
.needs = "tests_pass_valgrind"
};
-REGISTER_TEST(tests_pass_valgrind_noleaks);
projects / ccan / blobdiff