1 files changed, 16 insertions, 15 deletions
diff --git a/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp b/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
index a94aa2f78299..cb17dfeb071a 100644
--- a/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
+++ b/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
@@ -10,8 +10,9 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// Clang 3.8 doesn't generate constexpr special members correctly.
-// XFAIL: clang-3.8, apple-clang-7, apple-clang-8
+// The following compilers don't generate constexpr special members correctly.
+// XFAIL: clang-3.5, clang-3.6, clang-3.7, clang-3.8
+// XFAIL: apple-clang-6, apple-clang-7, apple-clang-8
 
 // <variant>
 
@@ -63,7 +64,7 @@ struct TCopyAssignNTMoveAssign {
   int value;
 };
 
-static_assert(std::is_trivially_copy_assignable_v<TCopyAssignNTMoveAssign>);
+static_assert(std::is_trivially_copy_assignable_v<TCopyAssignNTMoveAssign>, "");
 
 void test_copy_assignment_sfinae() {
   {
@@ -99,8 +100,8 @@ void test_copy_assignment_same_index() {
       }
     } test;
     constexpr auto result = test();
-    static_assert(result.index == 0);
-    static_assert(result.value == 42);
+    static_assert(result.index == 0, "");
+    static_assert(result.value == 42, "");
   }
   {
     struct {
@@ -113,8 +114,8 @@ void test_copy_assignment_same_index() {
       }
     } test;
     constexpr auto result = test();
-    static_assert(result.index == 1);
-    static_assert(result.value == 42l);
+    static_assert(result.index == 1, "");
+    static_assert(result.value == 42l, "");
   }
   {
     struct {
@@ -127,8 +128,8 @@ void test_copy_assignment_same_index() {
       }
     } test;
     constexpr auto result = test();
-    static_assert(result.index == 1);
-    static_assert(result.value == 42);
+    static_assert(result.index == 1, "");
+    static_assert(result.value == 42, "");
   }
   {
     struct {
@@ -141,8 +142,8 @@ void test_copy_assignment_same_index() {
       }
     } test;
     constexpr auto result = test();
-    static_assert(result.index == 1);
-    static_assert(result.value == 42);
+    static_assert(result.index == 1, "");
+    static_assert(result.value == 42, "");
   }
 }
 
@@ -158,8 +159,8 @@ void test_copy_assignment_different_index() {
       }
     } test;
     constexpr auto result = test();
-    static_assert(result.index == 1);
-    static_assert(result.value == 42l);
+    static_assert(result.index == 1, "");
+    static_assert(result.value == 42l, "");
   }
   {
     struct {
@@ -172,8 +173,8 @@ void test_copy_assignment_different_index() {
       }
     } test;
     constexpr auto result = test();
-    static_assert(result.index == 1);
-    static_assert(result.value == 42);
+    static_assert(result.index == 1, "");
+    static_assert(result.value == 42, "");
   }
 }