From d2afcf1ba84bc551560d9c3511c403af6acd2b30 Mon Sep 17 00:00:00 2001 From: Charles Zablit Date: Fri, 6 Jun 2025 16:22:56 +0100 Subject: [PATCH 1/3] [windows] fix missing environment variable when running check-lldb --- utils/build.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/build.ps1 b/utils/build.ps1 index 0d834f224cd04..2a9c61687d176 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -1894,12 +1894,15 @@ function Test-Compilers([Hashtable] $Platform, [switch] $TestClang, [switch] $Te 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"; + LLDB_TEST_USER_ARGS = "--env PYTHONHOME=$PythonRoot --skip-category=watchpoint"; # 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 From 431602306f5132a2dcebb43c0c1c854c07967b8d Mon Sep 17 00:00:00 2001 From: Charles Zablit Date: Fri, 6 Jun 2025 19:06:52 +0100 Subject: [PATCH 2/3] do not set PYTHONHOME manually --- utils/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build.ps1 b/utils/build.ps1 index 2a9c61687d176..2f48ea441779c 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -1902,7 +1902,7 @@ function Test-Compilers([Hashtable] $Platform, [switch] $TestClang, [switch] $Te # 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 = "--env PYTHONHOME=$PythonRoot --skip-category=watchpoint"; + LLDB_TEST_USER_ARGS = "--skip-category=watchpoint"; # 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 From b5a79cf2c27a5f4f6b1eab3d38e2c44ee81c00fc Mon Sep 17 00:00:00 2001 From: Charles Zablit Date: Mon, 9 Jun 2025 11:21:29 +0100 Subject: [PATCH 3/3] Update utils/build.ps1 Co-authored-by: Saleem Abdulrasool --- utils/build.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/build.ps1 b/utils/build.ps1 index 2f48ea441779c..77c427d6f444c 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -1894,8 +1894,7 @@ function Test-Compilers([Hashtable] $Platform, [switch] $TestClang, [switch] $Te 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" + $env:Path = "$(Get-PythonPath $BuildPlatform)\tools;$env:Path" $TestingDefines += @{ LLDB_INCLUDE_TESTS = "YES";