Commit a89c32cc authored by Nadeem Vawda's avatar Nadeem Vawda

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).
parents 811afe9b c1fba3ea
...@@ -468,6 +468,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, ...@@ -468,6 +468,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
usage("-T and -j don't go together!") usage("-T and -j don't go together!")
if use_mp and findleaks: if use_mp and findleaks:
usage("-l and -j don't go together!") 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): if failfast and not (verbose or verbose3):
usage("-G/--failfast needs either -v or -W") usage("-G/--failfast needs either -v or -W")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment