[windows][lldb] enable faster tests in CI

Author: charles-zablit

utils/build-windows-toolchain.bat

@@ -68,13 +68,18 @@ if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= )
 set SkipPackagingArg=-SkipPackaging
 if not "%SKIP_PACKAGING%"=="1" set "SkipPackagingArg= "
 
+:: Build the -WindowsSDKs argument, if any
+set "WindowsSDKsArg= "
+if not "%WINDOWS_SDKS%"=="" set "WindowsSDKsArg=-WindowsSDKs %WINDOWS_SDKS%"
+
 call :CloneRepositories || (exit /b 1)
 
 :: We only have write access to BuildRoot, so use that as the image root.
 powershell.exe -ExecutionPolicy RemoteSigned -File %~dp0build.ps1 ^
   -SourceCache %SourceRoot% ^
   -BinaryCache %BuildRoot% ^
   -ImageRoot %BuildRoot% ^
+  %WindowsSDKsArg% ^
   %SkipPackagingArg% ^
   %TestArg% ^
   -Stage %PackageRoot% ^

utils/build.ps1

@@ -1905,12 +1905,17 @@ function Test-Compilers([Hashtable] $Platform, [string] $Variant, [switch] $Test
       Write-Host "Copying '$RuntimeBinaryCache\bin\swiftCore.dll' to '$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin'"
       Copy-Item "$RuntimeBinaryCache\bin\swiftCore.dll" "$(Get-ProjectBinaryCache $BuildPlatform Compilers)\bin"
 
+      $PythonRoot = "$(Get-PythonPath $BuildPlatform)\tools"
+      $env:Path = "$PythonRoot;$env:Path"
+
       $TestingDefines += @{
         LLDB_INCLUDE_TESTS = "YES";
         # Check for required Python modules in CMake
         LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS = "YES";
         # No watchpoint support on windows: https://github.com/llvm/llvm-project/issues/24820
         LLDB_TEST_USER_ARGS = "--skip-category=watchpoint";
+        # Specify the correct PYTHONHOME to LLDB in tests. Can be removed when https://github.com/swiftlang/llvm-project/pull/10811 lands.
+        LLDB_TEST_COMMON_ARGS="--env PYTHONHOME=$PythonRoot";
         # gtest sharding breaks llvm-lit's --xfail and LIT_XFAIL inputs: https://github.com/llvm/llvm-project/issues/102264
         LLVM_LIT_ARGS = "-v --no-gtest-sharding --time-tests";
         # LLDB Unit tests link against this library
@@ -3434,19 +3439,21 @@ if (-not $SkipBuild) {
   Invoke-BuildStep Build-LLBuild $HostPlatform
   Invoke-BuildStep Build-ArgumentParser $HostPlatform
   Invoke-BuildStep Build-Driver $HostPlatform
-  Invoke-BuildStep Build-Crypto $HostPlatform
-  Invoke-BuildStep Build-Collections $HostPlatform
-  Invoke-BuildStep Build-ASN1 $HostPlatform
-  Invoke-BuildStep Build-Certificates $HostPlatform
-  Invoke-BuildStep Build-System $HostPlatform
-  Invoke-BuildStep Build-Build $HostPlatform
-  Invoke-BuildStep Build-PackageManager $HostPlatform
-  Invoke-BuildStep Build-Markdown $HostPlatform
-  Invoke-BuildStep Build-Format $HostPlatform
-  Invoke-BuildStep Build-LMDB $HostPlatform
-  Invoke-BuildStep Build-IndexStoreDB $HostPlatform
-  Invoke-BuildStep Build-SourceKitLSP $HostPlatform
-  Invoke-BuildStep Build-Inspect $HostPlatform
+  if (-not(Compare-Object $Test @("lldb"))) {
+    Invoke-BuildStep Build-Crypto $HostPlatform
+    Invoke-BuildStep Build-Collections $HostPlatform
+    Invoke-BuildStep Build-ASN1 $HostPlatform
+    Invoke-BuildStep Build-Certificates $HostPlatform
+    Invoke-BuildStep Build-System $HostPlatform
+    Invoke-BuildStep Build-Build $HostPlatform
+    Invoke-BuildStep Build-PackageManager $HostPlatform
+    Invoke-BuildStep Build-Markdown $HostPlatform
+    Invoke-BuildStep Build-Format $HostPlatform
+    Invoke-BuildStep Build-LMDB $HostPlatform
+    Invoke-BuildStep Build-IndexStoreDB $HostPlatform
+    Invoke-BuildStep Build-SourceKitLSP $HostPlatform
+    Invoke-BuildStep Build-Inspect $HostPlatform
+  }
 }
 
 Install-HostToolchain
@@ -3455,11 +3462,11 @@ if ($IncludeNoAsserts) {
   Build-NoAssertsToolchain
 }
 
-if (-not $SkipBuild) {
+if (-not $SkipBuild -and -not(Compare-Object $Test @("lldb"))) {
   Invoke-BuildStep Build-mimalloc $HostPlatform
 }
 
-if (-not $SkipBuild -and -not $IsCrossCompiling) {
+if (-not $SkipBuild -and -not $IsCrossCompiling -and -not(Compare-Object $Test @("lldb"))) {
   Invoke-BuildStep Build-DocC $HostPlatform
 }