Skip to content

Commit 9764cf8

Browse files
authored
[llvm-lit] Add precommit test to verify current behavior of glob expansion in lit's internal shell (#106325)
This patch introduces a precommit test to verify the current behavior of glob expansion in lit's internal shell. The motivation for this test stems from an issue encountered during the BOLT test suite when running with the lit internal shell using the command: `LIT_USE_INTERNAL_SHELL=1 ninja check-bolt` During execution, the following error was observed: ``` File "/usr/local/google/home/harinidonthula/llvm-project/llvm/utils/lit/lit/TestRunner.py", line 416, in executeBuiltinEcho stdout.write(encode(maybeUnescape(args[-1]))) TypeError: string argument expected, got 'GlobItem' ``` The `executeBuiltinEcho` function in the lit testing framework expects a string to be passed to `stdout.write`, but it received a `GlobItem` object instead. This precommit test is designed to check the current behavior where the glob pattern isn't correctly expanded, leading to this `TypeError`. While this patch doesn't fix the issue, it helps in understanding and verifying the current behavior. The feedback I received from this [PR](#105925) suggests using `cmd.args = expand_glob_expressions(cmd.args, shenv.cwd)` to match the behavior of `executeBuiltinMkdir` and `executeBuiltinRm`, but it is recognized that the internal shell should ideally expand globs before calling any built-in command. **Request for Feedback:** I'm looking for feedback on how to improve this precommit test, specifically regarding the handling and expansion of glob patterns for commands like mkdir and rm within the internal shell. Currently, the args are expanded at the beginning of these functions, which should ensure proper glob expansion. However, I'd appreciate guidance on whether I should write additional tests to verify that mkdir and rm are handling glob expansions correctly. If such tests are recommended, I would also appreciate advice on the best approach to implement them, considering the existing framework and the way glob expansion is expected to function in the internal shell. Should these tests confirm that the current implementation passes, or are there specific edge cases I should be aware of? **Next Steps:** In my follow-up PR, I plan to address the UNRESOLVED error by expanding the entire command, ensuring correct and consistent behavior across all commands. The current test checks for an unresolved issue with the glob expansion, specifically looking for a `TypeError` due to an unexpanded `GlobItem`. This will be updated to reflect the correct behavior once the issue is resolved. This change is relevant for [[RFC] Enabling the Lit Internal Shell by Default](https://discourse.llvm.org/t/rfc-enabling-the-lit-internal-shell-by-default/80179/3)
1 parent f81f283 commit 9764cf8

File tree

6 files changed

+28
-0
lines changed

6 files changed

+28
-0
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## This is the first example file used for testing glob pattern matching.
2+
This is the first example file.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## This is the second example file used for testing glob pattern matching.
2+
This is the second example file.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## Tests glob pattern expansion by listing matching files.
2+
# RUN: echo %S/example_file*.input
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## Tests glob pattern handling in the mkdir command.
2+
# RUN: not mkdir %S/example_file*.input
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import lit.formats
2+
3+
config.name = "shtest-glob"
4+
config.suffixes = [".txt"]
5+
config.test_format = lit.formats.ShTest()
6+
config.test_source_root = None
7+
config.test_exec_root = None
8+
config.substitutions.append(("%{python}", '"%s"' % (sys.executable)))

llvm/utils/lit/tests/shtest-glob.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## Tests glob pattern handling in echo command.
2+
3+
# RUN: not %{lit} -a -v %{inputs}/shtest-glob \
4+
# RUN: | FileCheck -dump-input=fail -match-full-lines %s
5+
#
6+
# END.
7+
8+
# CHECK: UNRESOLVED: shtest-glob :: glob-echo.txt ({{[^)]*}})
9+
# CHECK: TypeError: string argument expected, got 'GlobItem'
10+
11+
# CHECK: FAIL: shtest-glob :: glob-mkdir.txt ({{[^)]*}}
12+
# CHECK: # error: command failed with exit status: 1

0 commit comments

Comments
 (0)