diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/dosep.py')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/dosep.py | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py index 7e259bc3652..ef03d5fe0e6 100644 --- a/lldb/packages/Python/lldbsuite/test/dosep.py +++ b/lldb/packages/Python/lldbsuite/test/dosep.py @@ -1632,23 +1632,18 @@ def main(num_threads, test_subdir, test_runner_name, results_formatter): # Only run the old summary logic if we don't have a results formatter # that already prints the summary. - if results_formatter is None or not results_formatter.replaces_summary(): - print_legacy_summary = True - else: - print_legacy_summary = False - + print_legacy_summary = results_formatter is None if not print_legacy_summary: + # Print summary results. Summarized results at the end always + # get printed to stdout, even if --results-file specifies a different + # file for, say, xUnit output. + results_formatter.print_results(sys.stdout) + # Figure out exit code by count of test result types. - issue_count = ( - results_formatter.counts_by_test_result_status( - EventBuilder.STATUS_ERROR) + - results_formatter.counts_by_test_result_status( - EventBuilder.STATUS_FAILURE) + - results_formatter.counts_by_test_result_status( - EventBuilder.STATUS_TIMEOUT) + - results_formatter.counts_by_test_result_status( - EventBuilder.STATUS_EXCEPTIONAL_EXIT) - ) + issue_count = 0 + for issue_status in EventBuilder.TESTRUN_ERROR_STATUS_VALUES: + issue_count += results_formatter.counts_by_test_result_status( + issue_status) # Return with appropriate result code if issue_count > 0: |