diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-04-20 23:40:35 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-04-20 23:40:35 +0000 |
| commit | 096d636a3543a6164c67dac44de238122867e82f (patch) | |
| tree | e1e1af36a9235b8c501d15f89f2221f0e50073c7 /libcxxabi | |
| parent | b2d291eb9b8fb94a2f560126b64afe8f55832506 (diff) | |
| download | llvm-096d636a3543a6164c67dac44de238122867e82f.zip llvm-096d636a3543a6164c67dac44de238122867e82f.tar.gz llvm-096d636a3543a6164c67dac44de238122867e82f.tar.bz2 | |
Fix PR25874 - cxa_thread_atexit_test.pass.cpp has an incorrect XFAIL.
llvm-svn: 300925
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libcxxabi/test/cxa_thread_atexit_test.pass.cpp | 5 | ||||
| -rw-r--r-- | libcxxabi/test/libcxxabi/test/config.py | 3 | ||||
| -rw-r--r-- | libcxxabi/test/lit.site.cfg.in | 1 |
4 files changed, 0 insertions, 10 deletions
diff --git a/libcxxabi/test/CMakeLists.txt b/libcxxabi/test/CMakeLists.txt index f0c10ec..c1819d7 100644 --- a/libcxxabi/test/CMakeLists.txt +++ b/libcxxabi/test/CMakeLists.txt @@ -18,7 +18,6 @@ pythonize_bool(LIBCXXABI_ENABLE_THREADS) pythonize_bool(LIBCXXABI_ENABLE_EXCEPTIONS) pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER) pythonize_bool(LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY) -pythonize_bool(LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL) set(LIBCXXABI_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING "TargetInfo to use when setting up test environment.") set(LIBCXXABI_EXECUTOR "None" CACHE STRING diff --git a/libcxxabi/test/cxa_thread_atexit_test.pass.cpp b/libcxxabi/test/cxa_thread_atexit_test.pass.cpp index f612848..56984f0 100644 --- a/libcxxabi/test/cxa_thread_atexit_test.pass.cpp +++ b/libcxxabi/test/cxa_thread_atexit_test.pass.cpp @@ -10,11 +10,6 @@ // UNSUPPORTED: libcxxabi-no-threads // REQUIRES: linux -// this test will only work if CMake detects a real __cxa_thread_atexit_impl -// at configure time. This function, however, was added only in glibc 2.18, -// and there are still plenty of systems only using 2.17 (Ex RHEL 7). -// XFAIL: libcxxabi-no-cxa-thread-atexit-impl - #include <assert.h> #include <cxxabi.h> diff --git a/libcxxabi/test/libcxxabi/test/config.py b/libcxxabi/test/libcxxabi/test/config.py index 75da244..d24fc5b 100644 --- a/libcxxabi/test/libcxxabi/test/config.py +++ b/libcxxabi/test/libcxxabi/test/config.py @@ -45,9 +45,6 @@ class Configuration(LibcxxConfiguration): # test_exception_storage_nodynmem.pass.cpp fails under this specific configuration if self.get_lit_bool('cxx_ext_threads', False) and self.get_lit_bool('libcxxabi_shared', False): self.config.available_features.add('libcxxabi-shared-externally-threaded') - if not self.get_lit_bool('has_cxa_thread_atexit_impl', True): - self.config.available_features.add( - 'libcxxabi-no-cxa-thread-atexit-impl') if not self.get_lit_bool('llvm_unwinder', False): self.config.available_features.add('libcxxabi-has-system-unwinder') diff --git a/libcxxabi/test/lit.site.cfg.in b/libcxxabi/test/lit.site.cfg.in index faa8df9..0e40a29 100644 --- a/libcxxabi/test/lit.site.cfg.in +++ b/libcxxabi/test/lit.site.cfg.in @@ -21,7 +21,6 @@ config.host_triple = "@LLVM_HOST_TRIPLE@" config.target_triple = "@TARGET_TRIPLE@" config.use_target = len("@LIBCXXABI_TARGET_TRIPLE@") > 0 config.cxx_ext_threads = "@LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY@" -config.has_cxa_thread_atexit_impl = "@LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL@" # Let the main config do the real work. lit_config.load_config(config, "@LIBCXXABI_SOURCE_DIR@/test/lit.cfg") |