Index: tools/testrunner/local/testsuite.py |
diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py |
index ff51196a563e4b5607c90f0436b0f1fc67dd9bbc..0fd3f3a3000a35ac2c06549b36e7c4cecd907e80 100644 |
--- a/tools/testrunner/local/testsuite.py |
+++ b/tools/testrunner/local/testsuite.py |
@@ -190,18 +190,19 @@ class TestSuite(object): |
else: |
return execution_failed |
- def HasUnexpectedOutput(self, testcase): |
+ def GetOutcome(self, testcase): |
if testcase.output.HasCrashed(): |
- outcome = statusfile.CRASH |
+ return statusfile.CRASH |
elif testcase.output.HasTimedOut(): |
- outcome = statusfile.TIMEOUT |
+ return statusfile.TIMEOUT |
elif self.HasFailed(testcase): |
- outcome = statusfile.FAIL |
+ return statusfile.FAIL |
else: |
- outcome = statusfile.PASS |
- if not testcase.outcomes: |
- return outcome != statusfile.PASS |
- return not outcome in testcase.outcomes |
+ return statusfile.PASS |
+ |
+ def HasUnexpectedOutput(self, testcase): |
+ outcome = self.GetOutcome(testcase) |
+ return not outcome in (testcase.outcomes or [statusfile.PASS]) |
def StripOutputForTransmit(self, testcase): |
if not self.HasUnexpectedOutput(testcase): |