diff options
| author | Pavel Labath <labath@google.com> | 2015-12-11 11:05:24 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2015-12-11 11:05:24 +0000 |
| commit | 027158fad7a335400d4b1bd08225316ecf971e0f (patch) | |
| tree | 1d71e47ad468fa183f3df2de04860ac87f596102 /lldb/packages/Python/lldbsuite/test | |
| parent | 37b82e79b20f7f8798d2b51508d5923703204351 (diff) | |
| download | llvm-027158fad7a335400d4b1bd08225316ecf971e0f.zip llvm-027158fad7a335400d4b1bd08225316ecf971e0f.tar.gz llvm-027158fad7a335400d4b1bd08225316ecf971e0f.tar.bz2 | |
Revert "Turn on new test summary results by default."
The new test summary formatter does not honor the "expected timeout" markings, which makes our
buildbots all red. I'm switching it off by default until we figure out a way to make this work.
llvm-svn: 255335
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, 2 insertions, 9 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 25c1ffa..cf01cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -407,12 +407,6 @@ 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 0dc1833..a37a1f9 100644 --- a/lldb/packages/Python/lldbsuite/test/result_formatter.py +++ b/lldb/packages/Python/lldbsuite/test/result_formatter.py @@ -683,9 +683,8 @@ class ResultsFormatter(object): if event_type == "terminate": self.terminate_called = True - elif event_type in [ - EventBuilder.TYPE_TEST_RESULT, - EventBuilder.TYPE_JOB_RESULT]: + elif (event_type == EventBuilder.TYPE_TEST_RESULT or + event_type == 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 |