Skip to content

[build-script] Re-enable lldb unit tests in PR testing. #14714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions utils/build-script-impl
Original file line number Diff line number Diff line change
Expand Up @@ -2731,22 +2731,20 @@ for host in "${ALL_HOSTS[@]}"; do
fi
lldb_build_dir=$(build_directory ${host} lldb)

if [[ ! "${LLDB_TEST_SWIFT_ONLY}" ]]; then
# Run the gtests.
if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "TRUE" ]] ; then
set_lldb_xcodebuild_options
# Run the LLDB unittests (gtests).
with_pushd ${LLDB_SOURCE_DIR} \
call xcodebuild -scheme lldb-gtest -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
rc=$?
if [[ "$rc" -ne 0 ]] ; then
>&2 echo "error: LLDB gtests failed"
exit 1
fi
else
with_pushd ${lldb_build_dir} \
${NINJA_BIN} check-lldb-unit
# Run the gtests.
if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "TRUE" ]] ; then
set_lldb_xcodebuild_options
# Run the LLDB unittests (gtests).
with_pushd ${LLDB_SOURCE_DIR} \
call xcodebuild -scheme lldb-gtest -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
rc=$?
if [[ "$rc" -ne 0 ]] ; then
>&2 echo "error: LLDB gtests failed"
exit 1
fi
else
with_pushd ${lldb_build_dir} \
${NINJA_BIN} check-lldb-unit
fi

swift_build_dir=$(build_directory ${host} swift)
Expand Down