[cherry-pick][release/5.9] [Build] Don't configure LLDB with tests enabled if the tests will be skipped #66172
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
The preset for ubsan/asan buildbots include the `buildbot_incremental_base` preset, which builds/runs tests. But the tests now require libcxx to be built since swiftlang#66018 (cherry picked from commit 7893c8e)
…skipped Currently the `--skip-test-lldb` flag will only skip *running* the tests. But we still pass `LLDB_INCLUDE_TESTS` to CMake when configuring LLDB. Since swiftlang#66018 configuring LLDB tests will now always require libcxx to be built. For some presets (e.g., `buildbot_osx_package`) we don't need to build libcxx and we explicitly pass `--skip-test-lldb`; this means if we were to try configure LLDB tests we would hard error. The proposed solution is to check whether the user wants to skip LLDB tests, and if so, set `LLDB_INCLUDE_TESTS=FALSE`. rdar://109774179 (cherry picked from commit 2d41efe)
|
@swift-ci test |
adrian-prantl
approved these changes
May 26, 2023
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.
Currently the
--skip-test-lldbflag will only skip running thetests. But we still pass
LLDB_INCLUDE_TESTSto CMake when configuringLLDB.
Since #66018 configuring LLDB tests will
now always require libcxx to be built. For some presets (e.g.,
buildbot_osx_package) we don't need to build libcxx and we explicitlypass
--skip-test-lldb; this means if we were to try configure LLDBtests we would hard error.
The proposed solution is to check whether the user wants to skip LLDB
tests, and if so, set
LLDB_INCLUDE_TESTS=FALSE.rdar://109774179