diff options
author | Dan Albert <danalbert@google.com> | 2017-07-21 13:20:52 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2017-07-21 13:21:03 -0700 |
commit | 063c355f97e213be9465b465e33bab73351d555c (patch) | |
tree | 1dd243eb339af69ed6e6f49bb95ce0c2ca1e5efb | |
parent | eddd44233657841b18661ea4f93327809e4b53eb (diff) | |
download | external_libcxx-063c355f97e213be9465b465e33bab73351d555c.tar.gz external_libcxx-063c355f97e213be9465b465e33bab73351d555c.tar.bz2 external_libcxx-063c355f97e213be9465b465e33bab73351d555c.zip |
Update system_error tests for more platforms.
Summary: Old versions of Android used the "Unknown error: -1" format.
Reviewers: EricWF, mclow.lists
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D35732
2 files changed, 6 insertions, 2 deletions
diff --git a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp index 0783de85c..f7172eeef 100644 --- a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp +++ b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp @@ -31,7 +31,9 @@ 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 == "Unknown error -1" || msg == "Unknown error" || + msg == "Unknown error: -1"); assert(errno == E2BIG); } diff --git a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp index 8cccb0255..5168f2d3c 100644 --- a/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp +++ b/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp @@ -31,7 +31,9 @@ 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 varries by platform. + LIBCPP_ASSERT(msg == "Unknown error -1" || msg == "Unknown error" || + msg == "Unknown error: -1"); assert(errno == E2BIG); } |