From f30f261dc531b289bc74c157178e5bbc4a6ff7c9 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Fri, 26 Apr 2019 16:46:37 +0000 Subject: [PATCH] [libc++] Relax libc++-only test on regex_constants The standard requires the following for the std::regex_constants::error_type values: "The type error_type is an implementation-defined enumerated type." The values of this enumerated type are not required to be non-zero. This patch makes such checks in tests libc++-specific to let the tests pass for other conforming implementations. Thanks to Andrey Maksimov for the patch. Differential Revision: https://reviews.llvm.org/D61195 llvm-svn: 359320 --- .../std/re/re.const/re.err/error_type.pass.cpp | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libcxx/test/std/re/re.const/re.err/error_type.pass.cpp b/libcxx/test/std/re/re.const/re.err/error_type.pass.cpp index 51979a5..dbecf47 100644 --- a/libcxx/test/std/re/re.const/re.err/error_type.pass.cpp +++ b/libcxx/test/std/re/re.const/re.err/error_type.pass.cpp @@ -37,19 +37,19 @@ int main(int, char**) { - assert(std::regex_constants::error_collate != 0); - assert(std::regex_constants::error_ctype != 0); - assert(std::regex_constants::error_escape != 0); - assert(std::regex_constants::error_backref != 0); - assert(std::regex_constants::error_brack != 0); - assert(std::regex_constants::error_paren != 0); - assert(std::regex_constants::error_brace != 0); - assert(std::regex_constants::error_badbrace != 0); - assert(std::regex_constants::error_range != 0); - assert(std::regex_constants::error_space != 0); - assert(std::regex_constants::error_badrepeat != 0); - assert(std::regex_constants::error_complexity != 0); - assert(std::regex_constants::error_stack != 0); + LIBCPP_ASSERT(std::regex_constants::error_collate != 0); + LIBCPP_ASSERT(std::regex_constants::error_ctype != 0); + LIBCPP_ASSERT(std::regex_constants::error_escape != 0); + LIBCPP_ASSERT(std::regex_constants::error_backref != 0); + LIBCPP_ASSERT(std::regex_constants::error_brack != 0); + LIBCPP_ASSERT(std::regex_constants::error_paren != 0); + LIBCPP_ASSERT(std::regex_constants::error_brace != 0); + LIBCPP_ASSERT(std::regex_constants::error_badbrace != 0); + LIBCPP_ASSERT(std::regex_constants::error_range != 0); + LIBCPP_ASSERT(std::regex_constants::error_space != 0); + LIBCPP_ASSERT(std::regex_constants::error_badrepeat != 0); + LIBCPP_ASSERT(std::regex_constants::error_complexity != 0); + LIBCPP_ASSERT(std::regex_constants::error_stack != 0); assert(std::regex_constants::error_collate != std::regex_constants::error_ctype); assert(std::regex_constants::error_collate != std::regex_constants::error_escape); -- 2.7.4