Apparently XFAIL tests that are supposed to fail to compile can be problematic. They still get compiled, and if the compile succeeds, the buildbots complain. Replace the XFAIL with #error.

llvm-svn: 267591

7 files changed, 28 insertions, 14 deletions

diff --git a/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp b/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp
index d8cc1f0f616..f1a5554b433 100644
--- a/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp
@@ -18,12 +18,14 @@
 //                    regex_constants::match_flag_type = 
 //                      regex_constants::match_default) = delete;
 
-// XFAIL: C++98, c++03, c++11
-
 #include <regex>
 #include <cassert>
 #include "test_macros.h"
 
+#if TEST_STD_VER < 14
+#error
+#endif
+
 int main()
 {
     {
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp b/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp
index e060d2945fa..c6b2b41161d 100644
--- a/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp
@@ -18,12 +18,14 @@
 //                     regex_constants::match_flag_type = 
 //                       regex_constants::match_default) = delete;
 
-// XFAIL: C++98, c++03, c++11
-
 #include <regex>
 #include <cassert>
 #include "test_macros.h"
 
+#if TEST_STD_VER < 14
+#error
+#endif
+
 int main()
 {
     {
diff --git a/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp b/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp
index 109aa87cc56..0089362e583 100644
--- a/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp
@@ -17,12 +17,14 @@
 //                      regex_constants::match_flag_type m =
 //                        regex_constants::match_default) = delete;
 
-// XFAIL: C++98, c++03, c++11
-
 #include <regex>
 #include <cassert>
 #include "test_macros.h"
 
+#if TEST_STD_VER < 14
+#error
+#endif
+
 int main()
 {
     {
diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp
index de581353e6b..8f90b23907d 100644
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp
@@ -18,13 +18,15 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-// XFAIL: C++98, c++03, c++11
-
 #include <regex>
 #include <vector>
 #include <cassert>
 #include "test_macros.h"
 
+#if TEST_STD_VER < 14
+#error
+#endif
+
 int main()
 {
     {
diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp
index e8b9adbc89d..9d538730e80 100644
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp
@@ -17,12 +17,14 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-// XFAIL: C++98, c++03, c++11
-
 #include <regex>
 #include <cassert>
 #include "test_macros.h"
 
+#if TEST_STD_VER < 14
+#error
+#endif
+
 int main()
 {
     {
diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp
index b9fda701c87..f4601f3ed03 100644
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp
@@ -16,12 +16,14 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-// XFAIL: C++98, c++03, c++11
-
 #include <regex>
 #include <cassert>
 #include "test_macros.h"
 
+#if TEST_STD_VER < 14
+#error
+#endif
+
 int main()
 {
     {
diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp
index 532cbb15a8b..d5d5f4c63ce 100644
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp
@@ -18,12 +18,14 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-// XFAIL: C++98, c++03, c++11
-
 #include <regex>
 #include <cassert>
 #include "test_macros.h"
 
+#if TEST_STD_VER < 14
+#error
+#endif
+
 int main()
 {
     {