Skip to content

[Windows] Stop using multiroot data file #83693

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 2 commits into from
Aug 13, 2025
Merged

[Windows] Stop using multiroot data file #83693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b48d052
Revert "[Windows] Use a multiroot data file to test (corelibs-)founda…
ahoppen Aug 13, 2025
8ef0e2a
Add comment to `-j 1` for Foundation test execution
ahoppen Aug 13, 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
13 changes: 3 additions & 10 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2834,17 +2834,12 @@ function Build-Foundation {
}

function Test-Foundation {
$ScratchPath = "$BinaryCache\$($BuildPlatform.Triple)\FoundationTests"

# Foundation tests build via swiftpm rather than CMake
Build-SPMProject `
-Action Test `
-Src $SourceCache\swift-foundation `
-Bin "$ScratchPath" `
-Platform $BuildPlatform `
-Configuration $FoundationTestConfiguration `
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
--test-product swift-foundationPackageTests
-Bin "$BinaryCache\$($BuildPlatform.Triple)\CoreFoundationTests" `
-Platform $BuildPlatform

Invoke-IsolatingEnvVars {
$env:DISPATCH_INCLUDE_PATH="$(Get-SwiftSDK $BuildPlatform.OS)/usr/include"
Expand All @@ -2856,11 +2851,9 @@ function Test-Foundation {
Build-SPMProject `
-Action Test `
-Src $SourceCache\swift-corelibs-foundation `
-Bin "$ScratchPath" `
-Bin "$BinaryCache\$($BuildPlatform.Triple)\FoundationTests" `
-Platform $BuildPlatform `
-Configuration $FoundationTestConfiguration `
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
--test-product swift-corelibs-foundationPackageTests `
-j 1 # Running parallel causes a non-deterministic crash in CI only, see https://github.com/swiftlang/swift/issues/83606
}
}
Expand Down
3 changes: 0 additions & 3 deletions utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.