summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/experimental/optional/optional.nullops
diff options
context:
space:
mode:
authorAsiri Rathnayake <asiri.rathnayake@arm.com>2016-05-28 08:57:35 +0000
committerAsiri Rathnayake <asiri.rathnayake@arm.com>2016-05-28 08:57:35 +0000
commit6edc12c8867fe8d21f9abf97b160d12dc2fa3954 (patch)
treeb05c2b476059d6ecf37ebee52db35c369cd0a74d /libcxx/test/std/experimental/optional/optional.nullops
parent6abd38bf6efc809654fcdf6c98d4378fcc4a040b (diff)
downloadbcm5719-llvm-6edc12c8867fe8d21f9abf97b160d12dc2fa3954.tar.gz
bcm5719-llvm-6edc12c8867fe8d21f9abf97b160d12dc2fa3954.zip
[libcxx] Improve tests to use the UNSUPPORTED lit directive
Quite a few libcxx tests seem to follow the format: #if _LIBCPP_STD_VER > X // Do test. #else // Empty test. #endif We should instead use the UNSUPPORTED lit directive to exclude the test on earlier C++ standards. This gives us a more accurate number of test passes for those standards and avoids unnecessary conflicts with other lit directives on the same tests. Reviewers: bcraig, ericwf, mclow.lists Differential revision: http://reviews.llvm.org/D20730 llvm-svn: 271108
Diffstat (limited to 'libcxx/test/std/experimental/optional/optional.nullops')
-rw-r--r--libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp4
-rw-r--r--libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp4
-rw-r--r--libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp4
-rw-r--r--libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp4
-rw-r--r--libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp4
5 files changed, 5 insertions, 15 deletions
diff --git a/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp
index 931db614425..7b42847bc3f 100644
--- a/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp
+++ b/libcxx/test/std/experimental/optional/optional.nullops/equal.pass.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-
+// UNSUPPORTED: c++98, c++03, c++11
// <optional>
// template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept;
@@ -17,7 +17,6 @@
int main()
{
-#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
@@ -37,5 +36,4 @@ int main()
static_assert (noexcept(nullopt == o1), "");
static_assert (noexcept(o1 == nullopt), "");
}
-#endif
}
diff --git a/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp
index b72a4d3f1a6..f26e8f874db 100644
--- a/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp
+++ b/libcxx/test/std/experimental/optional/optional.nullops/greater.pass.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-
+// UNSUPPORTED: c++98, c++03, c++11
// <optional>
// template <class T> constexpr bool operator>(const optional<T>& x, nullopt_t) noexcept;
@@ -17,7 +17,6 @@
int main()
{
-#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
@@ -37,5 +36,4 @@ int main()
static_assert (noexcept(nullopt > o1), "");
static_assert (noexcept(o1 > nullopt), "");
}
-#endif
}
diff --git a/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp
index 86c8743b555..3d22ea0d269 100644
--- a/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp
+++ b/libcxx/test/std/experimental/optional/optional.nullops/greater_equal.pass.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-
+// UNSUPPORTED: c++98, c++03, c++11
// <optional>
// template <class T> constexpr bool operator>=(const optional<T>& x, nullopt_t) noexcept;
@@ -17,7 +17,6 @@
int main()
{
-#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
@@ -37,5 +36,4 @@ int main()
static_assert (noexcept(nullopt >= o1), "");
static_assert (noexcept(o1 >= nullopt), "");
}
-#endif
}
diff --git a/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp
index 149c809b040..d2fa726e283 100644
--- a/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp
+++ b/libcxx/test/std/experimental/optional/optional.nullops/less_than.pass.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-
+// UNSUPPORTED: c++98, c++03, c++11
// <optional>
// template <class T> constexpr bool operator<(const optional<T>& x, nullopt_t) noexcept;
@@ -17,7 +17,6 @@
int main()
{
-#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
@@ -37,5 +36,4 @@ int main()
static_assert (noexcept(nullopt < o1), "");
static_assert (noexcept(o1 < nullopt), "");
}
-#endif
}
diff --git a/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp b/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp
index 6f28edf6d26..b693a640972 100644
--- a/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp
+++ b/libcxx/test/std/experimental/optional/optional.nullops/not_equal.pass.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-
+// UNSUPPORTED: c++98, c++03, c++11
// <optional>
// template <class T> constexpr bool operator!=(const optional<T>& x, nullopt_t) noexcept;
@@ -17,7 +17,6 @@
int main()
{
-#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;
@@ -37,5 +36,4 @@ int main()
static_assert (noexcept(nullopt != o1), "");
static_assert (noexcept(o1 != nullopt), "");
}
-#endif
}
OpenPOWER on IntegriCloud