Author: hahnfeld Date: Thu Mar 17 05:00:24 2016 New Revision: 263699 URL: http://llvm.org/viewvc/llvm-project?rev=263699&view=rev Log: [libcxxabi] Disable cxa_thread_atexit_test if unavailable
The feature check is already in place when building the library but wasn't honored for the tests. Differential Revision: http://reviews.llvm.org/D18205 Modified: libcxxabi/trunk/test/CMakeLists.txt libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp libcxxabi/trunk/test/libcxxabi/test/config.py libcxxabi/trunk/test/lit.site.cfg.in Modified: libcxxabi/trunk/test/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/CMakeLists.txt?rev=263699&r1=263698&r2=263699&view=diff ============================================================================== --- libcxxabi/trunk/test/CMakeLists.txt (original) +++ libcxxabi/trunk/test/CMakeLists.txt Thu Mar 17 05:00:24 2016 @@ -10,6 +10,7 @@ pythonize_bool(LLVM_BUILD_32_BITS) pythonize_bool(LIBCXXABI_ENABLE_SHARED) pythonize_bool(LIBCXXABI_ENABLE_THREADS) pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER) +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 Modified: libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp?rev=263699&r1=263698&r2=263699&view=diff ============================================================================== --- libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp (original) +++ libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp Thu Mar 17 05:00:24 2016 @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: linux +// REQUIRES: thread_atexit #include <assert.h> #include <cxxabi.h> Modified: libcxxabi/trunk/test/libcxxabi/test/config.py URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/libcxxabi/test/config.py?rev=263699&r1=263698&r2=263699&view=diff ============================================================================== --- libcxxabi/trunk/test/libcxxabi/test/config.py (original) +++ libcxxabi/trunk/test/libcxxabi/test/config.py Thu Mar 17 05:00:24 2016 @@ -33,6 +33,11 @@ class Configuration(LibcxxConfiguration) self.libcxxabi_obj_root = self.get_lit_conf('libcxxabi_obj_root') super(Configuration, self).configure_obj_root() + def configure_features(self): + super(Configuration, self).configure_features() + if self.get_lit_bool('thread_atexit', True): + self.config.available_features.add('thread_atexit') + def configure_compile_flags(self): self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER'] self.cxx.compile_flags += ['-funwind-tables'] Modified: libcxxabi/trunk/test/lit.site.cfg.in URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/lit.site.cfg.in?rev=263699&r1=263698&r2=263699&view=diff ============================================================================== --- libcxxabi/trunk/test/lit.site.cfg.in (original) +++ libcxxabi/trunk/test/lit.site.cfg.in Thu Mar 17 05:00:24 2016 @@ -13,6 +13,7 @@ config.use_sanitizer = "@LLVM config.enable_32bit = "@LLVM_BUILD_32_BITS@" config.target_info = "@LIBCXXABI_TARGET_INFO@" config.executor = "@LIBCXXABI_EXECUTOR@" +config.thread_atexit = "@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") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
