X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Frun_tests_valgrind.c;h=caf8323c2cfa26cf53257d226f698e69ac6a9a6c;hb=1c005e1223d2f8f664ce4b3be6cd7eb4dd449844;hp=233a719dfb3eddfec896eeda3daa8ec48ed6320e;hpb=fb4c4c3ddc24772f71a64ec02d2c9ddaeb6e9f6b;p=ccan diff --git a/tools/ccanlint/tests/run_tests_valgrind.c b/tools/ccanlint/tests/run_tests_valgrind.c index 233a719d..caf8323c 100644 --- a/tools/ccanlint/tests/run_tests_valgrind.c +++ b/tools/ccanlint/tests/run_tests_valgrind.c @@ -18,7 +18,7 @@ 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 = run_command(m, &timeleft, "valgrind -q --error-exitcode=0 true"); if (output) return talloc_asprintf(m, "No valgrind support: %s", output); @@ -39,22 +39,15 @@ static void *do_run_tests_vg(struct manifest *m, struct run_tests_result *res; struct ccan_file *i; 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); + run_tests_vg.total_score = 0; list_for_each(&m->run_tests, i, list) { run_tests_vg.total_score++; cmdout = run_command(m, timeleft, - "valgrind -q %s", i->compiled); + "valgrind -q --error-exitcode=100 %s", + i->compiled); if (cmdout) { res = talloc(list, struct run_tests_result); res->file = i; @@ -66,7 +59,8 @@ static void *do_run_tests_vg(struct manifest *m, list_for_each(&m->api_tests, i, list) { run_tests_vg.total_score++; cmdout = run_command(m, timeleft, - "valgrind -q %s", i->compiled); + "valgrind -q --error-exitcode=100 %s", + i->compiled); if (cmdout) { res = talloc(list, struct run_tests_result); res->file = i; @@ -80,9 +74,6 @@ static void *do_run_tests_vg(struct manifest *m, list = NULL; } - if (chdir(olddir) != 0) - err(1, "Could not chdir to %s", olddir); - return list; } @@ -133,6 +124,7 @@ struct ccanlint run_tests_vg = { .key = "valgrind-tests", .name = "Module's run and api tests succeed under valgrind", .score = score_run_tests_vg, + .total_score = 1, .check = do_run_tests_vg, .describe = describe_run_tests_vg, .can_run = can_run_vg,