Skip to content

Commit b48d052

Browse files
committed
Revert "[Windows] Use a multiroot data file to test (corelibs-)foundation on Windows"
This reverts commit 61f833c.
1 parent a868d92 commit b48d052

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

utils/build.ps1

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

28362836
function Test-Foundation {
2837-
$ScratchPath = "$BinaryCache\$($BuildPlatform.Triple)\FoundationTests"
2838-
28392837
# Foundation tests build via swiftpm rather than CMake
28402838
Build-SPMProject `
28412839
-Action Test `
28422840
-Src $SourceCache\swift-foundation `
2843-
-Bin "$ScratchPath" `
2844-
-Platform $BuildPlatform `
2845-
-Configuration $FoundationTestConfiguration `
2846-
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
2847-
--test-product swift-foundationPackageTests
2841+
-Bin "$BinaryCache\$($BuildPlatform.Triple)\CoreFoundationTests" `
2842+
-Platform $BuildPlatform
28482843

28492844
Invoke-IsolatingEnvVars {
28502845
$env:DISPATCH_INCLUDE_PATH="$(Get-SwiftSDK $BuildPlatform.OS)/usr/include"
@@ -2856,12 +2851,10 @@ function Test-Foundation {
28562851
Build-SPMProject `
28572852
-Action Test `
28582853
-Src $SourceCache\swift-corelibs-foundation `
2859-
-Bin "$ScratchPath" `
2854+
-Bin "$BinaryCache\$($BuildPlatform.Triple)\FoundationTests" `
28602855
-Platform $BuildPlatform `
28612856
-Configuration $FoundationTestConfiguration `
2862-
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
2863-
--test-product swift-corelibs-foundationPackageTests `
2864-
-j 1 # Running parallel causes a non-deterministic crash in CI only, see https://github.com/swiftlang/swift/issues/83606
2857+
-j 1
28652858
}
28662859
}
28672860

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

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

0 commit comments

Comments
 (0)