Skip to content

Commit 4f3da95

Browse files
committed
utils: adjust the swift-testing build to match style
This renames the `Build-*` phase associated with building swift-testing. Rather than name it `Build-SwiftTesting` match the other functions and name it `Build-Testing`.
1 parent ebe1769 commit 4f3da95

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

utils/build.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ enum TargetComponent {
398398
Dispatch
399399
Foundation
400400
XCTest
401-
SwiftTesting
401+
Testing
402402
}
403403

404404
function Get-TargetProjectBinaryCache($Arch, [TargetComponent]$Project) {
@@ -1831,8 +1831,8 @@ function Build-XCTest([Platform]$Platform, $Arch, [switch]$Test = $false) {
18311831
}
18321832
}
18331833

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

18371837
Isolate-EnvVars {
18381838
if ($Test) {
@@ -2467,7 +2467,7 @@ if (-not $SkipBuild) {
24672467
Invoke-BuildStep Build-TestingMacros -Build Windows $BuildArch
24682468
Invoke-BuildStep Build-Foundation Windows $Arch
24692469
Invoke-BuildStep Build-XCTest Windows $Arch
2470-
Invoke-BuildStep Build-SwiftTesting Windows $Arch
2470+
Invoke-BuildStep Build-Testing Windows $Arch
24712471
Invoke-BuildStep Write-PlatformInfoPlist $Arch
24722472
}
24732473

@@ -2482,7 +2482,7 @@ if (-not $SkipBuild) {
24822482
Invoke-BuildStep Build-Dispatch Android $Arch
24832483
Invoke-BuildStep Build-Foundation Android $Arch
24842484
Invoke-BuildStep Build-XCTest Android $Arch
2485-
Invoke-BuildStep Build-SwiftTesting Android $Arch
2485+
Invoke-BuildStep Build-Testing Android $Arch
24862486
Invoke-BuildStep Write-PlatformInfoPlist $Arch
24872487
}
24882488
}
@@ -2567,7 +2567,7 @@ if (-not $IsCrossCompiling) {
25672567
Build-XCTest Windows $HostArch -Test
25682568
}
25692569
if ($Test -contains "testing") {
2570-
Build-SwiftTesting Windows $HostArch -Test
2570+
Build-Testing Windows $HostArch -Test
25712571
}
25722572
if ($Test -contains "llbuild") { Build-LLBuild $HostArch -Test }
25732573
if ($Test -contains "swiftpm") { Test-PackageManager $HostArch }

0 commit comments

Comments
 (0)