Skip to content

Rework lit.cfg regex to avoid basename subshell in substitution #84583

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.

Sign up for GitHub

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
Sep 30, 2025
Merged

Rework lit.cfg regex to avoid basename subshell in substitution #84583

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c964411
Rework lit.cfg regex to avoid basename subshell in substituion
ramonasuncion Sep 30, 2025
dc879cc
Update %target-build-swift-dylib regex to handle backslashes
ramonasuncion Sep 30, 2025
c85f8b7
Add comments explaining regex capture groups in lit.cfg
ramonasuncion Sep 30, 2025
3a21c45
Fix output path substitution in %target-build-swift-dylib
ramonasuncion Sep 30, 2025
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
19 changes: 11 additions & 8 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,8 +1665,8 @@ if run_vendor == 'apple':

config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -o '\1'"
r" -Xlinker -install_name -Xlinker @executable_path/$(basename '\1')"
r" -parse-as-library -emit-library -o '\1\2'"
r" -Xlinker -install_name -Xlinker @executable_path/\2"
)
config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')

Expand Down Expand Up @@ -1764,7 +1764,7 @@ elif run_os in ['windows-msvc']:
subst_target_swift_frontend_mock_sdk_after = ''

config.target_build_swift_dylib = \
SubstituteCaptures(r"%s -parse-as-library -emit-library -o \1" % (
SubstituteCaptures(r"%s -parse-as-library -emit-library -o \1\2" % (
escape_for_substitute_captures(config.target_build_swift)))
config.target_add_rpath = r''

Expand Down Expand Up @@ -1902,7 +1902,7 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
config.target_codesign = "echo"
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -o '\1'"
r" -parse-as-library -emit-library -o '\1\2'"
)
config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
config.target_swift_frontend = (
Expand Down Expand Up @@ -1996,7 +1996,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
config.target_codesign = "echo"
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -o '\1'"
r" -parse-as-library -emit-library -o '\1\2'"
)
config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
config.target_swift_frontend = ' '.join([
Expand Down Expand Up @@ -2083,7 +2083,7 @@ elif kIsWASI:
config.target_codesign = "echo"
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -static -o '\1'"
r" -parse-as-library -emit-library -static -o '\1\2'"
)
config.target_add_rpath = ''
config.target_swift_frontend = ' '.join([
Expand Down Expand Up @@ -2167,7 +2167,7 @@ elif config.external_embedded_platform:
config.target_codesign = "echo"
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -static -o '\1'"
r" -parse-as-library -emit-library -static -o '\1\2'"
)
config.target_add_rpath = ''
config.target_swift_frontend = ' '.join([
Expand Down Expand Up @@ -2938,7 +2938,10 @@ config.substitutions.append(('%target-run-stdlib-swift', config.target_run_stdli
config.substitutions.append(('%target-repl-run-simple-swift', subst_target_repl_run_simple_swift))
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))
# Capture groups:
# \1 = path before the file name (non-greedy)
# \2 = file name (last component, no slashes or parentheses)
config.substitutions.append(('%target-build-swift-dylib\(([^)]+?)([^/\\()]+)\)', config.target_build_swift_dylib))
config.substitutions.append(('%target-codesign', config.target_codesign))
config.substitutions.append(('%target-build-swift', config.target_build_swift))
config.substitutions.append(('%target-clang', config.target_clang))
Expand Down