Re-apply r344546 "Mark a couple of test cases as 'C++17-only'..."

Reverted too much in r344580.

llvm-svn: 344582

2 files changed, 6 insertions, 2 deletions

diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
index 8025b9e0774..7ab828eb0bf 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
@@ -34,11 +34,13 @@
 #include "variant_test_helpers.hpp"
 
 int main() {
-  {
+#if TEST_STD_VER == 17
+  { // This test does not pass on C++20 or later; see https://bugs.llvm.org/show_bug.cgi?id=39232
     using V = std::variant<int, ConstexprTestTypes::NoCtors>;
     constexpr V v;
     static_assert(v.index() == 0, "");
   }
+#endif
   {
     using V = std::variant<int, long>;
     constexpr V v(std::in_place_index<1>);
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
index 660a21c4f31..be021917d6d 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
@@ -34,11 +34,13 @@
 #include "variant_test_helpers.hpp"
 
 int main() {
-  {
+#if TEST_STD_VER == 17
+  { // This test does not pass on C++20 or later; see https://bugs.llvm.org/show_bug.cgi?id=39232
     using V = std::variant<int, ConstexprTestTypes::NoCtors>;
     constexpr V v;
     static_assert(!v.valueless_by_exception(), "");
   }
+#endif
   {
     using V = std::variant<int, long, std::string>;
     const V v("abc");