From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sat, 27 Aug 2011 13:22:05 +0000 (+0200)
Subject: Make regrtest complain when -M and -j are used together.
X-Git-Tag: v3.3.0a1~1612^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1fba3ea0c2e10d5dec77f71214ade5cce86c1bf;p=python

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).
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index d32fc8dd0a..10b515b5ab 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")