Skip to content

Commit 30d77fb

Browse files
committed
1 parent d37496e commit 30d77fb

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

llvm/utils/lit/tests/lit.cfg

+10
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,16 @@ config.substitutions.append(
7373
)
7474
config.substitutions.append(("%{python}", '"%s"' % (sys.executable)))
7575

76+
# This diagnostic sometimes appears in windows when using bash as an external
77+
# shell. Ignore it in lit's output where we need to strictly check only the
78+
# relevant output.
79+
config.substitutions.append(
80+
(
81+
"%{filter-lit}",
82+
"grep -v 'bash.exe: warning: could not find /tmp, please create!'",
83+
)
84+
)
85+
7686
# Enable coverage.py reporting, assuming the coverage module has been installed
7787
# and sitecustomize.py in the virtualenv has been modified appropriately.
7888
if lit_config.params.get("check-coverage", None):

llvm/utils/lit/tests/shtest-external-shell-kill.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# The last FileCheck directive below checks that the debugging commands for the
2121
# above RUN line are not killed and do execute at the right time.
2222

23-
# RUN: %{lit} -a %{inputs}/shtest-external-shell-kill | FileCheck %s
23+
# RUN: %{lit} -a %{inputs}/shtest-external-shell-kill | %{filter-lit} | FileCheck %s
2424
# END.
2525

2626
# CHECK: Command Output (stdout):

llvm/utils/lit/tests/shtest-run-at-line.py

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
# Check that -a/-v/-vv makes the line number of the failing RUN command clear.
22

33

4-
# This diagnostic sometimes appears in windows when using bash as an external
5-
# shell. Ignore it so we can strictly check the relevant output.
6-
#
7-
# DEFINE: %{filter} = \
8-
# DEFINE: grep -v 'bash.exe: warning: could not find /tmp, please create!'
9-
10-
# RUN: not %{lit} -a %{inputs}/shtest-run-at-line | %{filter} | FileCheck %s
11-
# RUN: not %{lit} -v %{inputs}/shtest-run-at-line | %{filter} | FileCheck %s
12-
# RUN: not %{lit} -vv %{inputs}/shtest-run-at-line | %{filter} | FileCheck %s
4+
# RUN: not %{lit} -a %{inputs}/shtest-run-at-line | %{filter-lit} | FileCheck %s
5+
# RUN: not %{lit} -v %{inputs}/shtest-run-at-line | %{filter-lit} | FileCheck %s
6+
# RUN: not %{lit} -vv %{inputs}/shtest-run-at-line | %{filter-lit} | FileCheck %s
137
# END.
148

159

0 commit comments

Comments
 (0)