[llvm] 23f896a - [lit] Update local test objects "in place" from remote test objects

[Julian Lettner via llvm-commits]

Author: Julian Lettner
Date: 2020-04-13T21:02:58-07:00
New Revision: 23f896a096c378a2eeeb348fa15027135c828ce8

URL: https://github.com/llvm/llvm-project/commit/23f896a096c378a2eeeb348fa15027135c828ce8
DIFF: https://github.com/llvm/llvm-project/commit/23f896a096c378a2eeeb348fa15027135c828ce8.diff

LOG: [lit] Update local test objects "in place" from remote test objects

Update local test object "in place" from remote test object.  We need to
do this to ensure that discovered test object which is used for printing
test results reflect the changes.

> Why are we sending back the whole test object from the worker process
> (lit.worker.execute) instead of just the result?

Unfortunately, the test result is not the only "result" of test
execution.  Other members (e.g., xfails, requires) of the Test class are
set only during execution.  Those members affect the behavior of
`isExpectedToFail` and `setResult`, and are accessed when printing
results.  For example, xunit.xml test results include missing features
for "skip reasons".  The lack of separation between an immutable "test
definition" and "generated outputs" (including the primary result and
other secondary state) is unfortunate historical design decision in lit.

> Why do we update the initial test object instead of just discarding it
> and continuing with the pickled test object?

Both of these approaches would work.  However, note that we need a fully
populated test object for printing results.  Updating the existing one
seems to be the easier path.

Added: 
    

Modified: 
    llvm/utils/lit/lit/run.py

Removed: 
    


################################################################################
diff  --git a/llvm/utils/lit/lit/run.py b/llvm/utils/lit/lit/run.py
index 9f2d712b107d..d0e7e65aae1e 100644
--- a/llvm/utils/lit/lit/run.py
+++ b/llvm/utils/lit/lit/run.py
@@ -91,12 +91,18 @@ def _wait_for(self, async_results, deadline):
             except multiprocessing.TimeoutError:
                 raise TimeoutError()
             else:
-                self.tests[idx] = test
+                self._update_test(self.tests[idx], test)
                 if test.isFailure():
                     self.failures += 1
                     if self.failures == self.max_failures:
                         raise MaxFailuresError()
 
+    # Update local test object "in place" from remote test object.  This
+    # ensures that the original test object which is used for printing test
+    # results reflect the changes.
+    def _update_test(self, local_test, remote_test):
+        local_test.__dict__.update(remote_test.__dict__)
+
     # TODO(yln): interferes with progress bar
     # Some tests use threads internally, and at least on Linux each of these
     # threads counts toward the current process limit. Try to raise the (soft)