diff options
Diffstat (limited to 'lldb/test/dotest.py')
| -rwxr-xr-x | lldb/test/dotest.py | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py index 2cf02babf5c..a8396b604b8 100755 --- a/lldb/test/dotest.py +++ b/lldb/test/dotest.py @@ -1006,13 +1006,26 @@ def setupTestResults(): # Start the results formatter session - we'll only have one # during a given dotest process invocation. - results_formatter_object.begin_session() + initialize_event = EventBuilder.bare_event("initialize") + if isMultiprocessTestRunner(): + if test_runner_name is not None and test_runner_name == "serial": + # Only one worker queue here. + worker_count = 1 + else: + # Workers will be the number of threads specified. + worker_count = num_threads + else: + worker_count = 1 + initialize_event["worker_count"] = worker_count + + results_formatter_object.handle_event(initialize_event) def shutdown_formatter(): # Tell the formatter to write out anything it may have # been saving until the very end (e.g. xUnit results # can't complete its output until this point). - results_formatter_object.end_session() + terminate_event = EventBuilder.bare_event("terminate") + results_formatter_object.handle_event(terminate_event) # And now close out the output file-like object. if cleanup_func is not None: @@ -1873,7 +1886,7 @@ if __name__ == "__main__": self.stream.write(self.fmt % self.counter) super(LLDBTestResult, self).startTest(test) if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_start(test)) def addSuccess(self, test): @@ -1882,7 +1895,7 @@ if __name__ == "__main__": if parsable: self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_success(test)) def addError(self, test, err): @@ -1896,7 +1909,7 @@ if __name__ == "__main__": if parsable: self.stream.write("FAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_error(test, err)) def addCleanupError(self, test, err): @@ -1910,7 +1923,7 @@ if __name__ == "__main__": if parsable: self.stream.write("CLEANUP ERROR: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_cleanup_error( test, err)) @@ -1933,7 +1946,7 @@ if __name__ == "__main__": else: failuresPerCategory[category] = 1 if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_failure(test, err)) @@ -1948,7 +1961,7 @@ if __name__ == "__main__": if parsable: self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_expected_failure( test, err, bugnumber)) @@ -1963,7 +1976,7 @@ if __name__ == "__main__": if parsable: self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason)) if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_skip(test, reason)) def addUnexpectedSuccess(self, test, bugnumber): @@ -1977,7 +1990,7 @@ if __name__ == "__main__": if parsable: self.stream.write("XPASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) if self.results_formatter: - self.results_formatter.process_event( + self.results_formatter.handle_event( EventBuilder.event_for_unexpected_success( test, bugnumber)) |
