Skip to content

Commit

Permalink
[lit] Apply aa71680's fix to an additional test
Browse files Browse the repository at this point in the history
  • Loading branch information
jdenny-ornl committed Sep 19, 2023
1 parent d37496e commit 30d77fb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
10 changes: 10 additions & 0 deletions llvm/utils/lit/tests/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/lit/tests/shtest-external-shell-kill.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
12 changes: 3 additions & 9 deletions llvm/utils/lit/tests/shtest-run-at-line.py
Original file line number Diff line number Diff line change
@@ -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.


Expand Down

0 comments on commit 30d77fb

Please sign in to comment.