Skip to content

[build-script] Back out change to run lldb tests with lldb-dotest #15366

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

[build-script] Back out change to run lldb tests with lldb-dotest #15366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 13 additions & 31 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2841,42 +2841,24 @@ for host in "${ALL_HOSTS[@]}"; do
fi
call mkdir -p "${results_dir}"

# Prefer to use lldb-dotest, as building it guarantees that we build all
# test dependencies. Ultimately we want to delete as much lldb-specific logic
# from this file as possible and just have a single call to lldb-dotest.
dotest_extra_args=""
if [[ ! -z "${DOTEST_EXTRA}" ]] ; then
dotest_extra_args="-E ${DOTEST_EXTRA}"
fi
if [[ "$using_xcodebuild" == "FALSE" ]] ; then
with_pushd ${lldb_build_dir} \
${NINJA_BIN} lldb-dotest

lldb_dotest="${lldb_build_dir}"/bin/lldb-dotest
with_pushd ${results_dir} \
call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \
SWIFTLIBS="${swift_build_dir}/lib/swift" \
${lldb_dotest} \
${LLDB_TEST_SUBDIR_CLAUSE} \
${LLDB_TEST_CATEGORIES} \
${LLDB_FORMATTER_OPTS} \
--build-dir "${lldb_build_dir}/lldb-test-build.noindex" \
${dotest_extra_args}
else
with_pushd "${results_dir}" \
call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \
SWIFTLIBS="${swift_build_dir}/lib/swift" \
"${LLDB_SOURCE_DIR}"/test/dotest.py \
--executable "${lldb_executable}" \
${LLDB_TEST_DEBUG_SERVER} \
${LLDB_TEST_SUBDIR_CLAUSE} \
${LLDB_TEST_CATEGORIES} \
${LLDB_DOTEST_CC_OPTS} \
${LLDB_FORMATTER_OPTS} \
--build-dir "${lldb_build_dir}/lldb-test-build.noindex" \
${dotest_extra_args}
fi

with_pushd "${results_dir}" \
call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \
SWIFTLIBS="${swift_build_dir}/lib/swift" \
"${LLDB_SOURCE_DIR}"/test/dotest.py \
--executable "${lldb_executable}" \
${LLDB_TEST_DEBUG_SERVER} \
${LLDB_TEST_SUBDIR_CLAUSE} \
${LLDB_TEST_CATEGORIES} \
${LLDB_DOTEST_CC_OPTS} \
${LLDB_FORMATTER_OPTS} \
--build-dir "${lldb_build_dir}/lldb-test-build.noindex" \
-E "${DOTEST_EXTRA}"

continue
;;
llbuild)
Expand Down