diff options
| author | Charles-François Natali <cf.natali@gmail.com> | 2013-06-28 17:25:45 (GMT) |
|---|---|---|
| committer | Charles-François Natali <cf.natali@gmail.com> | 2013-06-28 17:25:45 (GMT) |
| commit | 37cfb0a920bd01ee81ce7bebebfe510d01d751d6 (patch) | |
| tree | fdbb1f0eee3f4f5addd815279af456aa686dccf5 /Lib/test/regrtest.py | |
| parent | c723da361a8d5129ec9bd336e6327a65b4e92148 (diff) | |
| download | cpython-37cfb0a920bd01ee81ce7bebebfe510d01d751d6.zip cpython-37cfb0a920bd01ee81ce7bebebfe510d01d751d6.tar.gz cpython-37cfb0a920bd01ee81ce7bebebfe510d01d751d6.tar.bz2 | |
Issue #17914: Use os.cpu_count() instead of multiprocessing.cpu_count() where
applicable.
Diffstat (limited to 'Lib/test/regrtest.py')
| -rwxr-xr-x | Lib/test/regrtest.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index e6eef16..bd816dd 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -508,12 +508,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, elif o in ('-j', '--multiprocess'): use_mp = int(a) if use_mp <= 0: - try: - import multiprocessing - # Use all cores + extras for tests that like to sleep - use_mp = 2 + multiprocessing.cpu_count() - except (ImportError, NotImplementedError): - use_mp = 3 + # Use all cores + extras for tests that like to sleep + use_mp = 2 + (os.cpu_count() or 1) if use_mp == 1: use_mp = None elif o == '--header': |