Skip to content

[libunwind] Make sure libunwind test dependencies are installed before running tests #171474

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
ldionne merged 6 commits into from
Dec 10, 2025
Merged

[libunwind] Make sure libunwind test dependencies are installed before running tests #171474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be09c59
[libunwind] Make sure libunwind test dependencies are installed befor…
ldionne Dec 9, 2025
95e2300
Fix build when libc++ is not included in the build
ldionne Dec 9, 2025
ead7697
Make sure we also install libc++abi to the fake-test-install location
ldionne Dec 9, 2025
56e5a63
Modernize and refactor per review comments
ldionne Dec 9, 2025
5e65d35
Run installation targets serially to avoid races
ldionne Dec 9, 2025
84bca3d
Revert "Run installation targets serially to avoid races"
ldionne Dec 9, 2025
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
3 changes: 3 additions & 0 deletions libunwind/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,9 @@ if (RUNTIMES_EXECUTE_ONLY_CODE)
add_compile_definitions(_LIBUNWIND_EXECUTE_ONLY_CODE)
endif()

add_custom_target(unwind-test-depends
COMMENT "Build dependencies required to run the libunwind test suite.")

#===============================================================================
# Setup Source Code
#===============================================================================
Expand Down
29 changes: 16 additions & 13 deletions libunwind/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,22 @@ macro(pythonize_bool var)
endif()
endmacro()

# Install targets required to run libunwind tests into a temporary location.
#
# This ensures that we run the tests against the final installed products, which
# is closer to what we actually ship than the contents of the build tree.
set(LIBUNWIND_TESTING_INSTALL_PREFIX "${LIBUNWIND_BINARY_DIR}/test-suite-install")
add_custom_target(libunwind-install-unwind-for-testing
DEPENDS unwind-headers
unwind
COMMAND ${CMAKE_COMMAND} -E make_directory "${LIBUNWIND_TESTING_INSTALL_PREFIX}"
COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=unwind-headers
-DCMAKE_INSTALL_PREFIX="${LIBUNWIND_TESTING_INSTALL_PREFIX}"
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
COMMAND "${CMAKE_COMMAND}"
-DCMAKE_INSTALL_COMPONENT=unwind
-DCMAKE_INSTALL_PREFIX="${LIBUNWIND_TESTING_INSTALL_PREFIX}"
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
set(libunwind_test_suite_install_targets unwind-headers unwind)
if ("libcxx" IN_LIST LLVM_ENABLE_RUNTIMES)
list(APPEND libunwind_test_suite_install_targets cxx-headers cxx cxx_experimental cxx-modules cxxabi-headers cxxabi)
endif()
foreach(target IN LISTS libunwind_test_suite_install_targets)
add_custom_target(libunwind-test-suite-install-${target} DEPENDS "${target}"
COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_BINARY_DIR}"
--prefix "${LIBUNWIND_TESTING_INSTALL_PREFIX}"
--component "${target}")
add_dependencies(unwind-test-depends libunwind-test-suite-install-${target})
endforeach()

pythonize_bool(LIBUNWIND_ENABLE_CET)
pythonize_bool(LIBUNWIND_ENABLE_GCS)
Expand Down Expand Up @@ -62,4 +65,4 @@ configure_lit_site_cfg(

add_lit_testsuite(check-unwind "Running libunwind tests"
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS libunwind-install-unwind-for-testing)
DEPENDS unwind-test-depends)
Loading