@@ -529,7 +529,7 @@ function Invoke-BuildStep([string] $Name) {
529529 & $Name @Args
530530
531531 if ($Summary ) {
532- Add-TimingData $BuildStepArch $BuildStepPlatform ( $Name -replace " Build- " , " " ) $Stopwatch.Elapsed
532+ Add-TimingData $BuildStepArch $BuildStepPlatform $Name $Stopwatch.Elapsed
533533 }
534534 if ($Name.Replace (" Build-" , " " ) -eq $BuildTo ) {
535535 exit 0
@@ -3287,21 +3287,23 @@ if (-not $IsCrossCompiling) {
32873287 " -TestLLVM" = $Test -contains " llvm" ;
32883288 " -TestSwift" = $Test -contains " swift" ;
32893289 }
3290+ # FIXME(compnerd) this involves fixing the specialised argument handling in
3291+ # `Invoke-BuildStep` to deal with the additional boolean parameters.
32903292 Build-Compilers $HostArch @Tests
32913293 }
32923294
3293- if ($Test -contains " dispatch" ) { Test-Dispatch }
3294- if ($Test -contains " foundation" ) { Test-Foundation }
3295- if ($Test -contains " xctest" ) { Test-XCTest }
3296- if ($Test -contains " testing" ) { Test-Testing }
3297- if ($Test -contains " llbuild" ) { Test-LLBuild }
3298- if ($Test -contains " swiftpm" ) { Test-PackageManager }
3299- if ($Test -contains " swift-format" ) { Test-Format }
3300- if ($Test -contains " sourcekit-lsp" ) { Test-SourceKitLSP }
3295+ if ($Test -contains " dispatch" ) { Invoke-BuildStep Test-Dispatch }
3296+ if ($Test -contains " foundation" ) { Invoke-BuildStep Test-Foundation }
3297+ if ($Test -contains " xctest" ) { Invoke-BuildStep Test-XCTest }
3298+ if ($Test -contains " testing" ) { Invoke-BuildStep Test-Testing }
3299+ if ($Test -contains " llbuild" ) { Invoke-BuildStep Test-LLBuild }
3300+ if ($Test -contains " swiftpm" ) { Invoke-BuildStep Test-PackageManager }
3301+ if ($Test -contains " swift-format" ) { Invoke-BuildStep Test-Format }
3302+ if ($Test -contains " sourcekit-lsp" ) { Invoke-BuildStep Test-SourceKitLSP }
33013303
33023304 if ($Test -contains " swift" ) {
33033305 foreach ($Arch in $AndroidSDKArchs ) {
3304- Test-Runtime Android $Arch
3306+ Invoke-BuildStep Test-Runtime Android $Arch
33053307 }
33063308 }
33073309}
0 commit comments