Skip to content

Commit d3d8576

Browse files
authored
Merge pull request #80122 from ahoppen/windows-multiroot-data-file
[Windows] Use a multiroot data file to test (corelibs-)foundation on Windows
2 parents a2aa336 + 61f833c commit d3d8576

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

utils/build.ps1

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,12 +2828,17 @@ function Build-Foundation {
28282828
}
28292829

28302830
function Test-Foundation {
2831+
$ScratchPath = "$BinaryCache\$($BuildPlatform.Triple)\FoundationTests"
2832+
28312833
# Foundation tests build via swiftpm rather than CMake
28322834
Build-SPMProject `
28332835
-Action Test `
28342836
-Src $SourceCache\swift-foundation `
2835-
-Bin "$BinaryCache\$($BuildPlatform.Triple)\CoreFoundationTests" `
2836-
-Platform $BuildPlatform
2837+
-Bin "$ScratchPath" `
2838+
-Platform $BuildPlatform `
2839+
-Configuration $FoundationTestConfiguration `
2840+
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
2841+
--test-product swift-foundationPackageTests
28372842

28382843
Invoke-IsolatingEnvVars {
28392844
$env:DISPATCH_INCLUDE_PATH="$(Get-SwiftSDK $BuildPlatform.OS)/usr/include"
@@ -2845,10 +2850,12 @@ function Test-Foundation {
28452850
Build-SPMProject `
28462851
-Action Test `
28472852
-Src $SourceCache\swift-corelibs-foundation `
2848-
-Bin "$BinaryCache\$($BuildPlatform.Triple)\FoundationTests" `
2853+
-Bin "$ScratchPath" `
28492854
-Platform $BuildPlatform `
28502855
-Configuration $FoundationTestConfiguration `
2851-
-j 1
2856+
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
2857+
--test-product swift-corelibs-foundationPackageTests `
2858+
-j 1 # Running parallel causes a non-deterministic crash in CI only, see https://github.com/swiftlang/swift/issues/83606
28522859
}
28532860
}
28542861

utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)