Author: rogfer01 Date: Mon Dec 5 05:05:09 2016 New Revision: 288660 URL: http://llvm.org/viewvc/llvm-project?rev=288660&view=rev Log: Handle tests for noexcept that expect a false value
Under libcpp-no-exceptions, noexcept is trivially true. Some tests expect in the usual setting to return false, so adjust them to expect true under libcpp-no-exceptions. Differential Revision: https://reviews.llvm.org/D27310 Modified: libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp Modified: libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp?rev=288660&r1=288659&r2=288660&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp (original) +++ libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp Mon Dec 5 05:05:09 2016 @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// // -// XFAIL: libcpp-no-exceptions // <iterator> // __libcpp_is_trivial_iterator<Tp> @@ -26,6 +25,15 @@ #include "test_macros.h" #include "test_iterators.h" +#ifndef TEST_HAS_NO_EXCEPTIONS +static const bool expected = false; +#else +// Under libcpp-no-exceptions all noexcept expressions are trivially true, so +// any check for a noexcept returning false must actually check for it being +// true. +static const bool expected = true; +#endif + int main() { // basic tests @@ -43,17 +51,17 @@ int main() static_assert(( std::__libcpp_string_gets_noexcept_iterator<std::reverse_iterator<std::__wrap_iter<char *> > > ::value), ""); // iterators in the libc++ test suite - static_assert((!std::__libcpp_string_gets_noexcept_iterator<output_iterator <char *> >::value), ""); - static_assert((!std::__libcpp_string_gets_noexcept_iterator<input_iterator <char *> >::value), ""); - static_assert((!std::__libcpp_string_gets_noexcept_iterator<forward_iterator <char *> >::value), ""); - static_assert((!std::__libcpp_string_gets_noexcept_iterator<bidirectional_iterator<char *> >::value), ""); - static_assert((!std::__libcpp_string_gets_noexcept_iterator<random_access_iterator<char *> >::value), ""); - static_assert((!std::__libcpp_string_gets_noexcept_iterator<ThrowingIterator <char *> >::value), ""); + static_assert(std::__libcpp_string_gets_noexcept_iterator<output_iterator <char *> >::value == expected, ""); + static_assert(std::__libcpp_string_gets_noexcept_iterator<input_iterator <char *> >::value == expected, ""); + static_assert(std::__libcpp_string_gets_noexcept_iterator<forward_iterator <char *> >::value == expected, ""); + static_assert(std::__libcpp_string_gets_noexcept_iterator<bidirectional_iterator<char *> >::value == expected, ""); + static_assert(std::__libcpp_string_gets_noexcept_iterator<random_access_iterator<char *> >::value == expected, ""); + static_assert(std::__libcpp_string_gets_noexcept_iterator<ThrowingIterator <char *> >::value == expected, ""); #if TEST_STD_VER >= 11 static_assert(( std::__libcpp_string_gets_noexcept_iterator<NonThrowingIterator <char *> >::value), ""); #else - static_assert((!std::__libcpp_string_gets_noexcept_iterator<NonThrowingIterator <char *> >::value), ""); + static_assert(std::__libcpp_string_gets_noexcept_iterator<NonThrowingIterator <char *> >::value == expected, ""); #endif // _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
