Issue #28950: Disallow -j0 combined with -T/-l/-M in regrtest.

2 files changed, 6 insertions, 3 deletions

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 6b7ce16c68..c1d85f6a18 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")
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index ae183272a1..e2c2f2da86 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -200,6 +200,9 @@ class ParseArgsTestCase(unittest.TestCase):
                 self.checkError([opt, '2', '-T'], "don't go together")
                 self.checkError([opt, '2', '-l'], "don't go together")
                 self.checkError([opt, '2', '-M', '4G'], "don't go together")
+                self.checkError([opt, '0', '-T'], "don't go together")
+                self.checkError([opt, '0', '-l'], "don't go together")
+                self.checkError([opt, '0', '-M', '4G'], "don't go together")
 
     def test_coverage(self):
         for opt in '-T', '--coverage':