From 8dc9dcaeaccd3be047740b1f19c4beee33b0f44e Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 26 Apr 2016 19:29:35 +0000 Subject: [PATCH] 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 --- libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp | 6 ++++-- libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp | 6 ++++-- .../test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp | 6 ++++-- .../test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp | 6 ++++-- .../test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp | 6 ++++-- libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp | 6 ++++-- .../test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp | 6 ++++-- 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 d8cc1f0..f1a5554 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 #include #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 e060d29..c6b2b41 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 #include #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 109aa87..0089362 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 #include #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 de58135..8f90b23 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 #include #include #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 e8b9adb..9d53873 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 #include #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 b9fda70..f4601f3 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 #include #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 532cbb1..d5d5f4c 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 #include #include "test_macros.h" +#if TEST_STD_VER < 14 +#error +#endif + int main() { { -- 2.7.4