diff options
| author | Xiang Zhang <angwerzx@126.com> | 2016-12-19 13:01:33 (GMT) |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2016-12-19 13:01:33 (GMT) |
| commit | 270a21fda0c41ea120727140ac966a86f694eee4 (patch) | |
| tree | 2195f8185cf1c79cbcf93d6b914ccc9574216319 /Lib/test/regrtest.py | |
| parent | 509476b37085abda9c8cc0fba1451cb035e0b442 (diff) | |
| download | cpython-270a21fda0c41ea120727140ac966a86f694eee4.zip cpython-270a21fda0c41ea120727140ac966a86f694eee4.tar.gz cpython-270a21fda0c41ea120727140ac966a86f694eee4.tar.bz2 | |
Issue #28950: Disallow -j0 combined with -T/-l/-M in regrtest.
Diffstat (limited to 'Lib/test/regrtest.py')
| -rwxr-xr-x | Lib/test/regrtest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 6b7ce16..c1d85f6 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -380,11 +380,11 @@ def _parse_args(args, **kwargs): if ns.single and ns.fromfile: parser.error("-s and -f don't go together!") - if ns.use_mp and ns.trace: + if ns.use_mp is not None and ns.trace: parser.error("-T and -j don't go together!") - if ns.use_mp and ns.findleaks: + if ns.use_mp is not None and ns.findleaks: parser.error("-l and -j don't go together!") - if ns.use_mp and ns.memlimit: + if ns.use_mp is not None and ns.memlimit: parser.error("-M and -j don't go together!") if ns.failfast and not (ns.verbose or ns.verbose3): parser.error("-G/--failfast needs either -v or -W") |