Skip to content

[test] lit.cfg: Wrap all substitutions with capture group refs in SubstituteCaptures #81764

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 1 commit into from
May 27, 2025
Merged

[test] lit.cfg: Wrap all substitutions with capture group refs in SubstituteCaptures #81764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 38 additions & 28 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,19 +1190,26 @@ def use_interpreter_for_simple_runs():
# path.
result += (
'env SWIFT_INTERPRETER=%r %s %r %s -module-name main %s %s %s '
% (config.swift, xcrun_prefix, config.swift, target_options,
config.swift_test_options,
config.swift_driver_test_options,
swift_execution_tests_extra_flags))
% (
escape_for_substitute_captures(config.swift),
escape_for_substitute_captures(xcrun_prefix),
escape_for_substitute_captures(config.swift),
escape_for_substitute_captures(target_options),
escape_for_substitute_captures(config.swift_test_options),
escape_for_substitute_captures(config.swift_driver_test_options),
escape_for_substitute_captures(swift_execution_tests_extra_flags)
)
)
if stdlib:
result += '-Xfrontend -disable-access-control '
if parameterized:
result += ' \\1 '
result += r' \1 '
if gyb:
result += '%t/main.swift'
else:
result += '%s'
return result
return SubstituteCaptures(result)

config.target_run_stdlib_swiftgyb = make_simple_target_run(gyb=True)
config.target_run_simple_swiftgyb = make_simple_target_run(gyb=True)
config.target_run_stdlib_swift = make_simple_target_run(stdlib=True)
Expand Down Expand Up @@ -1597,11 +1604,12 @@ if run_vendor == 'apple':
"%s %s %s" %
(xcrun_prefix, config.clangxx, config.target_cc_options))

config.target_build_swift_dylib = (
"%s -parse-as-library -emit-library -o '\\1' "
"-Xlinker -install_name -Xlinker @executable_path/$(basename '\\1')"
% (config.target_build_swift))
config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
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')"
)
config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')

target_future = format('%s-apple-%s%s%s' % (run_cpu, run_os, target_future_version, run_environment))

Expand Down Expand Up @@ -1833,10 +1841,11 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
config.swift_test_options, config.swift_driver_test_options,
swift_execution_tests_extra_flags))
config.target_codesign = "echo"
config.target_build_swift_dylib = (
"%s -parse-as-library -emit-library -o '\\1'"
% (config.target_build_swift))
config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -o '\1'"
)
config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
config.target_swift_frontend = (
'%s -target %s %s %s %s %s '
% (config.swift_frontend, config.variant_triple, config.resource_dir_opt, mcp_opt,
Expand Down Expand Up @@ -1926,11 +1935,11 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
config.resource_dir_opt, mcp_opt, config.swift_test_options,
config.swift_driver_test_options, swift_execution_tests_extra_flags])
config.target_codesign = "echo"
config.target_build_swift_dylib = ' '.join([
config.target_build_swift,
'-parse-as-library', '-emit-library',
'-o', "'\\1'"])
config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -o '\1'"
)
config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
config.target_swift_frontend = ' '.join([
config.swift_frontend,
'-target', config.variant_triple,
Expand Down Expand Up @@ -2010,9 +2019,10 @@ elif run_os == 'wasi':
mcp_opt, config.swift_test_options,
config.swift_driver_test_options, swift_execution_tests_extra_flags])
config.target_codesign = "echo"
config.target_build_swift_dylib = (
"%s -parse-as-library -emit-library -static -o '\\1'"
% (config.target_build_swift))
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -static -o '\1'"
)
config.target_add_rpath = ''
config.target_swift_frontend = ' '.join([
config.swift_frontend,
Expand Down Expand Up @@ -2093,9 +2103,10 @@ elif config.external_embedded_platform:
mcp_opt, config.swift_test_options,
config.swift_driver_test_options, swift_execution_tests_extra_flags])
config.target_codesign = "echo"
config.target_build_swift_dylib = (
"%s -parse-as-library -emit-library -static -o '\\1'"
% (config.target_build_swift))
config.target_build_swift_dylib = SubstituteCaptures(
f"{escape_for_substitute_captures(config.target_build_swift)}"
r" -parse-as-library -emit-library -static -o '\1'"
)
config.target_add_rpath = ''
config.target_swift_frontend = ' '.join([
config.swift_frontend,
Expand Down Expand Up @@ -2965,8 +2976,7 @@ config.substitutions.insert(0, ('%target-static-library-name\(([^)]+)\)',
SubstituteCaptures(r'%s\1%s' % (
escape_for_substitute_captures(config.target_static_library_prefix),
escape_for_substitute_captures(config.target_static_library_suffix)))))
config.substitutions.append(('%target-rpath\(([^)]+)\)',
SubstituteCaptures(config.target_add_rpath)))
config.substitutions.append(('%target-rpath\(([^)]+)\)', config.target_add_rpath))

config.substitutions.append(('%target-resilience-test', config.target_resilience_test))

Expand Down