From adefcc8ab5be0b4d2e25356241987d923137ebb0 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 13 Mar 2020 12:01:59 -0700 Subject: [PATCH] Revert "Revert "Update system_error tests for more platforms."" This time using old fashioned starts_with. This reverts commit d4a8c3f2511f12e21e3c9adf58e162db25538c16. --- .../syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp | 3 ++- .../syserr.errcat/syserr.errcat.objects/system_category.pass.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp index f044273..e0e65a6 100644 --- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp @@ -31,7 +31,8 @@ void test_message_for_bad_value() { errno = E2BIG; // something that message will never generate const std::error_category& e_cat1 = std::generic_category(); const std::string msg = e_cat1.message(-1); - LIBCPP_ASSERT(msg == "Unknown error -1" || msg == "Unknown error"); + // Exact message format varies by platform. + LIBCPP_ASSERT(msg.rfind("Unknown error", 0) == 0); assert(errno == E2BIG); } diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp index 8374c87..5165fb3 100644 --- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp @@ -31,7 +31,8 @@ void test_message_for_bad_value() { errno = E2BIG; // something that message will never generate const std::error_category& e_cat1 = std::system_category(); const std::string msg = e_cat1.message(-1); - LIBCPP_ASSERT(msg == "Unknown error -1" || msg == "Unknown error"); + // Exact message format varies by platform. + LIBCPP_ASSERT(msg.rfind("Unknown error", 0) == 0); assert(errno == E2BIG); } -- 2.7.4