Author: rogfer01 Date: Thu Dec 1 11:33:36 2016 New Revision: 288379 URL: http://llvm.org/viewvc/llvm-project?rev=288379&view=rev Log: Protect optional test under libcpp-no-exceptions
Replace throw with TEST_THROW and skip tests that throw exceptions Differential Revision: https://reviews.llvm.org/D27254 Modified: libcxx/trunk/test/std/experimental/optional/optional.specalg/swap.pass.cpp Modified: libcxx/trunk/test/std/experimental/optional/optional.specalg/swap.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/optional/optional.specalg/swap.pass.cpp?rev=288379&r1=288378&r2=288379&view=diff ============================================================================== --- libcxx/trunk/test/std/experimental/optional/optional.specalg/swap.pass.cpp (original) +++ libcxx/trunk/test/std/experimental/optional/optional.specalg/swap.pass.cpp Thu Dec 1 11:33:36 2016 @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03, c++11 -// XFAIL: libcpp-no-exceptions // <optional> // template <class T> void swap(optional<T>& x, optional<T>& y) @@ -18,6 +17,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + using std::experimental::optional; class X @@ -55,10 +56,10 @@ class Z int i_; public: Z(int i) : i_(i) {} - Z(Z&&) {throw 7;} + Z(Z&&) {TEST_THROW(7);} friend constexpr bool operator==(const Z& x, const Z& y) {return x.i_ == y.i_;} - friend void swap(Z& x, Z& y) {throw 6;} + friend void swap(Z& x, Z& y) {TEST_THROW(6);} }; int main() @@ -231,6 +232,7 @@ int main() assert(static_cast<bool>(opt1) == false); assert(static_cast<bool>(opt2) == false); } +#ifndef TEST_HAS_NO_EXCEPTIONS { optional<Z> opt1; opt1.emplace(1); @@ -297,4 +299,5 @@ int main() assert(static_cast<bool>(opt2) == true); assert(*opt2 == 2); } +#endif // TEST_HAS_NO_EXCEPTIONS } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits