Protect std::experimental::optional tests under libcpp-no-exceptions

In these tests there are some paths that explicitly throw, so use
the TEST_THROW macro that was proposed for this and then skip the tests
that may enter the throwing path.

Differential Revision: https://reviews.llvm.org/D26142



git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@286099 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Roger Ferrer Ibanez
2016-11-07 08:23:59 +00:00
parent d87eb99b80
commit 240b8c875b
13 changed files with 77 additions and 27 deletions

View File

@@ -8,7 +8,6 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++98, c++03, c++11
// XFAIL: libcpp-no-exceptions
// <optional>
// optional<T>& operator=(const optional<T>& rhs);
@@ -17,6 +16,8 @@
#include <type_traits>
#include <cassert>
#include "test_macros.h"
using std::experimental::optional;
struct AllowConstAssign {
@@ -34,7 +35,7 @@ struct X
X(const X&)
{
if (throw_now)
throw 6;
TEST_THROW(6);
}
};
@@ -79,6 +80,7 @@ int main()
assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
assert(*opt == *opt2);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
{
optional<X> opt;
optional<X> opt2(X{});
@@ -95,4 +97,5 @@ int main()
assert(static_cast<bool>(opt) == false);
}
}
#endif
}