Skip to content

Commit 36dee56

Browse files
authored
Enable swift-foundation tests on Windows in toolchain builds (#75811)
1 parent fd863f9 commit 36dee56

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

utils/build-windows-toolchain.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ set TMPDIR=%BuildRoot%\tmp
6060
set NINJA_STATUS=[%%f/%%t][%%p][%%es]
6161

6262
:: Build the -Test argument, if any, by subtracting skipped tests
63-
set TestArg=-Test swift,dispatch,xctest,
63+
set TestArg=-Test swift,dispatch,foundation,xctest,
6464
for %%I in (%SKIP_TESTS%) do (call set TestArg=%%TestArg:%%I,=%%)
6565
if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= )
6666

utils/build.ps1

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,17 +1662,18 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
16621662
-Arch $HostArch
16631663
}
16641664

1665-
$OutDir = Join-Path -Path $HostArch.BinaryCache -ChildPath foundation-tests
1666-
1667-
Isolate-EnvVars {
1668-
$env:SWIFTCI_USE_LOCAL_DEPS=1
1669-
$env:DISPATCH_INCLUDE_PATH="$($Arch.SDKInstallRoot)/usr/lib/swift"
1670-
Build-SPMProject `
1671-
-Test `
1672-
-Src $SourceCache\swift-corelibs-foundation `
1673-
-Bin $OutDir `
1674-
-Arch $HostArch
1675-
}
1665+
# swift-corelibs-foundation tests are disabled since the package does not build for Windows yet
1666+
# $OutDir = Join-Path -Path $HostArch.BinaryCache -ChildPath foundation-tests
1667+
1668+
# Isolate-EnvVars {
1669+
# $env:SWIFTCI_USE_LOCAL_DEPS=1
1670+
# $env:DISPATCH_INCLUDE_PATH="$($Arch.SDKInstallRoot)/usr/lib/swift"
1671+
# Build-SPMProject `
1672+
# -Test `
1673+
# -Src $SourceCache\swift-corelibs-foundation `
1674+
# -Bin $OutDir `
1675+
# -Arch $HostArch
1676+
# }
16761677
} else {
16771678
$DispatchBinaryCache = Get-TargetProjectBinaryCache $Arch Dispatch
16781679
$FoundationBinaryCache = Get-TargetProjectBinaryCache $Arch Foundation

0 commit comments

Comments
 (0)