[libcxx-commits] [libcxx] 201184b - [libc++] Remove <clocale> from some system_error tests

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-10-28T09:49:36-04:00
New Revision: 201184b30b286340e323c08d7d1f5f86cfa15489

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

LOG: [libc++] Remove <clocale> from some system_error tests

The explicit call to `std::setlocale(LC_ALL, "C")` isn't required, since
the Standard already says the equivalent of this call is performed on
program startup.

Added: 
    

Modified: 
    libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp
    libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp
    libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp
    libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp
    libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp
    libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp
index 2bd84677c9ad..66137cb36575 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp
@@ -17,18 +17,15 @@
 #include <system_error>
 #include <string>
 #include <cassert>
-#include <clocale>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::setlocale (LC_ALL, "C");
+int main(int, char**) {
     std::system_error se(static_cast<int>(std::errc::not_a_directory),
                          std::generic_category(), "some text");
     assert(se.code() == std::make_error_code(std::errc::not_a_directory));
     std::string what_message(se.what());
     assert(what_message.find("Not a directory") != std::string::npos);
 
-  return 0;
+    return 0;
 }

diff  --git a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp
index 86f47816dc69..bcb797ebed77 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp
@@ -17,13 +17,10 @@
 #include <system_error>
 #include <string>
 #include <cassert>
-#include <clocale>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::setlocale (LC_ALL, "C");
+int main(int, char**) {
     std::string what_arg("test message");
     std::system_error se(make_error_code(std::errc::not_a_directory), what_arg.c_str());
     assert(se.code() == std::make_error_code(std::errc::not_a_directory));
@@ -31,5 +28,5 @@ int main(int, char**)
     assert(what_message.find(what_arg) != std::string::npos);
     assert(what_message.find("Not a directory") != std::string::npos);
 
-  return 0;
+    return 0;
 }

diff  --git a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp
index 0bb3428e8007..a464084e55c5 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp
@@ -17,13 +17,10 @@
 #include <system_error>
 #include <string>
 #include <cassert>
-#include <clocale>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::setlocale (LC_ALL, "C");
+int main(int, char**) {
     std::string what_arg("test message");
     std::system_error se(make_error_code(std::errc::not_a_directory), what_arg);
     assert(se.code() == std::make_error_code(std::errc::not_a_directory));
@@ -31,5 +28,5 @@ int main(int, char**)
     assert(what_message.find(what_arg) != std::string::npos);
     assert(what_message.find("Not a directory") != std::string::npos);
 
-  return 0;
+    return 0;
 }

diff  --git a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp
index bce564fe95b0..0024f075428c 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp
@@ -17,18 +17,15 @@
 #include <system_error>
 #include <string>
 #include <cassert>
-#include <clocale>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::setlocale (LC_ALL, "C");
+int main(int, char**) {
     std::system_error se(static_cast<int>(std::errc::not_a_directory),
                          std::generic_category());
     assert(se.code() == std::make_error_code(std::errc::not_a_directory));
     std::string what_message(se.what());
     assert(what_message.find("Not a directory") != std::string::npos);
 
-  return 0;
+    return 0;
 }

diff  --git a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp
index 39e6958192a8..521c359fb286 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp
@@ -17,13 +17,10 @@
 #include <system_error>
 #include <string>
 #include <cassert>
-#include <clocale>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::setlocale (LC_ALL, "C");
+int main(int, char**) {
     std::string what_arg("test message");
     std::system_error se(static_cast<int>(std::errc::not_a_directory),
                          std::generic_category(), what_arg.c_str());
@@ -32,5 +29,5 @@ int main(int, char**)
     assert(what_message.find(what_arg) != std::string::npos);
     assert(what_message.find("Not a directory") != std::string::npos);
 
-  return 0;
+    return 0;
 }

diff  --git a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp
index eac6ecf43977..2626fb8cc1f2 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp
@@ -17,13 +17,10 @@
 #include <system_error>
 #include <string>
 #include <cassert>
-#include <clocale>
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::setlocale (LC_ALL, "C");
+int main(int, char**) {
     std::string what_arg("test message");
     std::system_error se(static_cast<int>(std::errc::not_a_directory),
                          std::generic_category(), what_arg);
@@ -32,5 +29,5 @@ int main(int, char**)
     assert(what_message.find(what_arg) != std::string::npos);
     assert(what_message.find("Not a directory") != std::string::npos);
 
-  return 0;
+    return 0;
 }