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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 16 20:54:10 2010
New Revision: 101609

URL: http://llvm.org/viewvc/llvm-project?rev=101609&view=rev
Log:
buildbot: Make sure to report failure/warning counts when test command fails,
and don't report failure in test commands when ignored tests are present.

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=101609&r1=101608&r2=101609&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/StandardizedTest.py (original)
+++ zorg/trunk/zorg/buildbot/commands/StandardizedTest.py Fri Apr 16 20:54:10 2010
@@ -31,10 +31,6 @@
         abstract
 
     def evaluateCommand(self, cmd):
-        # Always fail if the command itself failed.
-        if cmd.rc != 0:
-            return buildbot.status.builder.FAILURE
-
         results_by_code = {}
         logs = []
         lines = self.getLog(self.testLogName).readlines()
@@ -87,6 +83,12 @@
         for test, log in logs:
             self.addCompleteLog(test, log)
 
+        # Always fail if the command itself failed, unless we have ignored
+        # tests.
+        if not self.ignoredTests and cmd.rc != 0:
+            return buildbot.status.builder.FAILURE
+
+        # Report failure/warnings beased on the test status.
         if failed:
             return buildbot.status.builder.FAILURE
         if warnings: