[libcxx] [test] Remove nonportable that errc::is_a_directory produces "Is a directory" from ios_base::failure tests

These io_error asserts that std::errc::is_a_directory has message "Is a directory". On MSVC++ it reports "is a directory" (with a lowercase I). That doesn't matter for the ios_failure component being tested, so just implement in terms of system_category().message().

Reviewed as https://reviews.llvm.org/D45715

llvm-svn: 330791

2 files changed, 6 insertions, 2 deletions

diff --git a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
index 50f5fdad744..44c55118d5a 100644
--- a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
+++ b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
@@ -15,6 +15,7 @@
 
 #include <ios>
 #include <string>
+#include <system_error>
 #include <cassert>
 
 int main()
@@ -25,7 +26,8 @@ int main()
         assert(se.code() == std::make_error_code(std::errc::is_a_directory));
         std::string what_message(se.what());
         assert(what_message.find(what_arg) != std::string::npos);
-        assert(what_message.find("Is a directory") != std::string::npos);
+        assert(what_message.find(std::generic_category().message(static_cast<int>
+            (std::errc::is_a_directory))) != std::string::npos);
     }
     {
         std::string what_arg("io test message");
diff --git a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
index a9c5f30f37a..5711b55c7e8 100644
--- a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
+++ b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
@@ -15,6 +15,7 @@
 
 #include <ios>
 #include <string>
+#include <system_error>
 #include <cassert>
 
 int main()
@@ -28,7 +29,8 @@ int main()
         assert(se.code() == std::make_error_code(std::errc::is_a_directory));
         std::string what_message(se.what());
         assert(what_message.find(what_arg) != std::string::npos);
-        assert(what_message.find("Is a directory") != std::string::npos);
+        assert(what_message.find(std::generic_category().message(static_cast<int>
+            (std::errc::is_a_directory))) != std::string::npos);
     }
     {
         std::string what_arg("io test message");