[llvm] 30d77fb - [lit] Apply aa71680f2948's fix to an additional test

[Joel E. Denny via llvm-commits]

Author: Joel E. Denny
Date: 2023-09-19T18:40:50-04:00
New Revision: 30d77fb80857e645b300c8f59cad9414d090e083

URL: https://github.com/llvm/llvm-project/commit/30d77fb80857e645b300c8f59cad9414d090e083
DIFF: https://github.com/llvm/llvm-project/commit/30d77fb80857e645b300c8f59cad9414d090e083.diff

LOG: [lit] Apply aa71680f2948's fix to an additional test

Seen at
<https://lab.llvm.org/buildbot/#/builders/216/builds/27538/steps/7/logs/FAIL__lit___shtest-external-shell-kill_py>.

Added: 
    

Modified: 
    llvm/utils/lit/tests/lit.cfg
    llvm/utils/lit/tests/shtest-external-shell-kill.py
    llvm/utils/lit/tests/shtest-run-at-line.py

Removed: 
    


################################################################################
diff  --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg
index 438fdbd93c39812..1382f7ef4ab00e5 100644
--- a/llvm/utils/lit/tests/lit.cfg
+++ b/llvm/utils/lit/tests/lit.cfg
@@ -73,6 +73,16 @@ config.substitutions.append(
 )
 config.substitutions.append(("%{python}", '"%s"' % (sys.executable)))
 
+# This diagnostic sometimes appears in windows when using bash as an external
+# shell.  Ignore it in lit's output where we need to strictly check only the
+# relevant output.
+config.substitutions.append(
+    (
+        "%{filter-lit}",
+        "grep -v 'bash.exe: warning: could not find /tmp, please create!'",
+    )
+)
+
 # Enable coverage.py reporting, assuming the coverage module has been installed
 # and sitecustomize.py in the virtualenv has been modified appropriately.
 if lit_config.params.get("check-coverage", None):

diff  --git a/llvm/utils/lit/tests/shtest-external-shell-kill.py b/llvm/utils/lit/tests/shtest-external-shell-kill.py
index 73f8d8601af620b..2de9766aa2fa2fa 100644
--- a/llvm/utils/lit/tests/shtest-external-shell-kill.py
+++ b/llvm/utils/lit/tests/shtest-external-shell-kill.py
@@ -20,7 +20,7 @@
 # The last FileCheck directive below checks that the debugging commands for the
 # above RUN line are not killed and do execute at the right time.
 
-# RUN: %{lit} -a %{inputs}/shtest-external-shell-kill | FileCheck %s
+# RUN: %{lit} -a %{inputs}/shtest-external-shell-kill | %{filter-lit} | FileCheck %s
 # END.
 
 #       CHECK: Command Output (stdout):

diff  --git a/llvm/utils/lit/tests/shtest-run-at-line.py b/llvm/utils/lit/tests/shtest-run-at-line.py
index a1bdb039805ad4f..18086f6fa10d650 100644
--- a/llvm/utils/lit/tests/shtest-run-at-line.py
+++ b/llvm/utils/lit/tests/shtest-run-at-line.py
@@ -1,15 +1,9 @@
 # Check that -a/-v/-vv makes the line number of the failing RUN command clear.
 
 
-# This diagnostic sometimes appears in windows when using bash as an external
-# shell.  Ignore it so we can strictly check the relevant output.
-#
-# DEFINE: %{filter} = \
-# DEFINE:   grep -v 'bash.exe: warning: could not find /tmp, please create!'
-
-# RUN: not %{lit} -a %{inputs}/shtest-run-at-line | %{filter} | FileCheck %s
-# RUN: not %{lit} -v %{inputs}/shtest-run-at-line | %{filter} | FileCheck %s
-# RUN: not %{lit} -vv %{inputs}/shtest-run-at-line | %{filter} | FileCheck %s
+# RUN: not %{lit} -a %{inputs}/shtest-run-at-line | %{filter-lit} | FileCheck %s
+# RUN: not %{lit} -v %{inputs}/shtest-run-at-line | %{filter-lit} | FileCheck %s
+# RUN: not %{lit} -vv %{inputs}/shtest-run-at-line | %{filter-lit} | FileCheck %s
 # END.