[llvm] 11044de - Reapply "lit: Move RUN at line comment after the command."

[Peter Collingbourne via llvm-commits]

Author: Peter Collingbourne
Date: 2025-03-24T12:01:49-07:00
New Revision: 11044de3dcc1dd7a47c8c3f98ecf77c00978b570

URL: https://github.com/llvm/llvm-project/commit/11044de3dcc1dd7a47c8c3f98ecf77c00978b570
DIFF: https://github.com/llvm/llvm-project/commit/11044de3dcc1dd7a47c8c3f98ecf77c00978b570.diff

LOG: Reapply "lit: Move RUN at line comment after the command."

This reverts commit 57e89c97c2c1b4e41f07a90c2f4d36649696e619.

Updated lit tests.

Added: 
    

Modified: 
    llvm/docs/CommandGuide/lit.rst
    llvm/utils/lit/lit/TestRunner.py
    llvm/utils/lit/tests/shtest-external-shell-kill.py
    llvm/utils/lit/tests/shtest-run-at-line.py

Removed: 
    


################################################################################
diff  --git a/llvm/docs/CommandGuide/lit.rst b/llvm/docs/CommandGuide/lit.rst
index 8c0e275e1f8ca..812e1d819e9c8 100644
--- a/llvm/docs/CommandGuide/lit.rst
+++ b/llvm/docs/CommandGuide/lit.rst
@@ -100,7 +100,7 @@ OUTPUT OPTIONS
 
  Each command is printed before it is executed. This can be valuable for
  debugging test failures, as the last printed command is the one that failed.
- Moreover, :program:`lit` inserts ``'RUN: at line N'`` before each
+ Moreover, :program:`lit` inserts ``'RUN: at line N'`` after each
  command pipeline in the output to help you locate the source line of
  the failed command.
 

diff  --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py
index 00432b8d31778..dab83cbc20624 100644
--- a/llvm/utils/lit/lit/TestRunner.py
+++ b/llvm/utils/lit/lit/TestRunner.py
@@ -1231,7 +1231,7 @@ def executeScript(test, litConfig, tmpBase, commands, cwd):
                 # the shell's execution trace for the 'set' commands by
                 # redirecting their stderr to /dev/null.
                 if command:
-                    msg = f"'{dbg}': {shlex.quote(command.lstrip())}"
+                    msg = f"{shlex.quote(command.lstrip())} \\# '{dbg}'"
                 else:
                     msg = f"'{dbg}' has no command after substitutions"
                 commands[i] = (

diff  --git a/llvm/utils/lit/tests/shtest-external-shell-kill.py b/llvm/utils/lit/tests/shtest-external-shell-kill.py
index 2de9766aa2fa2..627708c1a19cd 100644
--- a/llvm/utils/lit/tests/shtest-external-shell-kill.py
+++ b/llvm/utils/lit/tests/shtest-external-shell-kill.py
@@ -31,6 +31,6 @@
 #  CHECK-NEXT: --
 #  CHECK-NEXT: Command Output (stderr):
 #  CHECK-NEXT: --
-#  CHECK-NEXT: RUN: at line 1: echo start
+#  CHECK-NEXT: echo start # RUN: at line 1 
 #  CHECK-NEXT: echo start
-#  CHECK-NEXT: RUN: at line 2: sleep [[#]] & PID=$!
+#  CHECK-NEXT: sleep [[#]] & PID=$! # RUN: at line 2

diff  --git a/llvm/utils/lit/tests/shtest-run-at-line.py b/llvm/utils/lit/tests/shtest-run-at-line.py
index dc0b78c6b81ca..4989074170ecf 100644
--- a/llvm/utils/lit/tests/shtest-run-at-line.py
+++ b/llvm/utils/lit/tests/shtest-run-at-line.py
@@ -17,9 +17,9 @@
 
 #       CHECK: Command Output (stderr)
 #  CHECK-NEXT: --
-#  CHECK-NEXT: {{^}}RUN: at line 4: true{{$}}
+#  CHECK-NEXT: {{^}}true # RUN: at line 4{{$}}
 #  CHECK-NEXT: true
-#  CHECK-NEXT: {{^}}RUN: at line 5: false{{$}}
+#  CHECK-NEXT: {{^}}false # RUN: at line 5{{$}}
 #  CHECK-NEXT: false
 # CHECK-EMPTY:
 #  CHECK-NEXT: --
@@ -29,7 +29,7 @@
 #       CHECK: Command Output (stderr)
 #  CHECK-NEXT: --
 #  CHECK-NEXT: {{^}}RUN: at line 2 has no command after substitutions{{$}}
-#  CHECK-NEXT: {{^}}RUN: at line 3: false{{$}}
+#  CHECK-NEXT: {{^}}false # RUN: at line 3{{$}}
 #  CHECK-NEXT: false
 # CHECK-EMPTY:
 #  CHECK-NEXT: --
@@ -42,9 +42,9 @@
 
 #       CHECK: Command Output (stderr)
 #  CHECK-NEXT: --
-#  CHECK-NEXT: {{^}}RUN: at line 4: echo 'foo bar' | FileCheck
+#  CHECK-NEXT: {{^}}echo 'foo bar' | FileCheck {{.*}} # RUN: at line 4 
 #   CHECK-NOT: RUN
-#       CHECK: {{^}}RUN: at line 6: echo 'foo baz' | FileCheck
+#       CHECK: {{^}}echo 'foo baz' | FileCheck {{.*}} # RUN: at line 6 
 #   CHECK-NOT: RUN
 #       CHECK: --
 
@@ -52,9 +52,9 @@
 
 #      CHECK: Command Output (stderr)
 # CHECK-NEXT: --
-# CHECK-NEXT: {{^}}RUN: at line 1: echo abc |
+# CHECK-NEXT: {{^}}echo abc |
 # CHECK-NEXT: FileCheck {{.*}} &&
-# CHECK-NEXT: false
+# CHECK-NEXT: false # RUN: at line 1
 #  CHECK-NOT: RUN