Hopefully we're good with this now that r255363 went in.

We'll revert this again if we still have trouble on the Ubuntu 14.04
builder.

On Fri, Dec 11, 2015 at 2:29 PM, Todd Fiala via lldb-commits <
lldb-commits@lists.llvm.org> wrote:

> Author: tfiala
> Date: Fri Dec 11 16:29:34 2015
> New Revision: 255381
>
> URL: http://llvm.org/viewvc/llvm-project?rev=255381&view=rev
> Log:
> Revert "Revert "Turn on new test summary results by default.""
>
> This reverts commit f994b46a2028c8a8b9b55fe010a95122bca07540.
>
> 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=255381&r1=255380&r2=255381&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Fri Dec 11
> 16:29:34 2015
> @@ -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:
>
> 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=255381&r1=255380&r2=255381&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/result_formatter.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/result_formatter.py Fri Dec
> 11 16:29:34 2015
> @@ -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
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits@lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
>



-- 
-Todd
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to