[llvm-commits] [zorg] r164319 - /zorg/trunk/zorg/buildbot/commands/StandardizedTest.py

[David Blaikie]

Author: dblaikie
Date: Thu Sep 20 16:14:16 2012
New Revision: 164319

URL: http://llvm.org/viewvc/llvm-project?rev=164319&view=rev
Log:
Accept test logs that already have FLAKEY/IGNORED prefixes.

This is to allow the flake/ignore processing to be pushed down into the tests
themselves rather than being handled up on the buildmaster.

Reviewed by Eric Christopher. (open to further iteration, as always)

Modified:
    zorg/trunk/zorg/buildbot/commands/StandardizedTest.py

Modified: zorg/trunk/zorg/buildbot/commands/StandardizedTest.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/StandardizedTest.py?rev=164319&r1=164318&r2=164319&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/StandardizedTest.py (original)
+++ zorg/trunk/zorg/buildbot/commands/StandardizedTest.py Thu Sep 20 16:14:16 2012
@@ -41,16 +41,18 @@
         hasIgnored = False
         for result,test,log in self.parseLog(lines):
             test = test.strip()
-            if result not in self.knownCodes:
+            if result not in self.allKnownCodes:
                 raise ValueError,'test command return invalid result code!'
 
             # Convert codes for flaky and ignored tests.
             if test in self.flakyTests:
                 result = 'FLAKY ' + result
-                hasIgnored = True
             elif test in self.ignoredTests:
                 result = 'IGNORE ' + result
+
+            if result.startswith('FLAKY ') or result.startswith('IGNORE '):
                 hasIgnored = True
+                
 
             if result not in results_by_code:
                 results_by_code[result] = set()