[lit] Allow formats to return lit.Test.Result instances directly.

[oota-llvm.git] / utils / lit / lit / Test.py

diff --git a/utils/lit/lit/Test.py b/utils/lit/lit/Test.py
index d37854ece1d619552d05ae67e39136b185ab6710..c1bacb3d86d1f8b8efe00df458c411935e01f0d7 100644 (file)
--- a/utils/lit/lit/Test.py
+++ b/utils/lit/lit/Test.py
@@ -23,7 +23,7 @@ UNSUPPORTED = ResultCode('UNSUPPORTED', False)
 class Result(object):
     """Wrapper for the results of executing an individual test."""
 
-    def __init__(self, code, output, elapsed):
+    def __init__(self, code, output='', elapsed=None):
         # The result code.
         self.code = code
         # The test output.
@@ -62,9 +62,13 @@ class Test:
         # The test result, once complete.
         self.result = None
 
-    def setResult(self, result, output, elapsed):
-        assert self.result is None, "Test result already set!"
-        self.result = Result(result, output, elapsed)
+    def setResult(self, result):
+        if self.result is not None:
+            raise ArgumentError("test result already set")
+        if not isinstance(result, Result):
+            raise ArgumentError("unexpected result type")
+
+        self.result = result
 
     def getFullName(self):
         return self.suite.config.name + ' :: ' + '/'.join(self.path_in_suite)