commit c55a9d823363b989907b4cff457f12cfcf1eaa2e
author Kirill Makurin <maiddaisuki@outlook.com> Fri Aug 22 02:39:07 2025 +0900
committer Martin Storsjö <martin@martin.st> Mon Aug 25 12:41:01 2025 +0300
tree df2434cd1d45d1718eaa05ac9ddd2265f1d65c23
parent 7271769d279862df3bb9da24afeb5a73b04c8959

crt: run tests for C95 conversion function with all msvcr*.dll CRTs

Previously, these tests were skipped for msvcr80.dll and later.

Signed-off-by: Kirill Makurin <maiddaisuki@outlook.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

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 2e723a1..b66e277 100644
--- a/mingw-w64-crt/testcases/t_mbrlen.c
+++ b/mingw-w64-crt/testcases/t_mbrlen.c
@@ -23,7 +23,7 @@
 char InvalidMultibyte[] = {(char) 0x81, 0};
 
 int main (void) {
-#if __MSVCRT_VERSION__ >= 0x0800
+#ifdef _UCRT
   return 77;
 #endif
   mbstate_t state = {0};

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 cb11b14..e37986d 100644
--- a/mingw-w64-crt/testcases/t_mbrtowc.c
+++ b/mingw-w64-crt/testcases/t_mbrtowc.c
@@ -23,7 +23,7 @@
 char InvalidMultibyte[] = {(char) 0x81, 0};
 
 int main (void) {
-#if __MSVCRT_VERSION__ >= 0x0800
+#ifdef _UCRT
   return 77;
 #endif
   mbstate_t state = {0};

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 ba2b838..9cfd9c9 100644
--- a/mingw-w64-crt/testcases/t_mbsrtowcs.c
+++ b/mingw-w64-crt/testcases/t_mbsrtowcs.c
@@ -21,7 +21,7 @@
 unsigned char BadText[] = {0x93, 0xFA, 0x96, 0x7B, 0x8C, 0x0};
 
 int main (void) {
-#if __MSVCRT_VERSION__ >= 0x0800
+#ifdef _UCRT
   return 77;
 #endif
   mbstate_t state = {0};

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 f6e44f4..83a89d9 100644
--- a/mingw-w64-crt/testcases/t_wcrtomb.c
+++ b/mingw-w64-crt/testcases/t_wcrtomb.c
@@ -21,7 +21,7 @@
 }
 
 int main (void) {
-#if __MSVCRT_VERSION__ >= 0x0800
+#ifdef _UCRT
   return 77;
 #endif
   mbstate_t state = {0};

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 f2c660d..b5f744f 100644
--- a/mingw-w64-crt/testcases/t_wcsrtombs.c
+++ b/mingw-w64-crt/testcases/t_wcsrtombs.c
@@ -17,7 +17,7 @@
 wchar_t BadText[] = {L'テ', L'く', WEOF, L'ト'};
 
 int main (void) {
-#if __MSVCRT_VERSION__ >= 0x0800
+#ifdef _UCRT
   return 77;
 #endif
   const wchar_t *original_text = NULL;