diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2016-04-26 16:24:44 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2016-04-26 16:24:44 +0000 |
| commit | fd5ceb2228a7d3ae5e132bfd403a72150b919eb3 (patch) | |
| tree | 333e5a05e174446be22a17010bf42412a8003bd6 /libcxx/test/std/re/re.alg/re.alg.match | |
| parent | 5dd550a3ffec6c1dfc2fb36a7c0db4527bdd3b00 (diff) | |
| download | bcm5719-llvm-fd5ceb2228a7d3ae5e132bfd403a72150b919eb3.tar.gz bcm5719-llvm-fd5ceb2228a7d3ae5e132bfd403a72150b919eb3.zip | |
#include <test_macros.h> in all the regex tests, and remove all mentions of __cpluplus (use TEST_STD_VERS and/or XFAIL instead). No functional change
llvm-svn: 267567
Diffstat (limited to 'libcxx/test/std/re/re.alg/re.alg.match')
9 files changed, 10 insertions, 4 deletions
diff --git a/libcxx/test/std/re/re.alg/re.alg.match/awk.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/awk.pass.cpp index e4b2f3ec501..a32b2ca0ae3 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/awk.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/awk.pass.cpp @@ -19,6 +19,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" #include "platform_support.h" // locale name macros 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 82f8e3b7ee8..d8cc1f0f616 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,11 @@ // regex_constants::match_flag_type = // regex_constants::match_default) = delete; -#if __cplusplus <= 201402L -#error -#else +// XFAIL: C++98, c++03, c++11 #include <regex> #include <cassert> +#include "test_macros.h" int main() { @@ -33,4 +32,3 @@ int main() std::regex_match(std::string("abcde"), m, re); } } -#endif diff --git a/libcxx/test/std/re/re.alg/re.alg.match/basic.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/basic.pass.cpp index 2ddc07a2000..901bf90e638 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/basic.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/basic.pass.cpp @@ -23,6 +23,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" #include "platform_support.h" // locale name macros diff --git a/libcxx/test/std/re/re.alg/re.alg.match/ecma.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/ecma.pass.cpp index 785a61c47f1..a4568f60167 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/ecma.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/ecma.pass.cpp @@ -23,6 +23,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" #include "platform_support.h" // locale name macros diff --git a/libcxx/test/std/re/re.alg/re.alg.match/egrep.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/egrep.pass.cpp index dd2e6038dc3..53cff850e2d 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/egrep.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/egrep.pass.cpp @@ -19,6 +19,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" int main() diff --git a/libcxx/test/std/re/re.alg/re.alg.match/extended.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/extended.pass.cpp index 9ca31d1814a..5e08d0ac5fd 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/extended.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/extended.pass.cpp @@ -23,6 +23,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" #include "platform_support.h" // locale name macros diff --git a/libcxx/test/std/re/re.alg/re.alg.match/grep.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/grep.pass.cpp index 2dc0966d6b8..efd33cb11e0 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/grep.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/grep.pass.cpp @@ -19,6 +19,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" int main() diff --git a/libcxx/test/std/re/re.alg/re.alg.match/lookahead_capture.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/lookahead_capture.pass.cpp index 949739b992c..1dc4ee45d8b 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/lookahead_capture.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/lookahead_capture.pass.cpp @@ -22,6 +22,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" int main() diff --git a/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp index 0b4c6948140..59b2832c458 100644 --- a/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp @@ -21,6 +21,7 @@ #include <string> #include <regex> #include <cassert> +#include "test_macros.h" void test1() |
