Skip to content

Commit d2a23d9

Browse files
author
Davide Italiano
committed
[build-script] Re-enable lldb unit tests in PR testing.
This have been disabled because they were flakey, but now we should have fixed the issues (or if there's something outstanding, well, it's the right time to fix). This is getting more important as we want to increase the set of `lit/` or `unittest`-style testcases.
1 parent 642cbba commit d2a23d9

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

utils/build-script-impl

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2731,22 +2731,20 @@ for host in "${ALL_HOSTS[@]}"; do
27312731
fi
27322732
lldb_build_dir=$(build_directory ${host} lldb)
27332733

2734-
if [[ ! "${LLDB_TEST_SWIFT_ONLY}" ]]; then
2735-
# Run the gtests.
2736-
if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "TRUE" ]] ; then
2737-
set_lldb_xcodebuild_options
2738-
# Run the LLDB unittests (gtests).
2739-
with_pushd ${LLDB_SOURCE_DIR} \
2740-
call xcodebuild -scheme lldb-gtest -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
2741-
rc=$?
2742-
if [[ "$rc" -ne 0 ]] ; then
2743-
>&2 echo "error: LLDB gtests failed"
2744-
exit 1
2745-
fi
2746-
else
2747-
with_pushd ${lldb_build_dir} \
2748-
${NINJA_BIN} check-lldb-unit
2734+
# Run the gtests.
2735+
if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "TRUE" ]] ; then
2736+
set_lldb_xcodebuild_options
2737+
# Run the LLDB unittests (gtests).
2738+
with_pushd ${LLDB_SOURCE_DIR} \
2739+
call xcodebuild -scheme lldb-gtest -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
2740+
rc=$?
2741+
if [[ "$rc" -ne 0 ]] ; then
2742+
>&2 echo "error: LLDB gtests failed"
2743+
exit 1
27492744
fi
2745+
else
2746+
with_pushd ${lldb_build_dir} \
2747+
${NINJA_BIN} check-lldb-unit
27502748
fi
27512749

27522750
swift_build_dir=$(build_directory ${host} swift)

0 commit comments

Comments
 (0)