diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 6 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/result_formatter.py | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index bf222cf7ed0..ed01eccf238 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -387,6 +387,12 @@ def parseOptionsAndInitTestdirs(): if args.results_formatter_options: configuration.results_formatter_options = args.results_formatter_options + # Default to using the BasicResultsFormatter if no formatter is specified + # and we're not a test inferior. + if not args.inferior and configuration.results_formatter_name is None: + configuration.results_formatter_name = ( + "lldbsuite.test.basic_results_formatter.BasicResultsFormatter") + if args.lldb_platform_name: configuration.lldb_platform_name = args.lldb_platform_name if args.lldb_platform_url: diff --git a/lldb/packages/Python/lldbsuite/test/result_formatter.py b/lldb/packages/Python/lldbsuite/test/result_formatter.py index 9cd37a049d0..97319f84957 100644 --- a/lldb/packages/Python/lldbsuite/test/result_formatter.py +++ b/lldb/packages/Python/lldbsuite/test/result_formatter.py @@ -738,8 +738,9 @@ class ResultsFormatter(object): if event_type == "terminate": self.terminate_called = True - elif (event_type == EventBuilder.TYPE_TEST_RESULT or - event_type == EventBuilder.TYPE_JOB_RESULT): + elif event_type in [ + EventBuilder.TYPE_TEST_RESULT, + EventBuilder.TYPE_JOB_RESULT]: # Keep track of event counts per test/job result status type. # The only job (i.e. inferior process) results that make it # here are ones that cannot be remapped to the most recently |
