Skip to content

[llvm-lit] Add precommit test to verify current behavior of glob expansion in lit's internal shell #106325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions llvm/utils/lit/tests/Inputs/shtest-glob/example_file1.input
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## This is the first example file used for testing glob pattern matching.
This is the first example file.
2 changes: 2 additions & 0 deletions llvm/utils/lit/tests/Inputs/shtest-glob/example_file2.input
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## This is the second example file used for testing glob pattern matching.
This is the second example file.
2 changes: 2 additions & 0 deletions llvm/utils/lit/tests/Inputs/shtest-glob/glob-echo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## Tests glob pattern expansion by listing matching files.
# RUN: echo %S/example_file*.input
2 changes: 2 additions & 0 deletions llvm/utils/lit/tests/Inputs/shtest-glob/glob-mkdir.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## Tests glob pattern handling in the mkdir command.
# RUN: not mkdir %S/example_file*.input
8 changes: 8 additions & 0 deletions llvm/utils/lit/tests/Inputs/shtest-glob/lit.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import lit.formats

config.name = "shtest-glob"
config.suffixes = [".txt"]
config.test_format = lit.formats.ShTest()
config.test_source_root = None
config.test_exec_root = None
config.substitutions.append(("%{python}", '"%s"' % (sys.executable)))
12 changes: 12 additions & 0 deletions llvm/utils/lit/tests/shtest-glob.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## Tests glob pattern handling in echo command.

# RUN: not %{lit} -a -v %{inputs}/shtest-glob \
# RUN: | FileCheck -dump-input=fail -match-full-lines %s
#
# END.

# CHECK: UNRESOLVED: shtest-glob :: glob-echo.txt ({{[^)]*}})
# CHECK: TypeError: string argument expected, got 'GlobItem'

# CHECK: FAIL: shtest-glob :: glob-mkdir.txt ({{[^)]*}}
# CHECK: # error: command failed with exit status: 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was surprised there is no more specific error here but it looks like the builtin mkdir does not print any output right now. Turns out it doesn't handle EEXISTS the same way as the real mkdir command. I can submit a patch for this once this commit lands.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A patch to address that would be great, and I’m looking forward to seeing it once this commit lands.

Loading