summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2011-08-27 13:22:05 (GMT)
committerNadeem Vawda <nadeem.vawda@gmail.com>2011-08-27 13:22:05 (GMT)
commitc1fba3ea0c2e10d5dec77f71214ade5cce86c1bf (patch)
tree3ab7fd487d28a37916c34b3d12a5e616916e69a8
parentbe573e7d17ecbcde3225f4d23be7d6fbab3d5f14 (diff)
downloadcpython-c1fba3ea0c2e10d5dec77f71214ade5cce86c1bf.zip
cpython-c1fba3ea0c2e10d5dec77f71214ade5cce86c1bf.tar.gz
cpython-c1fba3ea0c2e10d5dec77f71214ade5cce86c1bf.tar.bz2
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-xLib/test/regrtest.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index d32fc8d..10b515b 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -412,6 +412,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")