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

[Daniel Dunbar]

Author: ddunbar
Date: Sat Jul 31 00:26:20 2010
New Revision: 109944

URL: http://llvm.org/viewvc/llvm-project?rev=109944&view=rev
Log:
buildbot/StandardizedTest: Strip test names, and don't warn about
ignored tests which pass, if there is also an ignored test with the
same name that fails. Nice naming!

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=109944&r1=109943&r2=109944&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/StandardizedTest.py (original)
+++ zorg/trunk/zorg/buildbot/commands/StandardizedTest.py Sat Jul 31 00:26:20 2010
@@ -39,6 +39,7 @@
         lines = self.getLog(self.testLogName).readlines()
         hasIgnored = False
         for result,test,log in self.parseLog(lines):
+            test = test.strip()
             if result not in self.knownCodes:
                 raise ValueError,'test command return invalid result code!'
 
@@ -60,6 +61,19 @@
                 if log is not None and log.strip():
                     logs.append((test, log))
 
+        # Explicitly remove any ignored warnings for tests which are
+        # also in the an ignored failing set (some tests may appear
+        # twice).
+        ignored_failures = set()
+        for code in self.failingCodes:
+            results = results_by_code.get('IGNORE ' + code)
+            if results:
+                ignored_failures |= set(results)
+        for code in self.warningCodes:
+            results = results_by_code.get(code)
+            if results:
+                results_by_code[code] -= ignored_failures
+
         # Summarize result counts.
         total = failed = passed = warnings = 0
         for code in self.allKnownCodes: