Only impact summary report, skip "suite :: " prefix

Fixup to only impact paths in the summary report (undoing changes
in display.py).

Also skipping the "suite :: " prefix in such output.

Author: bjope

llvm/utils/lit/lit/Test.py

@@ -307,9 +307,9 @@ def isFailure(self):
     def getFullName(self):
         return self.suite.config.name + " :: " + "/".join(self.path_in_suite)
 
-    def getFullNameRelPath(self, printRelativePaths):
-        if printRelativePaths:
-            return self.suite.config.name + " :: " + os.path.relpath(self.getFilePath())
+    def getSummaryName(self, printPathRelativeCWD):
+        if printPathRelativeCWD:
+            return os.path.relpath(self.getFilePath())
         return self.getFullName()
 
     def getFilePath(self):

llvm/utils/lit/lit/cl_arguments.py

@@ -94,7 +94,7 @@ def parse_args():
     format_group.add_argument(
         "-r",
         "--relative-paths",
-        dest="printRelativePaths",
+        dest="printPathRelativeCWD",
         help="Print paths relative to CWD",
         action="store_true",
     )

llvm/utils/lit/lit/display.py

@@ -116,7 +116,7 @@ def clear(self, interrupted):
 
     def print_result(self, test):
         # Show the test result line.
-        test_name = test.getFullNameRelPath(self.opts.printRelativePaths)
+        test_name = test.getFullName()
 
         extra_info = ""
         if test.result.attempts > 1:

llvm/utils/lit/lit/main.py

@@ -329,21 +329,21 @@ def print_results(tests, elapsed, opts):
             sorted(tests_by_code[code], key=lambda t: t.getFullName()),
             code,
             opts.shown_codes,
-            opts.printRelativePaths,
+            opts.printPathRelativeCWD,
         )
 
     print_summary(total_tests, tests_by_code, opts.quiet, elapsed)
 
 
-def print_group(tests, code, shown_codes, printRelativePaths):
+def print_group(tests, code, shown_codes, printPathRelativeCWD):
     if not tests:
         return
     if not code.isFailure and code not in shown_codes:
         return
     print("*" * 20)
     print("{} Tests ({}):".format(code.label, len(tests)))
     for test in tests:
-        print("  %s" % test.getFullNameRelPath(printRelativePaths))
+        print("  %s" % test.getSummaryName(printPathRelativeCWD))
     sys.stdout.write("\n")
 
 

llvm/utils/lit/tests/print-relative-path.py

@@ -1,16 +1,18 @@
-# RUN: not %{lit} %{inputs}/print-relative-path | FileCheck --check-prefix=CHECK-DEFAULT %s
-# RUN: not %{lit} -r %{inputs}/print-relative-path | FileCheck --check-prefix=CHECK-RELATIVE %s
-# RUN: not %{lit} --relative-paths %{inputs}/print-relative-path | FileCheck --check-prefix=CHECK-RELATIVE %s
+# RUN: %{lit} --ignore-fail --show-pass %{inputs}/print-relative-path | FileCheck --check-prefix=CHECK-DEFAULT %s
+# RUN: %{lit} --ignore-fail --show-pass -r %{inputs}/print-relative-path | FileCheck --check-prefix=CHECK-RELATIVE %s
+# RUN: %{lit} --ignore-fail --show-pass --relative-paths %{inputs}/print-relative-path | FileCheck --check-prefix=CHECK-RELATIVE %s
 
 
 # CHECK-DEFAULT: PASS: print-relative-path :: test.txt (1 of 2)
-# CHECK-DEFAULT-NEXT: FAIL: print-relative-path :: test2.txt (2 of 2)
-# CHECK-DEFAULT-NEXT: ********************
-# CHECK-DEFAULT-NEXT: Failed Tests (1):
-# CHECK-DEFAULT-NEXT:  print-relative-path :: test2.txt
+# CHECK-DEFAULT: FAIL: print-relative-path :: test2.txt (2 of 2)
+# CHECK-DEFAULT: Passed Tests (1):
+# CHECK-DEFAULT:  print-relative-path :: test.txt
+# CHECK-DEFAULT: Failed Tests (1):
+# CHECK-DEFAULT:  print-relative-path :: test2.txt
 
-# CHECK-RELATIVE: PASS: print-relative-path :: Inputs/print-relative-path/test.txt (1 of 2)
-# CHECK-RELATIVE-NEXT: FAIL: print-relative-path :: Inputs/print-relative-path/test2.txt (2 of 2)
-# CHECK-RELATIVE-NEXT: ********************
-# CHECK-RELATIVE-NEXT: Failed Tests (1):
-# CHECK-RELATIVE-NEXT:  print-relative-path :: Inputs/print-relative-path/test2.txt
+# CHECK-RELATIVE: PASS: print-relative-path :: test.txt (1 of 2)
+# CHECK-RELATIVE: FAIL: print-relative-path :: test2.txt (2 of 2)
+# CHECK-RELATIVE: Passed Tests (1):
+# CHECK-RELATIVE:  Inputs/print-relative-path/test.txt
+# CHECK-RELATIVE: Failed Tests (1):
+# CHECK-RELATIVE:  Inputs/print-relative-path/test2.txt