@@ -529,7 +529,7 @@ function Invoke-BuildStep([string] $Name) {
529
529
& $Name @Args
530
530
531
531
if ($Summary ) {
532
- Add-TimingData $BuildStepArch $BuildStepPlatform ( $Name -replace " Build- " , " " ) $Stopwatch.Elapsed
532
+ Add-TimingData $BuildStepArch $BuildStepPlatform $Name $Stopwatch.Elapsed
533
533
}
534
534
if ($Name.Replace (" Build-" , " " ) -eq $BuildTo ) {
535
535
exit 0
@@ -3287,21 +3287,23 @@ if (-not $IsCrossCompiling) {
3287
3287
" -TestLLVM" = $Test -contains " llvm" ;
3288
3288
" -TestSwift" = $Test -contains " swift" ;
3289
3289
}
3290
+ # FIXME(compnerd) this involves fixing the specialised argument handling in
3291
+ # `Invoke-BuildStep` to deal with the additional boolean parameters.
3290
3292
Build-Compilers $HostArch @Tests
3291
3293
}
3292
3294
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 }
3301
3303
3302
3304
if ($Test -contains " swift" ) {
3303
3305
foreach ($Arch in $AndroidSDKArchs ) {
3304
- Test-Runtime Android $Arch
3306
+ Invoke-BuildStep Test-Runtime Android $Arch
3305
3307
}
3306
3308
}
3307
3309
}
0 commit comments