From 653bc7d23e08ab61ee2382f8773f0a95d93ab871 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 16 Jan 2023 14:34:56 +0100 Subject: [PATCH 2/2] =?UTF-8?q?mbrtowc,=20mbrtoc32=20tests:=20Avoid=20test?= =?UTF-8?q?=20failure=20on=20Android=20=E2=89=A5=205.0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tests/test-mbrtowc.c (main): On Android 5.0 or newer, when testing the "C" locale, verify that the encoding is UTF-8. * tests/test-mbrtoc32.c (main): Likewise. * doc/posix-functions/setlocale.texi: Mention the Android problems. --- ChangeLog | 6 ++++++ doc/posix-functions/setlocale.texi | 8 +++++++- tests/test-mbrtoc32.c | 10 ++++++++++ tests/test-mbrtowc.c | 10 ++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 045e1c6247..0051e3237f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2023-01-16 Bruno Haible + mbrtowc, mbrtoc32 tests: Avoid test failure on Android ≥ 5.0. + * tests/test-mbrtowc.c (main): On Android 5.0 or newer, when testing + the "C" locale, verify that the encoding is UTF-8. + * tests/test-mbrtoc32.c (main): Likewise. + * doc/posix-functions/setlocale.texi: Mention the Android problems. + mbrtowc, mbrtoc32 tests: Refactor. * tests/test-mbrtowc.c (main): Straighten convoluted code. * tests/test-mbrtoc32.c (main): Likewise. diff --git a/doc/posix-functions/setlocale.texi b/doc/posix-functions/setlocale.texi index 11364d3901..6e232200f8 100644 --- a/doc/posix-functions/setlocale.texi +++ b/doc/posix-functions/setlocale.texi @@ -21,7 +21,7 @@ On Windows platforms (excluding Cygwin), @code{setlocale} understands different locale names, that are not based on ISO 639 language names and ISO 3166 country names. @item -On Android 4.3, which which doesn't have locales, the @code{setlocale} function +On Android < 5.0, which doesn't have locales, the @code{setlocale} function always fails. The replacement, however, supports only the locale names @code{"C"} and @code{"POSIX"}. @end itemize @@ -52,4 +52,10 @@ In addition any value is accepted for @code{LC_CTYPE}, and so NULL is never returned to indicate a failure to set locale. To verify category values, each category must be set individually with @code{setlocale(LC_COLLATE,"")} etc. +@item +On Android 5.0 and newer, the default locale (i.e.@: the locale in use when +@code{setlocale} was not called) is the @code{"C.UTF-8"} locale, not the +@code{"C"} locale. Additionally, a @code{setlocale} call that is meant to set +the @code{"C"} or @code{"POSIX"} locale actually sets an equivalent of the +@code{"C.UTF-8"} locale. @end itemize diff --git a/tests/test-mbrtoc32.c b/tests/test-mbrtoc32.c index 36b520f7b8..0d75c3db14 100644 --- a/tests/test-mbrtoc32.c +++ b/tests/test-mbrtoc32.c @@ -26,6 +26,7 @@ SIGNATURE_CHECK (mbrtoc32, size_t, #include #include +#include #include #include "macros.h" @@ -124,6 +125,15 @@ main (int argc, char *argv[]) ASSERT (mbsinit (&state)); } +#ifdef __ANDROID__ + /* On Android ≥ 5.0, the default locale is the "C.UTF-8" locale, not the + "C" locale. Furthermore, when you attempt to set the "C" or "POSIX" + locale via setlocale(), what you get is a "C" locale with UTF-8 encoding, + that is, effectively the "C.UTF-8" locale. */ + if (argc > 1 && strcmp (argv[1], "5") == 0 && MB_CUR_MAX > 1) + argv[1] = "2"; +#endif + if (argc > 1) switch (argv[1][0]) { diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c index b358d8d583..1fdf039c42 100644 --- a/tests/test-mbrtowc.c +++ b/tests/test-mbrtowc.c @@ -26,6 +26,7 @@ SIGNATURE_CHECK (mbrtowc, size_t, (wchar_t *, char const *, size_t, #include #include +#include #include #include "macros.h" @@ -124,6 +125,15 @@ main (int argc, char *argv[]) ASSERT (mbsinit (&state)); } +#ifdef __ANDROID__ + /* On Android ≥ 5.0, the default locale is the "C.UTF-8" locale, not the + "C" locale. Furthermore, when you attempt to set the "C" or "POSIX" + locale via setlocale(), what you get is a "C" locale with UTF-8 encoding, + that is, effectively the "C.UTF-8" locale. */ + if (argc > 1 && strcmp (argv[1], "5") == 0 && MB_CUR_MAX > 1) + argv[1] = "2"; +#endif + if (argc > 1) switch (argv[1][0]) { -- 2.34.1