Skip to content

Commit 821e260

Browse files
authored
Merge pull request #66880 from Michael137/bugfix/build-script-configure-lldb-tests
[Build] Introduce --lldb-configure-tests option
2 parents e9ff334 + 511c344 commit 821e260

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

utils/build-presets.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,6 +1416,10 @@ mixin-preset=
14161416
skip-test-lldb
14171417
skip-test-playgroundsupport
14181418

1419+
# Don't configure LLDB tests either since that
1420+
# would require us to build libcxx (rdar://109774179)
1421+
lldb-configure-tests=0
1422+
14191423
[preset: buildbot_osx_package,use_os_runtime]
14201424
mixin-preset=
14211425
buildbot_osx_package

utils/build-script-impl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ KNOWN_SETTINGS=(
174174
lldb-test-swift-compatibility "" "specify additional Swift compilers to test lldb with"
175175
lldb-test-swift-only "0" "when running lldb tests, only include Swift-specific tests"
176176
lldb-use-system-debugserver "" "don't try to codesign debugserver, and use the system's debugserver instead"
177+
lldb-configure-tests "1" "if set, will make sure we configure LLDB's test target without running the tests"
177178

178179
## LLVM Options
179180
llvm-enable-lto "" "Must be set to one of 'thin' or 'full'"
@@ -2197,7 +2198,7 @@ for host in "${ALL_HOSTS[@]}"; do
21972198
DOTEST_ARGS="${DOTEST_ARGS};-E;${DOTEST_EXTRA}"
21982199
fi
21992200

2200-
if [[ "${SKIP_TEST_LLDB}" ]]; then
2201+
if [[ $(true_false "${LLDB_CONFIGURE_TESTS}") == "FALSE" ]]; then
22012202
should_configure_tests="FALSE"
22022203
else
22032204
should_configure_tests=$(false_true ${BUILD_TOOLCHAIN_ONLY})

0 commit comments

Comments
 (0)