[libc++abi][libunwind] Run c++abi and unwind tests against a fake install root (#110171)
This is what we started doing in libc++ and it straightens up a lot of things that only happened to work before, notably the presence of relative rpaths in dylibs when running from the build tree. This unlocks the ability to link against a just-built dylib but run against another version of the dylib (for example the system-provided one), which is necessary for proper backdeployment testing. This patch adds a lot of code duplication between the libc++ and libc++abi testing setups. However, there is already a large amount of duplication and the only real way to get rid of it is to merge libc++abi into libc++. In a way, this patch is a step in that direction because it closes the gap between the two libraries' testing setup.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# This testing configuration handles running the test suite against LLVM's libc++
|
||||
# using either a DLL or a static library, with MinGW/Clang on Windows.
|
||||
# using a DLL with MinGW/Clang on Windows.
|
||||
|
||||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# This testing configuration handles running the test suite against LLVM's libc++
|
||||
# using either a DLL or a static library, with MinGW/Clang on Windows.
|
||||
# using a static library with MinGW/Clang on Windows.
|
||||
|
||||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
|
||||
|
||||
|
||||
@@ -306,7 +306,6 @@ endif()
|
||||
|
||||
# Add a meta-target for both libraries.
|
||||
add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS})
|
||||
add_dependencies(cxxabi-test-depends cxxabi cxx)
|
||||
|
||||
if (LIBCXXABI_INSTALL_LIBRARY)
|
||||
install(TARGETS ${LIBCXXABI_INSTALL_TARGETS}
|
||||
|
||||
@@ -8,6 +8,57 @@ macro(pythonize_bool var)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
set(LIBCXXABI_TESTING_INSTALL_PREFIX "${LIBCXXABI_BINARY_DIR}/test-suite-install")
|
||||
add_custom_target(libcxxabi-install-cxx-for-testing
|
||||
DEPENDS cxx-headers
|
||||
cxx
|
||||
cxx_experimental
|
||||
cxx-modules
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_COMPONENT=cxx-headers
|
||||
-DCMAKE_INSTALL_PREFIX="${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_COMPONENT=cxx-modules
|
||||
-DCMAKE_INSTALL_PREFIX="${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_COMPONENT=cxx
|
||||
-DCMAKE_INSTALL_PREFIX="${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
|
||||
add_dependencies(cxxabi-test-depends libcxxabi-install-cxx-for-testing)
|
||||
|
||||
add_custom_target(libcxxabi-install-cxxabi-for-testing
|
||||
DEPENDS cxxabi-headers
|
||||
cxxabi
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_COMPONENT=cxxabi-headers
|
||||
-DCMAKE_INSTALL_PREFIX="${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_COMPONENT=cxxabi
|
||||
-DCMAKE_INSTALL_PREFIX="${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
|
||||
add_dependencies(cxxabi-test-depends libcxxabi-install-cxxabi-for-testing)
|
||||
|
||||
if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind)
|
||||
add_custom_target(libcxxabi-install-unwind-for-testing
|
||||
DEPENDS unwind-headers
|
||||
unwind
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_COMPONENT=unwind-headers
|
||||
-DCMAKE_INSTALL_PREFIX="${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_COMPONENT=unwind
|
||||
-DCMAKE_INSTALL_PREFIX="${LIBCXXABI_TESTING_INSTALL_PREFIX}"
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
|
||||
add_dependencies(cxxabi-test-depends libcxxabi-install-unwind-for-testing)
|
||||
endif()
|
||||
|
||||
pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)
|
||||
|
||||
set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!")
|
||||
|
||||
@@ -27,10 +27,11 @@ config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR@', 'test')
|
||||
config.host_triple = '@LLVM_HOST_TRIPLE@'
|
||||
|
||||
config.substitutions.append(('%{libcxx}', '@LIBCXXABI_LIBCXX_PATH@'))
|
||||
config.substitutions.append(('%{include}', '@LIBCXXABI_SOURCE_DIR@/include'))
|
||||
config.substitutions.append(('%{cxx-include}', '@LIBCXXABI_HEADER_DIR@/include/c++/v1'))
|
||||
config.substitutions.append(('%{cxx-target-include}', '@LIBCXXABI_HEADER_DIR@/include/%{triple}/c++/v1'))
|
||||
config.substitutions.append(('%{lib}', '@LIBCXXABI_LIBRARY_DIR@'))
|
||||
config.substitutions.append(('%{install-prefix}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@'))
|
||||
config.substitutions.append(('%{include}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/include'))
|
||||
config.substitutions.append(('%{cxx-include}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/@LIBCXXABI_INSTALL_INCLUDE_DIR@'))
|
||||
config.substitutions.append(('%{cxx-target-include}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/include/%{triple}/c++/v1'))
|
||||
config.substitutions.append(('%{lib}', '@LIBCXXABI_TESTING_INSTALL_PREFIX@/@LIBCXXABI_INSTALL_LIBRARY_DIR@'))
|
||||
|
||||
if @LIBCXXABI_USE_LLVM_UNWINDER@:
|
||||
config.substitutions.append(('%{maybe-include-libunwind}', '-I "@LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL@"'))
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# This testing configuration handles running the test suite against LLVM's libc++abi
|
||||
# using either a DLL or a static library, with MinGW/Clang on Windows.
|
||||
# using a static library merged into libc++ with MinGW/Clang on Windows.
|
||||
|
||||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
|
||||
|
||||
@@ -11,7 +11,7 @@ config.substitutions.append(('%{link_flags}',
|
||||
'-nostdlib++ -L %{lib} -lc++'
|
||||
))
|
||||
config.substitutions.append(('%{exec}',
|
||||
'%{executor} --execdir %T --prepend_env PATH=%{lib} -- '
|
||||
'%{executor} --execdir %T --prepend_env PATH=%{install-prefix}/bin -- '
|
||||
))
|
||||
|
||||
import os, site
|
||||
|
||||
@@ -68,7 +68,11 @@ set(LIBUNWIND_LIBRARY_VERSION "1.0" CACHE STRING
|
||||
this also controls the linker's 'current_version' property.")
|
||||
|
||||
if(MINGW)
|
||||
set(LIBUNWIND_DEFAULT_TEST_CONFIG "llvm-libunwind-mingw.cfg.in")
|
||||
if (LIBUNWIND_ENABLE_SHARED)
|
||||
set(LIBUNWIND_DEFAULT_TEST_CONFIG "llvm-libunwind-shared-mingw.cfg.in")
|
||||
else()
|
||||
set(LIBUNWIND_DEFAULT_TEST_CONFIG "llvm-libunwind-static-mingw.cfg.in")
|
||||
endif()
|
||||
elseif (LIBUNWIND_ENABLE_SHARED)
|
||||
set(LIBUNWIND_DEFAULT_TEST_CONFIG "llvm-libunwind-shared.cfg.in")
|
||||
else()
|
||||
|
||||
@@ -8,6 +8,20 @@ macro(pythonize_bool var)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
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")
|
||||
|
||||
pythonize_bool(LIBUNWIND_ENABLE_CET)
|
||||
pythonize_bool(LIBUNWIND_ENABLE_GCS)
|
||||
pythonize_bool(LIBUNWIND_ENABLE_THREADS)
|
||||
@@ -48,4 +62,4 @@ configure_lit_site_cfg(
|
||||
|
||||
add_lit_testsuite(check-unwind "Running libunwind tests"
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
DEPENDS unwind)
|
||||
DEPENDS libunwind-install-unwind-for-testing)
|
||||
|
||||
@@ -29,5 +29,6 @@ if not @LIBUNWIND_ENABLE_THREADS@:
|
||||
config.available_features.add('libunwind-no-threads')
|
||||
|
||||
# Add substitutions for bootstrapping the test suite configuration
|
||||
config.substitutions.append(('%{include}', '@LIBUNWIND_SOURCE_DIR@/include'))
|
||||
config.substitutions.append(('%{lib}', '@LIBUNWIND_LIBRARY_DIR@'))
|
||||
config.substitutions.append(('%{install-prefix}', '@LIBUNWIND_TESTING_INSTALL_PREFIX@'))
|
||||
config.substitutions.append(('%{include}', '@LIBUNWIND_TESTING_INSTALL_PREFIX@/include'))
|
||||
config.substitutions.append(('%{lib}', '@LIBUNWIND_TESTING_INSTALL_PREFIX@/lib'))
|
||||
|
||||
25
libunwind/test/configs/llvm-libunwind-shared-mingw.cfg.in
Normal file
25
libunwind/test/configs/llvm-libunwind-shared-mingw.cfg.in
Normal file
@@ -0,0 +1,25 @@
|
||||
# This testing configuration handles running the test suite against LLVM's libunwind
|
||||
# using a DLL with MinGW/Clang on Windows.
|
||||
|
||||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
|
||||
|
||||
config.substitutions.append(('%{flags}', ''))
|
||||
config.substitutions.append(('%{compile_flags}',
|
||||
'-nostdinc++ -I %{include} -funwind-tables'
|
||||
))
|
||||
config.substitutions.append(('%{link_flags}',
|
||||
'-L %{lib} -lunwind'
|
||||
))
|
||||
config.substitutions.append(('%{exec}',
|
||||
'%{executor} --execdir %T --prepend_env PATH=%{install-prefix}/bin -- '
|
||||
))
|
||||
|
||||
import os, site
|
||||
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
|
||||
import libcxx.test.params, libcxx.test.config
|
||||
libcxx.test.config.configure(
|
||||
libcxx.test.params.DEFAULT_PARAMETERS,
|
||||
libcxx.test.features.DEFAULT_FEATURES,
|
||||
config,
|
||||
lit_config
|
||||
)
|
||||
@@ -1,5 +1,5 @@
|
||||
# This testing configuration handles running the test suite against LLVM's libunwind
|
||||
# using either a DLL or a static library, with MinGW/Clang on Windows.
|
||||
# using a static library with MinGW/Clang on Windows.
|
||||
|
||||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
|
||||
|
||||
Reference in New Issue
Block a user