#include <tools/tools.h>
#include <ccan/talloc/talloc.h>
#include <ccan/str/str.h>
+#include <ccan/foreach/foreach.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
static const char *can_run_vg(struct manifest *m)
{
unsigned int timeleft = default_timeout_ms;
- char *output = run_command(m, &timeleft, "valgrind -q true");
+ char *output;
- if (output)
+ if (!run_command(m, &timeleft, &output,
+ "valgrind -q --error-exitcode=0 true"))
return talloc_asprintf(m, "No valgrind support: %s", output);
return NULL;
}
-struct run_tests_result {
- struct list_node list;
- struct ccan_file *file;
- const char *output;
-};
-
-static void *do_run_tests_vg(struct manifest *m, unsigned int *timeleft)
+/* FIXME: Run examples, too! */
+static void do_run_tests_vg(struct manifest *m,
+ bool keep,
+ unsigned int *timeleft,
+ struct score *score)
{
- struct list_head *list = talloc(m, struct list_head);
- struct run_tests_result *res;
struct ccan_file *i;
+ struct list_head *list;
char *cmdout;
- char *olddir;
-
- /* We run tests in the module directory, so any paths
- * referenced can all be module-local. */
- olddir = talloc_getcwd(m);
- if (!olddir)
- err(1, "Could not save cwd");
- if (chdir(m->dir) != 0)
- err(1, "Could not chdir to %s", m->dir);
-
- list_head_init(list);
-
- list_for_each(&m->run_tests, i, list) {
- run_tests_vg.total_score++;
- cmdout = run_command(m, timeleft,
- "valgrind -q %s", i->compiled);
- if (cmdout) {
- res = talloc(list, struct run_tests_result);
- res->file = i;
- res->output = talloc_steal(res, cmdout);
- list_add_tail(list, &res->list);
- }
- }
- list_for_each(&m->api_tests, i, list) {
- run_tests_vg.total_score++;
- cmdout = run_command(m, timeleft,
- "valgrind -q %s", i->compiled);
- if (cmdout) {
- res = talloc(list, struct run_tests_result);
- res->file = i;
- res->output = talloc_steal(res, cmdout);
- list_add_tail(list, &res->list);
+ score->total = 0;
+ foreach_ptr(list, &m->run_tests, &m->api_tests) {
+ list_for_each(list, i, list) {
+ score->total++;
+ if (run_command(score, timeleft, &cmdout,
+ "valgrind -q --error-exitcode=100 %s",
+ i->compiled)) {
+ score->score++;
+ } else {
+ score->error = "Running under valgrind";
+ score_file_error(score, i, 0, cmdout);
+ }
}
}
- if (list_empty(list)) {
- talloc_free(list);
- list = NULL;
- }
-
- if (chdir(olddir) != 0)
- err(1, "Could not chdir to %s", olddir);
-
- return list;
-}
-
-static unsigned int score_run_tests_vg(struct manifest *m, void *check_result)
-{
- struct list_head *list = check_result;
- struct run_tests_result *i;
- unsigned int score = run_tests_vg.total_score;
-
- list_for_each(list, i, list)
- score--;
- return score;
-}
-
-static const char *describe_run_tests_vg(struct manifest *m,
- void *check_result)
-{
- struct list_head *list = check_result;
- char *descrip = talloc_strdup(check_result, "Running tests under valgrind failed:\n");
- struct run_tests_result *i;
-
- list_for_each(list, i, list)
- descrip = talloc_asprintf_append(descrip, "Running %s:\n%s",
- i->file->name, i->output);
- return descrip;
+ if (score->score == score->total)
+ score->pass = true;
}
/* Gcc's warn_unused_result is fascist bullshit. */
#define doesnt_matter()
-static void run_under_debugger_vg(struct manifest *m, void *check_result)
+static void run_under_debugger_vg(struct manifest *m, struct score *score)
{
- struct list_head *list = check_result;
- struct run_tests_result *first;
+ struct file_error *first;
char *command;
if (!ask("Should I run the first failing test under the debugger?"))
return;
- first = list_top(list, struct run_tests_result, list);
+ first = list_top(&score->per_file_errors, struct file_error, list);
command = talloc_asprintf(m, "valgrind --db-attach=yes %s",
first->file->compiled);
if (system(command))
}
struct ccanlint run_tests_vg = {
- .key = "valgrind",
+ .key = "valgrind-tests",
.name = "Module's run and api tests succeed under valgrind",
- .score = score_run_tests_vg,
- .check = do_run_tests_vg,
- .describe = describe_run_tests_vg,
.can_run = can_run_vg,
+ .check = do_run_tests_vg,
.handle = run_under_debugger_vg
};