Skip to content

Commit 47c20df

Browse files
committed
[DNM] Log all the things
1 parent 4becc5d commit 47c20df

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

utils/build.ps1

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,11 @@ if ($WindowsSDKArchitectures.Length -eq 1) { $WindowsSDKArchitectures = $Windows
199199

200200
if ($Test.Length -eq 1) { $Test = $Test[0].Split(",") }
201201

202-
if ($Test -contains "*") {
203-
# Explicitly don't include llbuild yet since tests are known to fail on Windows
204-
$Test = @("lld", "lldb", "swift", "dispatch", "foundation", "xctest", "swift-format", "sourcekit-lsp")
205-
}
202+
#if ($Test -contains "*") {
203+
# # Explicitly don't include llbuild yet since tests are known to fail on Windows
204+
# $Test = @("lld", "lldb", "swift", "dispatch", "foundation", "xctest", "swift-format", "sourcekit-lsp")
205+
#}
206+
$Test = @("foundation")
206207

207208
## Declare static build and build tool parameters.
208209

@@ -1802,10 +1803,11 @@ function Build-SPMProject {
18021803
}
18031804
Test {
18041805
$ActionName = "test"
1806+
$Arguments += @("-v")
18051807
}
18061808
TestParallel {
18071809
$ActionName = "test"
1808-
$Arguments += @("--parallel")
1810+
$Arguments += @("--parallel", "-v")
18091811
}
18101812
}
18111813

@@ -2850,8 +2852,10 @@ function Test-Foundation {
28502852
-Src $SourceCache\swift-foundation `
28512853
-Bin "$ScratchPath" `
28522854
-Platform $BuildPlatform `
2855+
-Configuration $FoundationTestConfiguration `
28532856
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
2854-
--test-product swift-foundationPackageTests
2857+
--test-product swift-foundationPackageTests `
2858+
-j 2
28552859

28562860
Invoke-IsolatingEnvVars {
28572861
$env:DISPATCH_INCLUDE_PATH="$(Get-SwiftSDK $BuildPlatform.OS)/usr/include"
@@ -2865,8 +2869,10 @@ function Test-Foundation {
28652869
-Src $SourceCache\swift-corelibs-foundation `
28662870
-Bin "$ScratchPath" `
28672871
-Platform $BuildPlatform `
2872+
-Configuration $FoundationTestConfiguration `
28682873
--multiroot-data-file "$SourceCache\swift\utils\build_swift\resources\SwiftPM-Unified-Build.xcworkspace" `
2869-
--test-product swift-corelibs-foundationPackageTests
2874+
--test-product swift-corelibs-foundationPackageTests `
2875+
-j 2
28702876
}
28712877
}
28722878

@@ -3202,6 +3208,7 @@ function Build-Driver([Hashtable] $Platform) {
32023208
-UseBuiltCompilers C,CXX,Swift `
32033209
-SwiftSDK (Get-SwiftSDK $Platform.OS) `
32043210
-Defines @{
3211+
CMAKE_BUILD_TYPE = "Debug";
32053212
BUILD_SHARED_LIBS = "YES";
32063213
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
32073214
TSC_DIR = (Get-ProjectCMakeModules $Platform ToolsSupportCore);

0 commit comments

Comments
 (0)