From bdd798778acabc1a0a2eda329c45bb59eb5be170 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 5 Nov 2019 00:54:32 +0000 Subject: [PATCH] test: remove the hardcoded four-job valgrind test run Make this dependent on the number of processes too. Signed-off-by: Peter Hutterer --- meson.build | 1 - test/litest.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 3d2e8919..84f67f50 100644 --- a/meson.build +++ b/meson.build @@ -959,7 +959,6 @@ if get_option('tests') valgrind = find_program('valgrind', required : false) if valgrind.found() valgrind_env = environment() - valgrind_env.set('LITEST_JOBS', '4') valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions') add_test_setup('valgrind', exe_wrapper : [ valgrind, diff --git a/test/litest.c b/test/litest.c index 2f7e7e4d..03598553 100644 --- a/test/litest.c +++ b/test/litest.c @@ -4274,7 +4274,9 @@ main(int argc, char **argv) if (in_debugger || RUNNING_ON_VALGRIND) setenv("CK_FORK", "no", 0); - jobs = get_nprocs() * 2; + jobs = get_nprocs(); + if (!RUNNING_ON_VALGRIND) + jobs *= 2; mode = litest_parse_argv(argc, argv); if (mode == LITEST_MODE_ERROR)