diff options
| author | Nadeem Vawda <nadeem.vawda@gmail.com> | 2011-08-27 15:24:23 +0200 |
|---|---|---|
| committer | Nadeem Vawda <nadeem.vawda@gmail.com> | 2011-08-27 15:24:23 +0200 |
| commit | a89c32ccd9d9ce12a888f9f4b8a0dc1c644066ed (patch) | |
| tree | 81c6d13a78fde7a484e5ed6837ba454b19cd102a | |
| parent | 811afe9b0562512105dd145ac21394eda0509efa (diff) | |
| parent | c1fba3ea0c2e10d5dec77f71214ade5cce86c1bf (diff) | |
| download | cpython-git-a89c32ccd9d9ce12a888f9f4b8a0dc1c644066ed.tar.gz | |
Merge: Make regrtest complain when -M and -j are used together.
-j doesn't pass the memlimit on to child processes, so this doesn't work at
present, and even if it did, running multiple bigmem tests at once would
usually not be desirable (since you generally want to devote as much of the
available RAM as possible to each test).
| -rwxr-xr-x | Lib/test/regrtest.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index ca63496bf8..65438aff5a 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -468,6 +468,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, usage("-T and -j don't go together!") if use_mp and findleaks: usage("-l and -j don't go together!") + if use_mp and support.max_memuse: + usage("-M and -j don't go together!") if failfast and not (verbose or verbose3): usage("-G/--failfast needs either -v or -W") |