From 6c7bda911203da1528be9c41b618741f8279b37c Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Tue, 18 Sep 2018 14:32:27 +0200 Subject: [PATCH] fix TEST_JOBS=auto max jobs detection Change-Id: I63f747e92d239e878550392df24fb7aac2b5a3e3 Signed-off-by: Klement Sekera --- test/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_tests.py b/test/run_tests.py index 89c7797d5ba..a6fd64cf48a 100644 --- a/test/run_tests.py +++ b/test/run_tests.py @@ -614,7 +614,7 @@ if __name__ == '__main__': else: extra_shm = shm_free - min_req_shm shm_max_processes += extra_shm / shm_per_process - concurrent_tests = max(cpu_count(), shm_max_processes) + concurrent_tests = min(cpu_count(), shm_max_processes) print('Found enough resources to run tests with %s cores' % concurrent_tests) elif test_jobs.isdigit(): -- 2.16.6