[Lldb-commits] [lldb] r255335 - Revert "Turn on new test summary results by default."

[Pavel Labath via lldb-commits]

Author: labath
Date: Fri Dec 11 05:05:24 2015
New Revision: 255335

URL: http://llvm.org/viewvc/llvm-project?rev=255335&view=rev
Log:
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.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/dotest.py
    lldb/trunk/packages/Python/lldbsuite/test/result_formatter.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=255335&r1=255334&r2=255335&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Fri Dec 11 05:05:24 2015
@@ -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:

Modified: lldb/trunk/packages/Python/lldbsuite/test/result_formatter.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/result_formatter.py?rev=255335&r1=255334&r2=255335&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/result_formatter.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/result_formatter.py Fri Dec 11 05:05:24 2015
@@ -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