Skip to content

[cherry-pick][release/5.9] [Build] Make sure lldb API tests run against newly built libcxx #66026

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

Merged
merged 1 commit into from
May 22, 2023
Merged

[cherry-pick][release/5.9] [Build] Make sure lldb API tests run against newly built libcxx #66026

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,8 @@ skip-test-watchos-host

# This is a mixin preset which builds and smoke-tests lldb.
[preset: lldb-smoketest,tools=RA]
# Build libcxx for tests
libcxx
# Build LLDB
lldb

Expand All @@ -299,6 +301,8 @@ lldb-test-swift-only
lldb-assertions

[preset: lldb-pull-request]
# Build libcxx for tests
libcxx
lldb
lit-args=-v

Expand Down
8 changes: 3 additions & 5 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@ for host in "${ALL_HOSTS[@]}"; do
libcxx)
build_targets=(cxx)
cmake_options=(
-DLLVM_ENABLE_RUNTIMES="libcxx" -DLIBCXX_INSTALL_LIBRARY=OFF
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DLIBCXX_INSTALL_LIBRARY=OFF
"${cmake_options[@]}"
"${llvm_cmake_options[@]}"
)
Expand Down Expand Up @@ -2126,6 +2126,7 @@ for host in "${ALL_HOSTS[@]}"; do
cmark_build_dir=$(build_directory ${host} cmark)
lldb_build_dir=$(build_directory ${host} lldb)
swift_build_dir=$(build_directory ${host} swift)
libcxx_build_dir=$(build_directory ${host} libcxx)

# Add any lldb extra cmake arguments here.

Expand Down Expand Up @@ -2205,6 +2206,7 @@ for host in "${ALL_HOSTS[@]}"; do
-DLLDB_ENABLE_LZMA=OFF
-DLLDB_ENABLE_LUA=OFF
-DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY})
-DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}"
-DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}"
)

Expand Down Expand Up @@ -2650,10 +2652,6 @@ for host in "${ALL_HOSTS[@]}"; do
call env "${EXTRA_DISTCC_OPTIONS[@]}" "${CMAKE}" "${cmake_options[@]}" "${EXTRA_CMAKE_OPTIONS[@]}" "${source_dir}"
fi

if [[ "${product}" == "libcxx" ]]; then
continue
fi

# Build.
if [[ $(not ${SKIP_BUILD}) ]]; then
if [[ "${CMAKE_GENERATOR}" == "Xcode" ]] ; then
Expand Down