Skip to content

utils: adjust the swift-testing build to match style #75985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2024
Merged

utils: adjust the swift-testing build to match style #75985

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ enum TargetComponent {
Dispatch
Foundation
XCTest
SwiftTesting
Testing
}

function Get-TargetProjectBinaryCache($Arch, [TargetComponent]$Project) {
Expand Down Expand Up @@ -1831,8 +1831,8 @@ function Build-XCTest([Platform]$Platform, $Arch, [switch]$Test = $false) {
}
}

function Build-SwiftTesting([Platform]$Platform, $Arch, [switch]$Test = $false) {
$SwiftTestingBinaryCache = Get-TargetProjectBinaryCache $Arch SwiftTesting
function Build-Testing([Platform]$Platform, $Arch, [switch]$Test = $false) {
$SwiftTestingBinaryCache = Get-TargetProjectBinaryCache $Arch Testing

Isolate-EnvVars {
if ($Test) {
Expand Down Expand Up @@ -2467,7 +2467,7 @@ if (-not $SkipBuild) {
Invoke-BuildStep Build-TestingMacros -Build Windows $BuildArch
Invoke-BuildStep Build-Foundation Windows $Arch
Invoke-BuildStep Build-XCTest Windows $Arch
Invoke-BuildStep Build-SwiftTesting Windows $Arch
Invoke-BuildStep Build-Testing Windows $Arch
Invoke-BuildStep Write-PlatformInfoPlist $Arch
}

Expand All @@ -2482,7 +2482,7 @@ if (-not $SkipBuild) {
Invoke-BuildStep Build-Dispatch Android $Arch
Invoke-BuildStep Build-Foundation Android $Arch
Invoke-BuildStep Build-XCTest Android $Arch
Invoke-BuildStep Build-SwiftTesting Android $Arch
Invoke-BuildStep Build-Testing Android $Arch
Invoke-BuildStep Write-PlatformInfoPlist $Arch
}
}
Expand Down Expand Up @@ -2567,7 +2567,7 @@ if (-not $IsCrossCompiling) {
Build-XCTest Windows $HostArch -Test
}
if ($Test -contains "testing") {
Build-SwiftTesting Windows $HostArch -Test
Build-Testing Windows $HostArch -Test
}
if ($Test -contains "llbuild") { Build-LLBuild $HostArch -Test }
if ($Test -contains "swiftpm") { Test-PackageManager $HostArch }
Expand Down