From d4a8c3f2511f12e21e3c9adf58e162db25538c16 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 12 Mar 2020 18:09:44 -0700 Subject: [PATCH] Revert "Update system_error tests for more platforms." Can't use std::string::starts_with in tests. This reverts commit a9740ff1585a10b9df4296a735512df3e0ff9df5. --- .../syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp | 3 +-- .../syserr.errcat/syserr.errcat.objects/system_category.pass.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 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 22b12be..f044273 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,8 +31,7 @@ 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); - // Exact message format varies by platform. - LIBCPP_ASSERT(msg.starts_with("Unknown error")); + LIBCPP_ASSERT(msg == "Unknown error -1" || msg == "Unknown error"); 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 8aae803..8374c87 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,8 +31,7 @@ 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); - // Exact message format varies by platform. - LIBCPP_ASSERT(msg.starts_with("Unknown error")); + LIBCPP_ASSERT(msg == "Unknown error -1" || msg == "Unknown error"); assert(errno == E2BIG); } -- 2.7.4