# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1303490200 18000
# Node ID edf2753d3170d718d459f47303a130c5ad8d4eb0
# Parent  0c112b0ab062494f6adc96ff6389e4f9dd729566
run-tests: move blacklist and retest filtering to runone

[ original upstream message ]

diff -r 0c112b0ab062 -r edf2753d3170 tests/run-tests.py
--- a/tests/run-tests.py	Fri Apr 22 11:32:05 2011 -0500
+++ b/tests/run-tests.py	Fri Apr 22 11:36:40 2011 -0500
@@ -671,6 +671,16 @@
     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 @@
         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