From b9a770fc36076e4b2d641d9d61e804cb13826f78 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 24 Apr 2023 12:48:31 +0200 Subject: unicodeio tests: Avoid test failures on native Windows. * tests/test-unicodeio.c: Include localcharset.h. (main): Handle C locales whose encoding is CP1252 or similar. * modules/unicodeio-tests (Depends-on): Add localcharset. --- tests/test-unicodeio.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-unicodeio.c b/tests/test-unicodeio.c index 1b7010c1ae..3a4af1345e 100644 --- a/tests/test-unicodeio.c +++ b/tests/test-unicodeio.c @@ -25,6 +25,7 @@ #include #include +#include "localcharset.h" #include "macros.h" #define TEST_CODE 0x2022 @@ -62,7 +63,27 @@ main (int argc, char *argv[]) if (argc > 1) switch (argv[1][0]) { - case '1': /* On some platforms, the "C" locale has UTF-8 encoding. */ + case '1': + /* On some platforms, the "C" locale has UTF-8 encoding. + And on native Windows, the "C" locale may have an 8-bit encoding + such as CP1252, that contains the U+2022 character. */ + { + const char *charset = locale_charset (); + if (strcmp (charset, "CP874") == 0 + || strcmp (charset, "CP1250") == 0 + || strcmp (charset, "CP1251") == 0 + || strcmp (charset, "CP1252") == 0 + || strcmp (charset, "CP1253") == 0 + || strcmp (charset, "CP1254") == 0 + || strcmp (charset, "CP1255") == 0 + || strcmp (charset, "CP1256") == 0 + || strcmp (charset, "CP1257") == 0 + || strcmp (charset, "CP1258") == 0) + ASSERT (strcmp (result, "\x95") == 0); + else + ASSERT (strcmp (result, TEST_CODE_AS_UTF8) == 0); + } + break; case '2': ASSERT (strcmp (result, TEST_CODE_AS_UTF8) == 0); break; -- cgit v1.2.1