diff options
| author | Raymond Hettinger <python@rcn.com> | 2011-03-23 12:53:32 -0700 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2011-03-23 12:53:32 -0700 |
| commit | 41da10e62cfa2fee9c651d0d613a6f6998bf6f2c (patch) | |
| tree | 50897c71d9ac469c30cb0d0e8fa8817e3623f567 /Lib/test/regrtest.py | |
| parent | 2ebea41d315bb42a6d6983137bf5fdb01d3f1a95 (diff) | |
| parent | 5839b9635cd582a5a2660605a48bddafab44aa06 (diff) | |
| download | cpython-git-41da10e62cfa2fee9c651d0d613a6f6998bf6f2c.tar.gz | |
Merge
Diffstat (limited to 'Lib/test/regrtest.py')
| -rwxr-xr-x | Lib/test/regrtest.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 1e72f800b9..a00f15aae4 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -374,6 +374,13 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, forever = True 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 elif o == '--header': header = True elif o == '--slaveargs': |