[libunwind] 6fd55bb - [libunwind] Add a from-scratch config for running libunwind tests
Louis Dionne via cfe-commits
cfe-commits at lists.llvm.org
Tue Oct 19 09:04:05 PDT 2021
Author: Louis Dionne
Date: 2021-10-19T12:03:58-04:00
New Revision: 6fd55bba61bb4df98f9485b8d3cfc9e956d992b8
URL: https://github.com/llvm/llvm-project/commit/6fd55bba61bb4df98f9485b8d3cfc9e956d992b8
DIFF: https://github.com/llvm/llvm-project/commit/6fd55bba61bb4df98f9485b8d3cfc9e956d992b8.diff
LOG: [libunwind] Add a from-scratch config for running libunwind tests
Running tests for libunwind is a lot simpler than running tests for
libc++, so a simple Lit config file is sufficient. The benefit is that
we disentangle the libunwind test configuration from the libc++ and
libc++abi test configuration. The setup was too complicated, which led
to some bugs (notably we were running against the system libunwind on
Apple platforms).
Differential Revision: https://reviews.llvm.org/D111664
Added:
libunwind/test/configs/llvm-libunwind-shared.cfg.in
libunwind/test/configs/llvm-libunwind-static.cfg.in
Modified:
libcxx/utils/ci/run-buildbot
libcxx/utils/libcxx/test/dsl.py
libunwind/CMakeLists.txt
libunwind/test/forceunwind.pass.cpp
libunwind/test/frameheadercache_test.pass.cpp
libunwind/test/libunwind_01.pass.cpp
libunwind/test/libunwind_02.pass.cpp
libunwind/test/signal_frame.pass.cpp
libunwind/test/signal_unwind.pass.cpp
libunwind/test/unwind_leaffunction.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 71177b979b8d0..22c4b4fe008f5 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -199,102 +199,117 @@ check-generated-output)
generic-cxx03)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx03.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-cxx11)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx11.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-cxx14)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx14.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-cxx17)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx17.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-cxx20)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx20.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-cxx2b)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx2b.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-assertions)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-assertions.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-debug-iterators)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-debug-iterators.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
check-abi-list
;;
generic-noexceptions)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-noexceptions.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-modules)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-modules.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-static)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-static.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-static.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-static.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-static.cfg.in"
check-runtimes
;;
generic-32bit)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-32bits.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-clang-11)
export CC=clang-11
export CXX=clang++-11
clean
- generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-clang-12)
export CC=clang-12
export CXX=clang++-12
clean
- generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-gcc)
export CC=gcc-11
export CXX=g++-11
clean
- generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared-gcc.cfg.in"
+ generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared-gcc.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-gcc-cxx11)
@@ -302,79 +317,92 @@ generic-gcc-cxx11)
export CXX=g++-11
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx11.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared-gcc.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared-gcc.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-asan)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-asan.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-msan)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-msan.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-tsan)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-tsan.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-ubsan)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-ubsan.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-with_llvm_unwinder)
clean
generate-cmake -DLIBCXXABI_USE_LLVM_UNWINDER=ON \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-singlethreaded)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-singlethreaded.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-no-debug)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-debug.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-no-filesystem)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-filesystem.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-no-random_device)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-random_device.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-no-localization)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-localization.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-no-unicode)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-unicode.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
generic-no-wide-characters)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-wide-characters.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
apple-system)
@@ -427,7 +455,8 @@ apple-system-backdeployment-*)
;;
benchmarks)
clean
- generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ generate-cmake -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-cxx-benchmarks
;;
documentation)
@@ -456,7 +485,8 @@ runtimes-build)
-DLLVM_RUNTIME_TARGETS="x86_64-unknown-linux-gnu" \
-DLLVM_ENABLE_ASSERTIONS=ON \
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-modules.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
echo "+++ Running the libc++ and libc++abi tests"
${NINJA} -C "${BUILD_DIR}" check-runtimes
@@ -528,7 +558,8 @@ legacy-standalone)
aarch64)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
aarch64-noexceptions)
@@ -536,33 +567,38 @@ aarch64-noexceptions)
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake" \
-DLIBCXX_ENABLE_EXCEPTIONS=OFF \
-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
# Aka Armv8 32 bit
armv8)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Arm.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
armv8-noexceptions)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
# Armv7 32 bit. One building Arm only one Thumb only code.
armv7)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Arm.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
armv7-noexceptions)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake" \
- -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" \
+ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
check-runtimes
;;
windows-dll)
diff --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py
index 7476978ebbbd4..1bbd543e21d03 100644
--- a/libcxx/utils/libcxx/test/dsl.py
+++ b/libcxx/utils/libcxx/test/dsl.py
@@ -194,15 +194,20 @@ def compilerMacros(config, flags=''):
If the optional `flags` argument (a string) is provided, these flags will
be added to the compiler invocation when generating the macros.
+
+ If we fail to extract the compiler macros because of a compiler error, None
+ is returned instead.
"""
with _makeConfigTest(config) as test:
with open(test.getSourcePath(), 'w') as sourceFile:
# Make sure files like <__config> are included, since they can define
# additional macros.
- sourceFile.write("#include <cstddef>")
+ sourceFile.write("#include <stddef.h>")
unparsedOutput, err, exitCode, timeoutInfo = _executeScriptInternal(test, [
"%{{cxx}} %s -dM -E %{{flags}} %{{compile_flags}} {}".format(flags)
])
+ if exitCode != 0:
+ return None
parsedMacros = dict()
defines = (l.strip() for l in unparsedOutput.split('\n') if l.startswith('#define '))
for line in defines:
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
index 7a8bfae7cca40..59d489b909e43 100644
--- a/libunwind/CMakeLists.txt
+++ b/libunwind/CMakeLists.txt
@@ -89,9 +89,9 @@ set(LIBUNWIND_TEST_COMPILER_FLAGS "" CACHE STRING
"Additional compiler flags for test programs.")
set(LIBUNWIND_TEST_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/test/lit.site.cfg.in" CACHE STRING
"The path to the Lit testing configuration to use when running the tests.
- If a relative path is provided, it is assumed to be relative to '<monorepo>/libcxx/test/configs'.")
+ If a relative path is provided, it is assumed to be relative to '<monorepo>/libunwind/test/configs'.")
if (NOT IS_ABSOLUTE "${LIBUNWIND_TEST_CONFIG}")
- set(LIBUNWIND_TEST_CONFIG "${LIBUNWIND_LIBCXX_PATH}/test/configs/${LIBUNWIND_TEST_CONFIG}")
+ set(LIBUNWIND_TEST_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/test/configs/${LIBUNWIND_TEST_CONFIG}")
endif()
set(LIBUNWIND_TEST_PARAMS "" CACHE STRING
"A list of parameters to run the Lit test suite with.")
diff --git a/libunwind/test/configs/llvm-libunwind-shared.cfg.in b/libunwind/test/configs/llvm-libunwind-shared.cfg.in
new file mode 100644
index 0000000000000..5ba78521709c5
--- /dev/null
+++ b/libunwind/test/configs/llvm-libunwind-shared.cfg.in
@@ -0,0 +1,64 @@
+ at AUTO_GEN_COMMENT@
+
+ at SERIALIZED_LIT_PARAMS@
+
+#
+# Configuration file for running the libunwind tests against the shared library.
+#
+# This file is a lot simpler than the ones for libc++ and libc++abi because
+# while libunwind is written in C++, it doesn't use the C++ Standard Library
+# so we don't need to set that up to run the tests correctly.
+#
+
+import os, site
+site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
+import libcxx.test.format
+
+# Basic configuration of the test suite
+config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
+config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
+config.test_format = libcxx.test.format.CxxStandardLibraryTest()
+config.recursiveExpansionLimit = 10
+config.test_exec_root = '@CMAKE_BINARY_DIR@'
+
+compile_flags = []
+link_flags = []
+if @LIBUNWIND_USES_ARM_EHABI@:
+ config.available_features.add('libunwind-arm-ehabi')
+
+if not @LIBUNWIND_ENABLE_THREADS@:
+ compile_flags.append('-D_LIBUNWIND_HAS_NO_THREADS')
+ config.available_features.add('libunwind-no-threads')
+
+if @LIBUNWIND_ENABLE_CET@:
+ compile_flags.append('-fcf-protection=full')
+
+if '@CMAKE_SYSTEM_NAME@' == 'Linux':
+ link_flags.append('-Wl,--export-dynamic')
+
+# Stack unwinding tests need unwinding tables and these are not generated by default on all targets.
+compile_flags.append('-funwind-tables')
+
+config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
+config.substitutions.append(('%{flags}',
+ '-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else ''
+))
+config.substitutions.append(('%{compile_flags}',
+ '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
+))
+config.substitutions.append(('%{link_flags}',
+ '-nodefaultlibs -L {0}/lib -Wl,-rpath,{0}/lib -lunwind -ldl -lc {1}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags))
+))
+config.substitutions.append(('%{exec}',
+ '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')
+))
+
+import os, site
+site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
+import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
+libcxx.test.newconfig.configure(
+ libcxx.test.params.DEFAULT_PARAMETERS,
+ libcxx.test.features.DEFAULT_FEATURES,
+ config,
+ lit_config
+)
diff --git a/libunwind/test/configs/llvm-libunwind-static.cfg.in b/libunwind/test/configs/llvm-libunwind-static.cfg.in
new file mode 100644
index 0000000000000..6d3f4f0185e1f
--- /dev/null
+++ b/libunwind/test/configs/llvm-libunwind-static.cfg.in
@@ -0,0 +1,66 @@
+ at AUTO_GEN_COMMENT@
+
+ at SERIALIZED_LIT_PARAMS@
+
+#
+# Configuration file for running the libunwind tests against the static library.
+#
+# This file is a lot simpler than the ones for libc++ and libc++abi because
+# while libunwind is written in C++, it doesn't use the C++ Standard Library
+# so we don't need to set that up to run the tests correctly.
+#
+
+import os, site
+site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
+import libcxx.test.format
+
+# Basic configuration of the test suite
+config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
+config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
+config.test_format = libcxx.test.format.CxxStandardLibraryTest()
+config.recursiveExpansionLimit = 10
+config.test_exec_root = '@CMAKE_BINARY_DIR@'
+
+compile_flags = []
+link_flags = []
+if @LIBUNWIND_USES_ARM_EHABI@:
+ config.available_features.add('libunwind-arm-ehabi')
+
+if not @LIBUNWIND_ENABLE_THREADS@:
+ compile_flags.append('-D_LIBUNWIND_HAS_NO_THREADS')
+ config.available_features.add('libunwind-no-threads')
+else:
+ link_flags.append('-lpthread')
+
+if @LIBUNWIND_ENABLE_CET@:
+ compile_flags.append('-fcf-protection=full')
+
+if '@CMAKE_SYSTEM_NAME@' == 'Linux':
+ link_flags.append('-Wl,--export-dynamic')
+
+# Stack unwinding tests need unwinding tables and these are not generated by default on all targets.
+compile_flags.append('-funwind-tables')
+
+config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
+config.substitutions.append(('%{flags}',
+ '-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else ''
+))
+config.substitutions.append(('%{compile_flags}',
+ '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
+))
+config.substitutions.append(('%{link_flags}',
+ '-nodefaultlibs {}/lib/libunwind.a -ldl -lc {}'.format('@CMAKE_BINARY_DIR@', ' '.join(link_flags))
+))
+config.substitutions.append(('%{exec}',
+ '{} {}/utils/run.py --execdir %T -- '.format(sys.executable, '@LIBUNWIND_LIBCXX_PATH@')
+))
+
+import os, site
+site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
+import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
+libcxx.test.newconfig.configure(
+ libcxx.test.params.DEFAULT_PARAMETERS,
+ libcxx.test.features.DEFAULT_FEATURES,
+ config,
+ lit_config
+)
diff --git a/libunwind/test/forceunwind.pass.cpp b/libunwind/test/forceunwind.pass.cpp
index a3191f8f74607..120663293df15 100644
--- a/libunwind/test/forceunwind.pass.cpp
+++ b/libunwind/test/forceunwind.pass.cpp
@@ -12,9 +12,6 @@
// TODO: Investigate these failures
// XFAIL: asan, tsan, ubsan
-// TODO: Investigate this failure
-// XFAIL: 32bits-on-64bits
-
// Basic test for _Unwind_ForcedUnwind.
// See libcxxabi/test/forced_unwind* tests too.
diff --git a/libunwind/test/frameheadercache_test.pass.cpp b/libunwind/test/frameheadercache_test.pass.cpp
index dd1d3dd93912c..a50b2b663b6ab 100644
--- a/libunwind/test/frameheadercache_test.pass.cpp
+++ b/libunwind/test/frameheadercache_test.pass.cpp
@@ -1,9 +1,6 @@
// TODO: Investigate these failures
// XFAIL: asan, tsan, ubsan
-// TODO: Investigate this failure
-// XFAIL: 32bits-on-64bits
-
// The other libunwind tests don't test internal interfaces, so the include path
// is a little wonky.
#include "../src/config.h"
diff --git a/libunwind/test/libunwind_01.pass.cpp b/libunwind/test/libunwind_01.pass.cpp
index aceb8bedf8e44..6c1e1bbe45cd7 100644
--- a/libunwind/test/libunwind_01.pass.cpp
+++ b/libunwind/test/libunwind_01.pass.cpp
@@ -1,11 +1,8 @@
// TODO: Investigate these failures
// XFAIL: asan, tsan, ubsan
-// TODO: Investigate these failures on x86_64 macOS
-// XFAIL: target=x86_64-apple-darwin{{.+}}
-
-// TODO: Investigate this failure
-// XFAIL: 32bits-on-64bits
+// TODO: Investigate these failures on x86_64 macOS back deployment
+// UNSUPPORTED: target=x86_64-apple-darwin{{.+}}
#include <libunwind.h>
#include <stdlib.h>
diff --git a/libunwind/test/libunwind_02.pass.cpp b/libunwind/test/libunwind_02.pass.cpp
index 64d8d5883132b..6eea7a34df127 100644
--- a/libunwind/test/libunwind_02.pass.cpp
+++ b/libunwind/test/libunwind_02.pass.cpp
@@ -1,9 +1,6 @@
// TODO: Investigate these failures
// XFAIL: asan, tsan, ubsan
-// TODO: Investigate this failure
-// XFAIL: 32bits-on-64bits
-
#include <assert.h>
#include <stdlib.h>
#include <unwind.h>
diff --git a/libunwind/test/signal_frame.pass.cpp b/libunwind/test/signal_frame.pass.cpp
index fea189794bc24..cfd4f484a18b7 100644
--- a/libunwind/test/signal_frame.pass.cpp
+++ b/libunwind/test/signal_frame.pass.cpp
@@ -15,9 +15,6 @@
// TODO: Investigate this failure on macOS
// XFAIL: target={{.+}}-apple-darwin{{.+}}
-// TODO: Investigate this failure
-// XFAIL: 32bits-on-64bits
-
// UNSUPPORTED: libunwind-arm-ehabi
#include <assert.h>
diff --git a/libunwind/test/signal_unwind.pass.cpp b/libunwind/test/signal_unwind.pass.cpp
index 5468c7f6724ea..12d9589e00717 100644
--- a/libunwind/test/signal_unwind.pass.cpp
+++ b/libunwind/test/signal_unwind.pass.cpp
@@ -13,9 +13,6 @@
// TODO: Investigate these failures
// XFAIL: asan, tsan, ubsan
-// TODO: Investigate this failure
-// XFAIL: 32bits-on-64bits
-
#include <assert.h>
#include <dlfcn.h>
#include <signal.h>
diff --git a/libunwind/test/unwind_leaffunction.pass.cpp b/libunwind/test/unwind_leaffunction.pass.cpp
index 8fc343304cde4..40374553dfbd4 100644
--- a/libunwind/test/unwind_leaffunction.pass.cpp
+++ b/libunwind/test/unwind_leaffunction.pass.cpp
@@ -13,9 +13,6 @@
// TODO: Investigate these failures
// XFAIL: asan, tsan, ubsan
-// TODO: Investigate this failure
-// XFAIL: 32bits-on-64bits
-
#include <assert.h>
#include <dlfcn.h>
#include <signal.h>
More information about the cfe-commits
mailing list