diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-12-02 22:14:59 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-12-02 22:14:59 +0000 |
commit | 6d9aad0608e8a3012bd84b76033b81ae234d4fef (patch) | |
tree | 222a070aba4dcfa5d74b8ddae5bdd685ec82b6c4 /test | |
parent | b126ca07d6526844f766a271a7b117c4273b652f (diff) |
Check for SD-6 feature test macro when determining which tests should be
available, rather than #ifdef'ing away the relevant tests if it's unavailable.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@288543 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r-- | test/catch_function_03.pass.cpp | 7 | ||||
-rw-r--r-- | test/catch_member_function_pointer_02.pass.cpp | 7 | ||||
-rw-r--r-- | test/libcxxabi/test/config.py | 5 |
3 files changed, 7 insertions, 12 deletions
diff --git a/test/catch_function_03.pass.cpp b/test/catch_function_03.pass.cpp index c366638..bf817a9 100644 --- a/test/catch_function_03.pass.cpp +++ b/test/catch_function_03.pass.cpp @@ -8,12 +8,10 @@ //===----------------------------------------------------------------------===// // Can a noexcept function pointer be caught by a non-noexcept catch clause? -// UNSUPPORTED: c++98, c++03, c++11, c++14 -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: libcxxabi-no-exceptions, libcxxabi-no-noexcept-function-type #include <cassert> -#ifdef __cpp_noexcept_function_type template<bool Noexcept> void f() noexcept(Noexcept) {} template<bool Noexcept> using FnType = void() noexcept(Noexcept); @@ -64,6 +62,3 @@ int main() check<true, true>(); check_deep(); } -#else -int main() {} -#endif diff --git a/test/catch_member_function_pointer_02.pass.cpp b/test/catch_member_function_pointer_02.pass.cpp index 71df051..5ce2359 100644 --- a/test/catch_member_function_pointer_02.pass.cpp +++ b/test/catch_member_function_pointer_02.pass.cpp @@ -9,12 +9,10 @@ // Can a noexcept member function pointer be caught by a non-noexcept catch // clause? -// UNSUPPORTED: c++98, c++03, c++11, c++14 -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: libcxxabi-no-exceptions, libcxxabi-no-noexcept-function-type #include <cassert> -#ifdef __cpp_noexcept_function_type struct X { template<bool Noexcept> void f() noexcept(Noexcept) {} }; @@ -67,6 +65,3 @@ int main() check<true, true>(); check_deep(); } -#else -int main() {} -#endif diff --git a/test/libcxxabi/test/config.py b/test/libcxxabi/test/config.py index 3d5a235..5349338 100644 --- a/test/libcxxabi/test/config.py +++ b/test/libcxxabi/test/config.py @@ -33,10 +33,15 @@ class Configuration(LibcxxConfiguration): self.libcxxabi_obj_root = self.get_lit_conf('libcxxabi_obj_root') super(Configuration, self).configure_obj_root() + def has_cpp_feature(self, feature, required_value): + return int(self.cxx.dumpMacros().get('__cpp_' + feature, 0)) >= required_value + def configure_features(self): super(Configuration, self).configure_features() if not self.get_lit_bool('enable_exceptions', True): self.config.available_features.add('libcxxabi-no-exceptions') + if not self.has_cpp_feature('noexcept_function_type', 201510): + self.config.available_features.add('libcxxabi-no-noexcept-function-type') def configure_compile_flags(self): self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER'] |