Skip to content

Commit 8fc1257

Browse files
authored
Merge pull request swiftlang#39752 from porglezomp-misc/upload-dylibs-concurrency-back-deploy
2 parents 8304b00 + 6f4b798 commit 8fc1257

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

test/lit.cfg

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,6 +1720,11 @@ back_deployment_runtime = lit_config.params.get('back_deployment_runtime', None)
17201720
if back_deployment_runtime is not None:
17211721
config.available_features.add('back_deployment_runtime')
17221722

1723+
concurrency_back_deploy_path = ''
1724+
if run_vendor == 'apple':
1725+
if 'back_deploy_concurrency' in config.available_features:
1726+
concurrency_back_deploy_path = os.path.join(os.path.dirname(swift_obj_root), os.path.basename(swift_obj_root).replace("swift-", "backdeployconcurrency-"), 'lib', 'swift-5.5', run_os)
1727+
17231728
if 'remote_run_host' in lit_config.params:
17241729
if 'remote_run_tmpdir' not in lit_config.params:
17251730
lit_config.fatal("'remote_run_host' provided, but no "
@@ -1773,6 +1778,9 @@ if 'remote_run_host' in lit_config.params:
17731778
# FIXME: This could be more principled.
17741779
upload_dylibs(os.path.join(test_resource_dir, "clang", "lib", "darwin"))
17751780
upload_dylibs(os.path.join(test_resource_dir, "clang", "lib", "linux"))
1781+
# Only copy when we have use_os_stdlib, otherwise we want to rely on the just-build concurrency
1782+
if concurrency_back_deploy_path and 'use_os_stdlib' in lit_config.params:
1783+
upload_dylibs(concurrency_back_deploy_path)
17761784

17771785
# FIXME: Uploading specific files in bin/ is not very scalable.
17781786
local_swift_reflection_test = lit.util.which(
@@ -1983,14 +1991,11 @@ if not kIsWindows:
19831991
else:
19841992
config.available_features.add('use_os_stdlib')
19851993
os_stdlib_path = ''
1986-
concurrency_back_deploy_path = ''
19871994
if run_vendor == 'apple':
19881995
#If we get swift-in-the-OS for non-Apple platforms, add a condition here
19891996
os_stdlib_path = "/usr/lib/swift"
19901997
if run_os == 'maccatalyst':
19911998
os_stdlib_path = "/System/iOSSupport/usr/lib/swift:/usr/lib/swift"
1992-
if 'back_deploy_concurrency' in config.available_features:
1993-
concurrency_back_deploy_path = os.path.join(os.path.dirname(swift_obj_root), os.path.basename(swift_obj_root).replace("swift-", "backdeployconcurrency-"), 'lib', 'swift-5.5', run_os)
19941999

19952000
all_stdlib_path = os.path.pathsep.join((os_stdlib_path, concurrency_back_deploy_path, target_stdlib_path))
19962001

0 commit comments

Comments
 (0)