Protect optional test under libcpp-no-exceptions

[rogfer01]

Summary

Replace throw with TEST_THROW and skip tests that throw exceptions

[mclow.lists]

test/std/experimental/optional/optional.specalg/swap.pass.cpp

225

Why is this here, and not before line L#236?

[rogfer01]

test/std/experimental/optional/optional.specalg/swap.pass.cpp

225

Yep, I'm wrong here. Probably a fallout of an early version where I protected the definition of Z instead before using TEST_THROW.

[rogfer01]

Protect the right set of tests.

[mclow.lists]

Looks good now - thanks.

test/std/experimental/optional/optional.specalg/swap.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is dual licensed under the MIT and the University of Illinois Open
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: libcpp-no-exceptions
 // <optional>
 
 // template <class T> void swap(optional<T>& x, optional<T>& y)
 //     noexcept(noexcept(x.swap(y)));
 
 #include <experimental/optional>
 #include <type_traits>
 #include <cassert>
 
+#include "test_macros.h"
+
 using std::experimental::optional;
 
 class X
 {
     int i_;
 public:
     static unsigned dtor_called;
     X(int i) : i_(i) {}

 
 unsigned Y::dtor_called = 0;
 
 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()
 {
     {
         optional<int> opt1;
         optional<int> opt2;
         static_assert(noexcept(swap(opt1, opt2)) == true, "");
int main()
         Y::dtor_called = 0;
         swap(opt1, opt2);
         assert(Y::dtor_called == 0);
         assert(static_cast<bool>(opt1) == true);
         assert(*opt1 == 2);
         assert(static_cast<bool>(opt2) == true);
         assert(*opt2 == 1);
     }
+#ifndef TEST_HAS_NO_EXCEPTIONS
     {
         optional<Z> opt1;
         optional<Z> opt2;
         static_assert(noexcept(swap(opt1, opt2)) == false, "");
         assert(static_cast<bool>(opt1) == false);
         assert(static_cast<bool>(opt2) == false);
         swap(opt1, opt2);
         assert(static_cast<bool>(opt1) == false);
#ifndef TEST_HAS_NO_EXCEPTIONS
         {
             assert(i == 6);
         }
         assert(static_cast<bool>(opt1) == true);
         assert(*opt1 == 1);
         assert(static_cast<bool>(opt2) == true);
         assert(*opt2 == 2);
     }
+#endif  // TEST_HAS_NO_EXCEPTIONS
 }