🍒 [lldb] make lit use the same PYTHONHOME for building and testing (#143183) #10811
+8
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…m#143183) When testing LLDB, we want to make sure to use the same Python as the one we used to build it. This patch used the CMake variable `Python3_ROOT_DIR` to set the `PYTHONHOME` env variable in LLDB lit tests, in order to ensure of this. Please see swiftlang/swift#82063 for the original issue.
| @@ -25,6 +25,7 @@ set_default("gold_executable", "@GOLD_EXECUTABLE@") | |||
| set_default("clang", "@COMPILER_RT_RESOLVED_TEST_COMPILER@") | |||
| set_default("compiler_id", "@COMPILER_RT_TEST_COMPILER_ID@") | |||
| set_default("python_executable", "@Python3_EXECUTABLE@") | |||
| set_default("python_root_dir", "@Python3_ROOT_DIR@") | |||
There was a problem hiding this comment.
Why is this change in compiler-rt necessary?
There was a problem hiding this comment.
It is not. I just checked by rerunning the tests without that setting. I thought this would set the default value for python_root_dir globally to all lit tests but this is not the case.
I will open a PR on upstream to remove it and cherry-pick it back to this PR.
There was a problem hiding this comment.
Fixed 👍
Should I squash the commits?
…3738) In llvm#143183 was mistakenly added a default value to `python_root_dir` in lit tests of compiler-rt. This is unused by the lit tests of compiler-rt, as it was meant to be used by `lldb`. This patch removes this change.
|
@swift-ci please test |
|
@swift-ci please test macOS |
adrian-prantl
approved these changes
Jun 17, 2025
adrian-prantl
deleted the
charles-zablit/lldb/use-common-pythonhome-to-6.2
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.