utils: split Build-Dispatch into Build- and Test- function

Split up the test routines from the build routines. This is motivated by
the desire to simplify (remove logic flow) and to help get more accurate
timing data.

Author: compnerd

utils/build.ps1

@@ -2277,25 +2277,31 @@ function Write-SDKSettingsPlist([Platform]$Platform, $Arch) {
   $SDKSettings | ConvertTo-JSON | Out-FIle -FilePath "$(Get-SwiftSDK $Platform)\SDKSettings.json"
 }
 
-function Build-Dispatch([Platform]$Platform, $Arch, [switch]$Test = $false) {
-  Invoke-IsolatingEnvVars {
-    if ($Test) {
-      $Targets = @("default", "ExperimentalTest")
-      $InstallPath = ""
-      $env:CTEST_OUTPUT_ON_FAILURE = "YES"
-    } else {
-      $Targets = @("install")
-      $InstallPath = "$(Get-SwiftSDK $Platform)\usr"
+function Build-Dispatch([Platform]$Platform, $Arch) {
+  Build-CMakeProject `
+    -Src $SourceCache\swift-corelibs-libdispatch `
+    -Bin (Get-ProjectBinaryCache $Arch Dispatch) `
+    -InstallTo "$(Get-SwiftSDK $Platform)\usr" `
+    -Arch $Arch `
+    -Platform $Platform `
+    -UseBuiltCompilers C,CXX,Swift `
+    -Defines @{
+      ENABLE_SWIFT = "YES";
     }
+}
+
+function Test-Dispatch {
+  Invoke-IsolatingEnvVars {
+    $env:CTEST_OUTPUT_ON_FAILURE = "YES"
 
     Build-CMakeProject `
       -Src $SourceCache\swift-corelibs-libdispatch `
-      -Bin (Get-ProjectBinaryCache $Arch Dispatch) `
-      -InstallTo $InstallPath `
-      -Arch $Arch `
-      -Platform $Platform `
+      -Bin (Get-ProjectBinaryCache $BuildArch Dispatch) `
+      -Arch $BuildArch `
+      -Platform Windows `
       -BuildTargets $Targets `
-      -SwiftSDK (Get-SwiftSDK $Platform) `
+      -SwiftSDK (Get-SwiftSDK Windows) `
+      -BuildTargets default,ExperimentalTest `
       -UseBuiltCompilers C,CXX,Swift `
       -Defines @{
         ENABLE_SWIFT = "YES";
@@ -3280,9 +3286,7 @@ if (-not $IsCrossCompiling) {
     Build-Compilers $HostArch @Tests
   }
 
-  if ($Test -contains "dispatch") {
-    Build-Dispatch Windows $HostArch -Test
-  }
+  if ($Test -contains "dispatch") { Test-Dispatch }
   if ($Test -contains "foundation") { Test-Foundation }
   if ($Test -contains "xctest") { Test-XCTest }
   if ($Test -contains "testing") { Test-Testing }