[PATCH] D25853: [libcxx] [test] Fix non-Standard make_from_tuple() tests.

[Stephan T. Lavavej via cfe-commits]

STL_MSFT created this revision.
STL_MSFT added reviewers: EricWF, mclow.lists.
STL_MSFT added a subscriber: cfe-commits.

The Standard doesn't depict make_from_tuple() as conditionally noexcept. Mark 
these tests as libcxx-specific.


https://reviews.llvm.org/D25853

Files:
  test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp


Index: test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp
===================================================================
--- test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp
+++ test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp
@@ -175,14 +175,14 @@
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(ctup));
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup)));
+        
LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup))));
     }
     {
         using Tuple = std::pair<int, NothrowMoveable>;
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(ctup));
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup)));
+        
LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup))));
     }
     {
         using Tuple = std::tuple<int, int, int>;
@@ -192,7 +192,7 @@
     {
         using Tuple = std::tuple<long, long, long>;
         Tuple tup; ((void)tup);
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup)));
     }
     {
         using Tuple = std::array<int, 3>;
@@ -202,7 +202,7 @@
     {
         using Tuple = std::array<long, 3>;
         Tuple tup; ((void)tup);
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup)));
     }
 }
 



Index: test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp
===================================================================
--- test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp
+++ test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp
@@ -175,14 +175,14 @@
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(ctup));
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup)));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup))));
     }
     {
         using Tuple = std::pair<int, NothrowMoveable>;
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(ctup));
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup)));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup))));
     }
     {
         using Tuple = std::tuple<int, int, int>;
@@ -192,7 +192,7 @@
     {
         using Tuple = std::tuple<long, long, long>;
         Tuple tup; ((void)tup);
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup)));
     }
     {
         using Tuple = std::array<int, 3>;
@@ -202,7 +202,7 @@
     {
         using Tuple = std::array<long, 3>;
         Tuple tup; ((void)tup);
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup)));
     }
 }
 

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits