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.search | |
| 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.search')
9 files changed, 10 insertions, 4 deletions
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/awk.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/awk.pass.cpp index 7fc1b3fcc23..05d1f59e147 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/awk.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/awk.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.search/backup.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp index 7da58608705..f33b844bed9 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/backup.pass.cpp @@ -20,6 +20,7 @@ #include <string> #include <list> #include <cassert> +#include "test_macros.h" 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 9ab6a21ad9d..e060d2945fa 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,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_search(std::string("abcde"), m, re); } } -#endif diff --git a/libcxx/test/std/re/re.alg/re.alg.search/basic.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/basic.pass.cpp index bdfcd9cc9bc..f5157f56375 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/basic.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/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.search/ecma.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/ecma.pass.cpp index fb9fc26a281..d6a3da6ea07 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/ecma.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/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.search/egrep.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/egrep.pass.cpp index 1dffed44f22..0bf8386119e 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/egrep.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/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.search/extended.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/extended.pass.cpp index 81eef2f9e4b..88af3b90881 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/extended.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/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.search/lookahead.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp index 9f5f9540165..207612bce47 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/lookahead.pass.cpp @@ -20,6 +20,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" int main() { diff --git a/libcxx/test/std/re/re.alg/re.alg.search/no_update_pos.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/no_update_pos.pass.cpp index ef9cec5f736..600425d8de3 100644 --- a/libcxx/test/std/re/re.alg/re.alg.search/no_update_pos.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/no_update_pos.pass.cpp @@ -18,6 +18,7 @@ #include <regex> #include <cassert> +#include "test_macros.h" int main() { |
