test result details now print module.class.test_name in verbose mode.

And, turns off verbose mode by default.  This must have been switched
on as the default when somebody was testing.

llvm-svn: 255310

2 files changed, 10 insertions, 2 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py b/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py
index 46de04bbd9c..a9e85dca90e 100644
--- a/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py
+++ b/lldb/packages/Python/lldbsuite/test/basic_results_formatter.py
@@ -13,6 +13,7 @@ from __future__ import print_function
 import os
 
 # Our imports
+from . import configuration
 from . import result_formatter
 from .result_formatter import EventBuilder
 import lldbsuite
@@ -272,6 +273,13 @@ class BasicResultsFormatter(result_formatter.ResultsFormatter):
                             extra_info,
                             event["test_filename"]))
                 else:
+                    # Figure out the identity we will use for this test.
+                    if configuration.verbose and ("test_class" in event):
+                        test_id = "{}.{}".format(
+                            event["test_class"], event["test_name"])
+                    else:
+                        test_id = event["test_name"]
+
                     # Test-method events have richer detail, use that here.
                     test_relative_path = os.path.relpath(
                         os.path.realpath(event["test_filename"]),
@@ -279,7 +287,7 @@ class BasicResultsFormatter(result_formatter.ResultsFormatter):
                     self.out_file.write("{}: {}{} ({})\n".format(
                         detail_label,
                         extra_info,
-                        event["test_name"],
+                        test_id,
                         test_relative_path))
 
     def _finish_output_no_lock(self):
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index 51d57d43e34..1712c50f508 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -120,7 +120,7 @@ sdir_has_content = False
 svn_info = ''
 
 # Default verbosity is 0.
-verbose = 1
+verbose = 0
 
 # By default, search from the script directory.
 # We can't use sys.path[0] to determine the script directory