Skip to content

Commit 179dc98

Browse files
committed
utils: version testing frameworks
This adjusts the install location for the testing frameworks to be versioned with the product version. These are somewhat closely tied to the compiler, and it makes sense to tie them to the product version.
1 parent 9a8f827 commit 179dc98

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

utils/build.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -2405,7 +2405,7 @@ function Build-XCTest([Platform]$Platform, $Arch) {
24052405
Build-CMakeProject `
24062406
-Src $SourceCache\swift-corelibs-xctest `
24072407
-Bin $(Get-ProjectBinaryCache $Arch XCTest) `
2408-
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "XCTest-development", "usr"))" `
2408+
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "XCTest-$ProductVersion", "usr"))" `
24092409
-Arch $Arch `
24102410
-Platform $Platform `
24112411
-UseBuiltCompilers Swift `
@@ -2449,7 +2449,7 @@ function Build-Testing([Platform]$Platform, $Arch) {
24492449
Build-CMakeProject `
24502450
-Src $SourceCache\swift-testing `
24512451
-Bin (Get-ProjectBinaryCache $Arch Testing) `
2452-
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "Testing-development", "usr"))" `
2452+
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "Testing-$ProductVersion", "usr"))" `
24532453
-Arch $Arch `
24542454
-Platform $Platform `
24552455
-UseBuiltCompilers C,CXX,Swift `
@@ -2469,8 +2469,8 @@ function Build-Testing([Platform]$Platform, $Arch) {
24692469
function Write-PlatformInfoPlist([Platform] $Platform) {
24702470
$Settings = @{
24712471
DefaultProperties = @{
2472-
SWIFT_TESTING_VERSION = "development"
2473-
XCTEST_VERSION = "development"
2472+
SWIFT_TESTING_VERSION = "$ProductVersion"
2473+
XCTEST_VERSION = "$ProductVersion"
24742474
}
24752475
}
24762476
if ($Platform -eq [Platform]::Windows) {

0 commit comments

Comments
 (0)