From 61fbeacfc33f05999dd44586e8a4960ca1aceb00 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 16 Dec 2018 21:31:15 +0100 Subject: [PATCH] localename: Avoid test failure on some glibc systems. * tests/test-localename.c (test_locale_name, test_locale_name_posix): Unset environment variables that might disturb the first setlocale call, and verify that this setlocale call succeeds. --- ChangeLog | 7 +++++++ tests/test-localename.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f612a463d..9cf2c275a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-12-16 Bruno Haible + + localename: Avoid test failure on some glibc systems. + * tests/test-localename.c (test_locale_name, test_locale_name_posix): + Unset environment variables that might disturb the first setlocale call, + and verify that this setlocale call succeeds. + 2018-12-16 Assaf Gordon random: Fix build error on native Windows (regression from 2018-06-21). diff --git a/tests/test-localename.c b/tests/test-localename.c index 8c3c4254b0..2b91782f71 100644 --- a/tests/test-localename.c +++ b/tests/test-localename.c @@ -67,6 +67,7 @@ static struct { int cat; int mask; const char *string; } const categories[] = static void test_locale_name (void) { + const char *ret; const char *name; /* Check that gl_locale_name returns non-NULL. */ @@ -85,7 +86,21 @@ test_locale_name (void) unsetenv ("LC_MESSAGES"); unsetenv ("LC_NUMERIC"); unsetenv ("LANG"); - setlocale (LC_ALL, ""); + /* Need also to unset all environment variables that specify standard or + non-standard locale categories. Otherwise, on glibc systems, when some + of these variables are set and reference a nonexistent locale, the + setlocale (LC_ALL, "") call below would fail. */ + unsetenv ("LC_COLLATE"); + unsetenv ("LC_MONETARY"); + unsetenv ("LC_TIME"); + unsetenv ("LC_ADDRESS"); + unsetenv ("LC_IDENTIFICATION"); + unsetenv ("LC_MEASUREMENT"); + unsetenv ("LC_NAME"); + unsetenv ("LC_PAPER"); + unsetenv ("LC_TELEPHONE"); + ret = setlocale (LC_ALL, ""); + ASSERT (ret != NULL); ASSERT (strcmp (gl_locale_name (LC_MESSAGES, "LC_MESSAGES"), gl_locale_name_default ()) == 0); ASSERT (strcmp (gl_locale_name (LC_NUMERIC, "LC_NUMERIC"), @@ -496,6 +511,7 @@ test_locale_name_thread (void) static void test_locale_name_posix (void) { + const char *ret; const char *name; /* Get into a defined state, */ @@ -511,7 +527,21 @@ test_locale_name_posix (void) unsetenv ("LC_MESSAGES"); unsetenv ("LC_NUMERIC"); unsetenv ("LANG"); - setlocale (LC_ALL, ""); + /* Need also to unset all environment variables that specify standard or + non-standard locale categories. Otherwise, on glibc systems, when some + of these variables are set and reference a nonexistent locale, the + setlocale (LC_ALL, "") call below would fail. */ + unsetenv ("LC_COLLATE"); + unsetenv ("LC_MONETARY"); + unsetenv ("LC_TIME"); + unsetenv ("LC_ADDRESS"); + unsetenv ("LC_IDENTIFICATION"); + unsetenv ("LC_MEASUREMENT"); + unsetenv ("LC_NAME"); + unsetenv ("LC_PAPER"); + unsetenv ("LC_TELEPHONE"); + ret = setlocale (LC_ALL, ""); + ASSERT (ret != NULL); name = gl_locale_name_posix (LC_MESSAGES, "LC_MESSAGES"); ASSERT (name == NULL || strcmp (name, gl_locale_name_default ()) == 0); name = gl_locale_name_posix (LC_NUMERIC, "LC_NUMERIC"); -- 2.39.5