[lit] Move resolving of XFAIL result codes out of Test.setResult
This will allow us to serialize just the result object instead of the
whole lit.Test object back from the worker to the main lit process.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@375195 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/lit/lit/Test.py b/utils/lit/lit/Test.py
index a10419f..dffa735 100644
--- a/utils/lit/lit/Test.py
+++ b/utils/lit/lit/Test.py
@@ -231,18 +231,6 @@
self.result = result
- # Apply the XFAIL handling to resolve the result exit code.
- try:
- if self.isExpectedToFail():
- if self.result.code == PASS:
- self.result.code = XPASS
- elif self.result.code == FAIL:
- self.result.code = XFAIL
- except ValueError as e:
- # Syntax error in an XFAIL line.
- self.result.code = UNRESOLVED
- self.result.output = str(e)
-
def getFullName(self):
return self.suite.config.name + ' :: ' + '/'.join(self.path_in_suite)
diff --git a/utils/lit/lit/worker.py b/utils/lit/lit/worker.py
index 3a4868e..a4e77be 100644
--- a/utils/lit/lit/worker.py
+++ b/utils/lit/lit/worker.py
@@ -64,9 +64,30 @@
end = time.time()
result.elapsed = end - start
+ resolve_result_code(result, test)
+
test.setResult(result)
+# TODO(yln): is this the right place to deal with this?
+# isExpectedToFail() only works after the test has been executed.
+def resolve_result_code(result, test):
+ try:
+ expected_to_fail = test.isExpectedToFail()
+ except ValueError as e:
+ # Syntax error in an XFAIL line.
+ result.code = lit.Test.UNRESOLVED
+ result.output = str(e)
+ else:
+ if expected_to_fail:
+ # pass -> unexpected pass
+ if result.code is lit.Test.PASS:
+ result.code = lit.Test.XPASS
+ # fail -> expected fail
+ if result.code is lit.Test.FAIL:
+ result.code = lit.Test.XFAIL
+
+
def _execute_test_handle_errors(test, lit_config):
try:
return _adapt_result(test.config.test_format.execute(test, lit_config))
