commit 89ec813b4bec8ce20aaeffc9f6d145f913b23133
author Kirill Makurin <maiddaisuki@outlook.com> Sat Sep 06 17:49:41 2025 +0900
committer LIU Hao <lh_mouse@126.com> Sun Sep 07 22:53:44 2025 +0800
tree f771588dc67adb897b5c5a9f0b498a028682b528
parent 94ee6fd3bb56646244f5867f19b1c78c6e550b98

tests: use explicit code pages instead of ACP in calls to setlocale

setlocale in old CRTs does not support ACP/OCP strings to specify
code page in the locale string. This results in test failures.

To avoid this, explicitly specify code page in locale strings
passed to setlocale.

Signed-off-by: Kirill Makurin <maiddaisuki@outlook.com>
Signed-off-by: LIU Hao <lh_mouse@126.com>

mingw-w64-crt/testcases/t_btowc.c

diff --git a/mingw-w64-crt/testcases/t_btowc.c b/mingw-w64-crt/testcases/t_btowc.c
index 7adcedd..8137a82 100644
--- a/mingw-w64-crt/testcases/t_btowc.c
+++ b/mingw-w64-crt/testcases/t_btowc.c
@@ -36,7 +36,7 @@
   /**
    * Test SBCS code page
    */
-  assert (setlocale (LC_ALL, "English_United States.ACP") != NULL);
+  assert (setlocale (LC_ALL, "English_United States.1252") != NULL);
   assert (MB_CUR_MAX == 1);
 
   /**
@@ -56,7 +56,7 @@
   /**
    * Test DBCS code page
    */
-  assert (setlocale (LC_ALL, "Japanese_Japan.ACP") != NULL);
+  assert (setlocale (LC_ALL, "Japanese_Japan.932") != NULL);
   assert (MB_CUR_MAX == 2);
 
   /**

mingw-w64-crt/testcases/t_mbrlen.c

diff --git a/mingw-w64-crt/testcases/t_mbrlen.c b/mingw-w64-crt/testcases/t_mbrlen.c
index b66e277..62051d6 100644
--- a/mingw-w64-crt/testcases/t_mbrlen.c
+++ b/mingw-w64-crt/testcases/t_mbrlen.c
@@ -73,7 +73,7 @@
   /**
    * Test SBCS code page
    */
-  assert (setlocale (LC_ALL, "English_United States.ACP") != NULL);
+  assert (setlocale (LC_ALL, "English_United States.1252") != NULL);
   assert (MB_CUR_MAX == 1);
 
   /**
@@ -92,7 +92,7 @@
   /**
    * Test DBCS code page
    */
-  assert (setlocale (LC_ALL, "Japanese_Japan.ACP") != NULL);
+  assert (setlocale (LC_ALL, "Japanese_Japan.932") != NULL);
   assert (MB_CUR_MAX == 2);
 
   /**

mingw-w64-crt/testcases/t_mbrtowc.c

diff --git a/mingw-w64-crt/testcases/t_mbrtowc.c b/mingw-w64-crt/testcases/t_mbrtowc.c
index e37986d..0e58946 100644
--- a/mingw-w64-crt/testcases/t_mbrtowc.c
+++ b/mingw-w64-crt/testcases/t_mbrtowc.c
@@ -104,7 +104,7 @@
   /**
    * Test DBCS code page
    */
-  assert (setlocale (LC_ALL, "Japanese_Japan.ACP") != NULL);
+  assert (setlocale (LC_ALL, "Japanese_Japan.932") != NULL);
   assert (MB_CUR_MAX == 2);
 
   /**

mingw-w64-crt/testcases/t_mbsrtowcs.c

diff --git a/mingw-w64-crt/testcases/t_mbsrtowcs.c b/mingw-w64-crt/testcases/t_mbsrtowcs.c
index 9cfd9c9..d53103f 100644
--- a/mingw-w64-crt/testcases/t_mbsrtowcs.c
+++ b/mingw-w64-crt/testcases/t_mbsrtowcs.c
@@ -134,7 +134,7 @@
   /**
    * Test SBCS code page
    */
-  assert (setlocale (LC_ALL, "English_United States.ACP") != NULL);
+  assert (setlocale (LC_ALL, "English_United States.1252") != NULL);
   assert (MB_CUR_MAX == 1);
 
   /* Test SBCS input */
@@ -196,7 +196,7 @@
   /**
    * Test DBCS code page
    */
-  assert (setlocale (LC_ALL, "Japanese_Japan.ACP") != NULL);
+  assert (setlocale (LC_ALL, "Japanese_Japan.932") != NULL);
   assert (MB_CUR_MAX == 2);
 
   /* Test ASCII input */

mingw-w64-crt/testcases/t_wcrtomb.c

diff --git a/mingw-w64-crt/testcases/t_wcrtomb.c b/mingw-w64-crt/testcases/t_wcrtomb.c
index 83a89d9..d6e7c05 100644
--- a/mingw-w64-crt/testcases/t_wcrtomb.c
+++ b/mingw-w64-crt/testcases/t_wcrtomb.c
@@ -152,7 +152,7 @@
   /**
    * Test DBCS code page
    */
-  assert (setlocale (LC_ALL, "Japanese_Japan.ACP") != NULL);
+  assert (setlocale (LC_ALL, "Japanese_Japan.932") != NULL);
   assert (MB_CUR_MAX == 2);
 
   /**

mingw-w64-crt/testcases/t_wcsrtombs.c

diff --git a/mingw-w64-crt/testcases/t_wcsrtombs.c b/mingw-w64-crt/testcases/t_wcsrtombs.c
index b5f744f..87fbe96 100644
--- a/mingw-w64-crt/testcases/t_wcsrtombs.c
+++ b/mingw-w64-crt/testcases/t_wcsrtombs.c
@@ -191,7 +191,7 @@
   /**
    * Test SBCS code page
    */
-  assert (setlocale (LC_ALL, "English_United States.ACP") != NULL);
+  assert (setlocale (LC_ALL, "English_United States.1252") != NULL);
   assert (MB_CUR_MAX == 1);
 
   /* Test ASCII input */
@@ -354,7 +354,7 @@
   /**
    * Test DBCS code page
    */
-  assert (setlocale (LC_ALL, "Japanese_Japan.ACP") != NULL);
+  assert (setlocale (LC_ALL, "Japanese_Japan.932") != NULL);
   assert (MB_CUR_MAX == 2);
 
   /* Test ASCII input */

mingw-w64-crt/testcases/t_wctob.c

diff --git a/mingw-w64-crt/testcases/t_wctob.c b/mingw-w64-crt/testcases/t_wctob.c
index 6177223..a89064b 100644
--- a/mingw-w64-crt/testcases/t_wctob.c
+++ b/mingw-w64-crt/testcases/t_wctob.c
@@ -65,7 +65,7 @@
   /**
    * Test DBCS code page
    */
-  assert (setlocale (LC_ALL, "Japanese_Japan.ACP") != NULL);
+  assert (setlocale (LC_ALL, "Japanese_Japan.932") != NULL);
   assert (MB_CUR_MAX == 2);
 
   /**