Rework lit.cfg regex to avoid basename subshell in substitution #84583
Conversation
Changed %target-build-swift-dylib\(([^)]+)\) to %target-build-swift-dylib\(([^)]+?)([^/()]+)\) Group 1 now captures the "prefix" and group 2 captures the final word Captured the basename directly in the regex instead of using a subshell since Lit's internal shell does not support
|
@swift-ci please smoke test |
test/lit.cfg
Outdated
| config.substitutions.append(('%target-run', config.target_run)) | ||
| config.substitutions.append(('%target-jit-run', subst_target_jit_run)) | ||
| config.substitutions.append(('%target-build-swift-dylib\(([^)]+)\)', config.target_build_swift_dylib)) | ||
| config.substitutions.append(('%target-build-swift-dylib\(([^)]+?)([^/()]+)\)', config.target_build_swift_dylib)) |
There was a problem hiding this comment.
Could you add a comment describing that the file name is captured by \2 and the rest of the path by \1? Regexes are notoriously hard to read.
There was a problem hiding this comment.
Oh and also you'll likely need to adjust this to handle Windows paths as well. But if you want you can wait for the Windows test results to arrive to know for sure.
|
Do I need to update all the other |
Ah yup, those also need to be updated |
ramonasuncion
force-pushed
the
fix-lit-regex-basename
branch
from
0f72ce1 to
3a21c45
Compare
ramonasuncion
changed the title
|
@swift-ci please smoke test |
|
🙌 It passed! |
2 participants
Changed %target-build-swift-dylib(([^)]+)) to %target-build-swift-dylib(([^)]+?)([^/()]+))
Group 1 now captures the pat and group 2 captures the file name
Captured the basename directly in the regex instead of using a subshell since Lit's internal shell does not support
Partially address #84407