From: Guido van Rossum <guido@python.org>
Date: Tue, 25 Aug 1998 12:29:08 +0000 (+0000)
Subject: There was still something wrong.  The original NOTTESTS are replaced
X-Git-Tag: v1.5.2a2~355
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c74fea07d42ac6bc3bc078fb13f903f6cdbbcb9;p=thirdparty%2FPython%2Fcpython.git

There was still something wrong.  The original NOTTESTS are replaced
by the new '-x' arguments, losing the previous items.  Thus,
test_support, test_b1 & test_b2 are executed (and warnings issued).
(Discovered by Vladimir Marangozov.)
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 9a890a883fa7..5944f8f36487 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -72,10 +72,13 @@ def main(tests=None, testdir=None):
         # Strip trailing ".py" from arguments
         if args[i][-3:] == '.py':
             args[i] = args[i][:-3]
-    stdtests = STDTESTS
-    nottests = NOTTESTS
+    stdtests = STDTESTS[:]
+    nottests = NOTTESTS[:]
     if exclude:
-        nottests = args
+        for arg in args:
+            if arg in stdtests:
+                stdtests.remove(arg)
+        nottests[:0] = args
         args = []
     tests = tests or args or findtests(testdir, stdtests, nottests)
     test_support.verbose = verbose      # Tell tests to be moderately quiet