From 689f6cd77bc3e47097e68d3f878a6329d53846ae Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Mon, 15 Oct 2018 19:46:03 +0000
Subject: [PATCH] Mark a couple of test cases as 'C++17-only' pending the
 resolution of PR#39232

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@344546 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../variant/variant.variant/variant.status/index.pass.cpp     | 4 +++-
 .../variant.status/valueless_by_exception.pass.cpp            | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp b/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
index 8025b9e07..7ab828eb0 100644
--- a/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
+++ b/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/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp b/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
index 660a21c4f..be021917d 100644
--- a/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
+++ b/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");