Skip to content

Commit

Permalink
Revert "Turn on new test summary results by default."
Browse files Browse the repository at this point in the history
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.

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@255335 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
labath committed Dec 11, 2015
1 parent 1f6de9e commit f994b46
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
6 changes: 0 additions & 6 deletions packages/Python/lldbsuite/test/dotest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions packages/Python/lldbsuite/test/result_formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -683,9 +683,8 @@ def handle_event(self, test_event):

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
Expand Down

0 comments on commit f994b46

Please sign in to comment.