From 494247ca25accbb9e7c1308aeae0f1ada496814b Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sat, 4 Mar 2017 02:29:25 +0000 Subject: Attempt to suppress test failures on OS X git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@296955 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/libcxxabi/test/config.py | 2 ++ test/test_exception_address_alignment.pass.cpp | 12 ++++++++++++ 2 files changed, 14 insertions(+) (limited to 'test') diff --git a/test/libcxxabi/test/config.py b/test/libcxxabi/test/config.py index c6982ad..6d4da90 100644 --- a/test/libcxxabi/test/config.py +++ b/test/libcxxabi/test/config.py @@ -48,6 +48,8 @@ class Configuration(LibcxxConfiguration): 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') def configure_compile_flags(self): self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER'] diff --git a/test/test_exception_address_alignment.pass.cpp b/test/test_exception_address_alignment.pass.cpp index 5c5b4df..8e62944 100644 --- a/test/test_exception_address_alignment.pass.cpp +++ b/test/test_exception_address_alignment.pass.cpp @@ -7,13 +7,25 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + +// The system unwind.h on OS X provides an incorrectly aligned _Unwind_Exception +// type. That causes these tests to fail. This XFAIL is my best attempt at +// working around this failure. +// XFAIL: darwin && libcxxabi-has-system-unwinder + // Test that the address of the exception object is properly aligned to the // largest supported alignment for the system. #include #include +#include + struct __attribute__((aligned)) AlignedType {}; +static_assert(alignof(AlignedType) == alignof(_Unwind_Exception), + "_Unwind_Exception is incorrectly aligned. This test is expected to fail"); + struct MinAligned { }; static_assert(alignof(MinAligned) == 1 && sizeof(MinAligned) == 1, ""); -- cgit v1.2.3