luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdatetime: Unset LC_ALL for the test as well

Browse Source 
This is a follow-up to a0c7f85437.

In addition LC_MESSAGES, we should remove LC_ALL from the environment
as well. Otherwise, LC_ALL overrides LC_MESSAGES, causing the test to
fail on FreeBSD when LC_ALL is set to a non-English locale.
This commit is contained in:
Ting-Wei Lan 2019-07-05 15:07:27 +08:00
parent a656555f76
commit 7089f67f14
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/tests/gdatetime.c
View File

@ -1327,6 +1327,7 @@ test_GDateTime_printf (void)
* that long, and it will cause the test to fail if dst isn't big * that long, and it will cause the test to fail if dst isn't big
* enough. * enough.
*/ */
gchar *old_lc_all;
gchar *old_lc_messages; gchar *old_lc_messages;
gchar dst[64]; gchar dst[64];
struct tm tt; struct tm tt;
@ -1357,6 +1358,9 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
g_date_time_unref (dt); \ g_date_time_unref (dt); \
g_free (p); } G_STMT_END g_free (p); } G_STMT_END
old_lc_all = g_strdup (g_getenv ("LC_ALL"));
g_unsetenv ("LC_ALL");
old_lc_messages = g_strdup (g_getenv ("LC_MESSAGES")); old_lc_messages = g_strdup (g_getenv ("LC_MESSAGES"));
g_setenv ("LC_MESSAGES", "C", TRUE); g_setenv ("LC_MESSAGES", "C", TRUE);
@ -1434,6 +1438,10 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
else else
g_unsetenv ("LC_MESSAGES"); g_unsetenv ("LC_MESSAGES");
g_free (old_lc_messages); g_free (old_lc_messages);
if (old_lc_all != NULL)
g_setenv ("LC_ALL", old_lc_all, TRUE);
g_free (old_lc_all);
} }
static void static void