diff --git a/utils/build.ps1 b/utils/build.ps1 index 477f02b63fd8c..708e88be8b777 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -1757,7 +1757,9 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) { -Test ` -Src $SourceCache\swift-foundation ` -Bin $OutDir ` - -Arch $HostArch + -Arch $HostArch ` + -v ` + --very-verbose } $OutDir = Join-Path -Path $HostArch.BinaryCache -ChildPath foundation-tests @@ -2029,6 +2031,19 @@ function Install-Platform([Platform]$Platform, $Arch) { } Copy-File "$($Arch.XCTestInstallRoot)\usr\lib\swift\$($Platform.ToString().ToLowerInvariant())\$($Arch.LLVMName)\XCTest.swiftmodule" "$XCTestInstallRoot\usr\lib\swift\$($Platform.ToString().ToLowerInvariant())\XCTest.swiftmodule\$($Arch.LLVMTarget).swiftmodule" Copy-File "$($Arch.XCTestInstallRoot)\usr\lib\swift\$($Platform.ToString().ToLowerInvariant())\$($Arch.LLVMName)\XCTest.swiftdoc" "$XCTestInstallRoot\usr\lib\swift\$($Platform.ToString().ToLowerInvariant())\XCTest.swiftmodule\$($Arch.LLVMTarget).swiftdoc" + + # Copy Testing + $SwiftTestingInstallRoot = [IO.Path]::Combine((Get-InstallDir $HostArch), "Platforms", "${Platform}.platform", "Developer", "Library", "Testing-development") + switch ($Platform) { + Windows { + Copy-File "$($Arch.SwiftTestingInstallRoot)\usr\bin\Testing.dll" "$SwiftTestingInstallRoot\usr\$($Arch.BinaryDir)\" + Copy-File "$($Arch.SwiftTestingInstallRoot)\usr\lib\swift\windows\Testing.lib" "$SwiftTestingInstallRoot\usr\lib\swift\windows\$($Arch.LLVMName)\" + } + default { + Copy-File "$($Arch.SwiftTestingInstallRoot)\usr\lib\swift\$($Platform.ToString().ToLowerInvariant())\libTesting.so" "$SwiftTestingInstallRoot\usr\lib\$($Arch.BinaryDir)\" + } + } + Copy-Directory "$($Arch.SwiftTestingInstallRoot)\usr\lib\swift\$($Platform.ToString().ToLowerInvariant())\Testing.swiftmodule" "$SwiftTestingInstallRoot\usr\lib\swift\$($Platform.ToString().ToLowerInvariant())\" } function Build-SQLite($Arch) {