diff options
author | Klement Sekera <ksekera@cisco.com> | 2018-09-18 14:32:27 +0200 |
---|---|---|
committer | Damjan Marion <dmarion@me.com> | 2018-09-18 19:37:47 +0000 |
commit | 6c7bda911203da1528be9c41b618741f8279b37c (patch) | |
tree | 2985727bcde9ab07db56ce8e7c56e0f84f208819 /test/run_tests.py | |
parent | c15d148f0f636cb0dabe55a90ddae95f406073c1 (diff) |
fix TEST_JOBS=auto max jobs detection
Change-Id: I63f747e92d239e878550392df24fb7aac2b5a3e3
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'test/run_tests.py')
-rw-r--r-- | test/run_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
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(): |