# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2011-04-22 16:36:40
# Node ID 174d0a113757ca7d98088c790cfbee72282c02ef
# Parent  ec4ae5727f073b4de62e7c7cd9bd7e77df9a4207

run-tests: move blacklist and retest filtering to runone

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -671,6 +671,16 @@ def runone(options, test, skips, passes,
     else:
         return None # not a supported test, don't record
 
+    if options.blacklist:
+        filename = options.blacklist.get(test)
+        if filename is not None:
+            skipped.append((test, "blacklisted (%s)" % filename))
+            return None
+
+    if options.retest and not os.path.exists(test + ".err"):
+        ignores.append((test, "not retesting"))
+        return None
+
     if options.keywords:
         fp = open(test)
         t = fp.read().lower() + test.lower()
@@ -953,16 +963,6 @@ def runtests(options, tests):
         ignores = []
 
         for test in tests:
-            if options.blacklist:
-                filename = options.blacklist.get(test)
-                if filename is not None:
-                    skipped.append((test, "blacklisted (%s)" % filename))
-                    continue
-
-            if options.retest and not os.path.exists(test + ".err"):
-                ignores.append((test, "not retesting"))
-                continue
-
             ret = runone(options, test, skips, passes, fails, ignores)
             if options.first and ret is not None and not ret:
                 break