Skip to content

Commit 2fb3d12

Browse files
authored
Merge pull request #66172 from Michael137/bugfix/lldb-buildbots-skip-lldb-tests-to-5.9
[cherry-pick][release/5.9] [Build] Don't configure LLDB with tests enabled if the tests will be skipped
2 parents 67453a1 + c64830b commit 2fb3d12

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

utils/build-presets.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ skip-early-swift-driver
320320
#===------------------------------------------------------------------------===#
321321

322322
[preset: buildbot_incremental_base]
323+
libcxx
323324
test
324325
validation-test
325326
lit-args=-v --time-tests

utils/build-script-impl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2187,6 +2187,12 @@ for host in "${ALL_HOSTS[@]}"; do
21872187
DOTEST_ARGS="${DOTEST_ARGS};-E;${DOTEST_EXTRA}"
21882188
fi
21892189

2190+
if [[ "${SKIP_TEST_LLDB}" ]]; then
2191+
should_configure_tests="FALSE"
2192+
else
2193+
should_configure_tests=$(false_true ${BUILD_TOOLCHAIN_ONLY})
2194+
fi
2195+
21902196
cmake_options=(
21912197
"${cmake_options[@]}"
21922198
-C${LLDB_SOURCE_DIR}/cmake/caches/${cmake_cache}
@@ -2205,7 +2211,7 @@ for host in "${ALL_HOSTS[@]}"; do
22052211
-DLLDB_ENABLE_PYTHON=ON
22062212
-DLLDB_ENABLE_LZMA=OFF
22072213
-DLLDB_ENABLE_LUA=OFF
2208-
-DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY})
2214+
-DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}"
22092215
-DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}"
22102216
-DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}"
22112217
)

0 commit comments

Comments
 (0)