From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 5 Nov 2019 00:54:32 +0000 (+0000)
Subject: test: remove the hardcoded four-job valgrind test run
X-Git-Tag: 1.14.901~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdd798778acabc1a0a2eda329c45bb59eb5be170;p=platform%2Fupstream%2Flibinput.git

test: remove the hardcoded four-job valgrind test run

Make this dependent on the number of processes too.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/meson.build b/meson.build
index 3d2e891..84f67f5 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 2f7e7e4..0359855 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)