luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 04:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix gdatetime test on non-UTC systems

Browse Source 
Commit 0b114b2687 accidentally made the
tests only pass on systems running in a UTC timezone, as it checked the
local timezone `%Z` format against `UTC`.

This happens to pass on all the GLib CI runners except the macOS one,
which is running under CET.

Make the formatting tests timezone-independent by running them with UTC
datetimes. There’s already a separate test for checking that `%Z` works
correctly in a non-UTC timezone (`test_z`).

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3611#note_1859208
This commit is contained in:
Philip Withnall 2023-10-03 18:24:53 +01:00
parent f3469858f3
commit 62c33e653f
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
glib/tests/gdatetime.c
View File

@ -1536,15 +1536,8 @@ test_GDateTime_get_day_of_year (void)
static void static void
test_GDateTime_printf (void) test_GDateTime_printf (void)
{ {
/* 64 seems big, but one zoneinfo file, Factory, has an abbreviation
* that long, and it will cause the test to fail if dst isn't big
* enough.
*/
gchar *old_lc_all; gchar *old_lc_all;
gchar *old_lc_messages; gchar *old_lc_messages;
gchar dst[64];
struct tm tt;
time_t t;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *current_tz = NULL; gchar *current_tz = NULL;
@ -1552,14 +1545,14 @@ test_GDateTime_printf (void)
#endif #endif
#define TEST_PRINTF(f,o) G_STMT_START { \ #define TEST_PRINTF(f,o) G_STMT_START { \
GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\ GDateTime *__dt = g_date_time_new_utc (2009, 10, 24, 0, 0, 0);\
gchar *__p = g_date_time_format (__dt, (f)); \ gchar *__p = g_date_time_format (__dt, (f)); \
g_assert_cmpstr (__p, ==, (o)); \ g_assert_cmpstr (__p, ==, (o)); \
g_date_time_unref (__dt); \ g_date_time_unref (__dt); \
g_free (__p); } G_STMT_END g_free (__p); } G_STMT_END
#define TEST_PRINTF_DATE(y,m,d,f,o) G_STMT_START { \ #define TEST_PRINTF_DATE(y,m,d,f,o) G_STMT_START { \
GDateTime *dt = g_date_time_new_local (y, m, d, 0, 0, 0); \ GDateTime *dt = g_date_time_new_utc (y, m, d, 0, 0, 0); \
gchar *p = g_date_time_format (dt, (f)); \ gchar *p = g_date_time_format (dt, (f)); \
gchar *o_casefold = g_utf8_casefold (o, -1); \ gchar *o_casefold = g_utf8_casefold (o, -1); \
gchar *p_casefold = g_utf8_casefold (p, -1); \ gchar *p_casefold = g_utf8_casefold (p, -1); \
@ -1570,7 +1563,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
g_free (p); } G_STMT_END g_free (p); } G_STMT_END
#define TEST_PRINTF_TIME(h,m,s,f,o) G_STMT_START { \ #define TEST_PRINTF_TIME(h,m,s,f,o) G_STMT_START { \
GDateTime *dt = g_date_time_new_local (2009, 10, 24, (h), (m), (s)); \ GDateTime *dt = g_date_time_new_utc (2009, 10, 24, (h), (m), (s)); \
gchar *p = g_date_time_format (dt, (f)); \ gchar *p = g_date_time_format (dt, (f)); \
g_assert_cmpstr (p, ==, (o)); \ g_assert_cmpstr (p, ==, (o)); \
g_date_time_unref (dt); \ g_date_time_unref (dt); \
@ -1582,22 +1575,6 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
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);
/*
* This is a little helper to make sure we can compare timezones to
* that of the generated timezone.
*/
t = time (NULL);
g_assert_cmpint (t, !=, (time_t) -1);
memset (&tt, 0, sizeof(tt));
get_localtime_tm (t, &tt);
tt.tm_year = 2009 - 1900;
tt.tm_mon = 9; /* 0 indexed */
tt.tm_mday = 24;
t = mktime (&tt);
memset (&tt, 0, sizeof(tt));
get_localtime_tm (t, &tt);
strftime (dst, sizeof(dst), "%Z", &tt);
TEST_PRINTF ("%a", "Sat"); TEST_PRINTF ("%a", "Sat");
TEST_PRINTF ("%A", "Saturday"); TEST_PRINTF ("%A", "Saturday");
TEST_PRINTF ("%b", "Oct"); TEST_PRINTF ("%b", "Oct");
@ -1642,7 +1619,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
TEST_PRINTF ("%", ""); TEST_PRINTF ("%", "");
TEST_PRINTF ("%9", NULL); TEST_PRINTF ("%9", NULL);
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
TEST_PRINTF ("%Z", dst); TEST_PRINTF ("%Z", "UTC");
#elif defined G_OS_WIN32 #elif defined G_OS_WIN32
g_assert (GetDynamicTimeZoneInformation (&dtz_info) != TIME_ZONE_ID_INVALID); g_assert (GetDynamicTimeZoneInformation (&dtz_info) != TIME_ZONE_ID_INVALID);
if (wcscmp (dtz_info.StandardName, L"") != 0) if (wcscmp (dtz_info.StandardName, L"") != 0)