From 0b893c7db6b6f5d8760f4d74b498eb66b00c22b3 Mon Sep 17 00:00:00 2001 From: "Bassam (Sam) Khouri" Date: Mon, 16 Jun 2025 16:15:43 -0400 Subject: [PATCH 1/2] Re-apply "Tests: enable Swift PM tests in Windows toolchain build" Reverts #82265, which re-applies #80405 Enable the SwiftPM tests in the Windows toolchain build to get extra confidence the change did not introduce any regression on the Windows platform. Fixes: swiftlang/swift-package-manager#8895 --- utils/build-windows-toolchain.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat index 0ffde78027b4e..ac4bc54e553ff 100644 --- a/utils/build-windows-toolchain.bat +++ b/utils/build-windows-toolchain.bat @@ -61,7 +61,7 @@ set TMPDIR=%BuildRoot%\tmp set NINJA_STATUS=[%%f/%%t][%%p][%%es] :: Build the -Test argument, if any, by subtracting skipped tests -set TestArg=-Test lld,lldb,swift,dispatch,foundation,xctest,swift-format,sourcekit-lsp, +set TestArg=-Test lld,lldb,swift,dispatch,foundation,xctest,swift-format,sourcekit-lsp,swiftpm, for %%I in (%SKIP_TESTS%) do (call set TestArg=%%TestArg:%%I,=%%) if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= ) From 3ac47b806ff6e578ef63c240f23b3d98ab5452b0 Mon Sep 17 00:00:00 2001 From: Sam Khouri Date: Mon, 7 Jul 2025 15:16:13 -0400 Subject: [PATCH 2/2] Windows: execute SwiftPM tesst in parallel --- utils/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build.ps1 b/utils/build.ps1 index b5a4375a61fc6..cf9bc421bdd8e 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -3582,7 +3582,7 @@ function Test-PackageManager() { } Build-SPMProject ` - -Action Test ` + -Action TestParallel ` -Src $SrcDir ` -Bin "$BinaryCache\$($HostPlatform.Triple)\PackageManagerTests" ` -Platform $HostPlatform `