[libcxx-commits] [libcxx] d4a8c3f - Revert "Update system_error tests for more platforms."

[Dan Albert via libcxx-commits]

Author: Dan Albert
Date: 2020-03-12T18:09:44-07:00
New Revision: d4a8c3f2511f12e21e3c9adf58e162db25538c16

URL: https://github.com/llvm/llvm-project/commit/d4a8c3f2511f12e21e3c9adf58e162db25538c16
DIFF: https://github.com/llvm/llvm-project/commit/d4a8c3f2511f12e21e3c9adf58e162db25538c16.diff

LOG: Revert "Update system_error tests for more platforms."

Can't use std::string::starts_with in tests.

This reverts commit a9740ff1585a10b9df4296a735512df3e0ff9df5.

Added: 
    

Modified: 
    libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp
    libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp

Removed: 
    


################################################################################
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 22b12be54433..f04427381cbb 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 8aae803d322f..8374c8766b2e 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);
 }