Skip to content

Commit 6dd6dc6

Browse files
test: SwiftPM has changed the init template
swiftlang/swift-package-manager@79d64b3
1 parent 146153c commit 6dd6dc6

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

test/lit.cfg

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ config.test_exec_root = lit_config.params.get(
2121
"/tmp/swift-extra-integration-tests")
2222

2323
config.available_features.add("platform="+platform.system())
24-
config.available_features.add("scheme="+lit_config.params.get("scheme", "main"))
24+
25+
# --param scheme=<scheme>
26+
scheme = lit_config.params.get("scheme", "main")
27+
config.scheme = scheme
28+
config.available_features.add("scheme="+scheme)
2529

2630
# --param swift-sdk=<swift-sdk-id>
2731
swift_sdk = lit_config.params.get("swift-sdk")

test/swift-sdk/lit.local.cfg

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ else:
1515
target_swift_build = f"{swift} build {swift_sdk_options}"
1616
config.substitutions.append(("%{target_swift_build}", target_swift_build))
1717

18+
copy_cmd = 'cp %s %t.dir/Sources/Check/Check.swift'
19+
if config.root.scheme in ["release-6.0", "release-6.1", "release-6.2"]:
20+
copy_cmd = 'cp %s %t.dir/Sources/main.swift'
21+
1822
simple_swift_build_steps = [
1923
'rm -rf %t.dir',
2024
'mkdir -p %t.dir',
2125
f'{swift} package init --package-path %t.dir --name Check --type executable',
22-
'cp %s %t.dir/Sources/Check/Check.swift',
26+
copy_cmd,
2327
f'{target_swift_build} --package-path %t.dir',
2428
]
2529
config.substitutions.append(("%{target_simple_swift_build}", " && ".join(simple_swift_build_steps)))

0 commit comments

Comments
 (0)