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

Merge branch 'gdate-no-dst' into 'main'

Browse Source 
GDate: Fix tests on Windows on certain locales

See merge request GNOME/glib!2600
This commit is contained in:
Philip Withnall 2022-04-13 21:12:46 +00:00
commit a072c84d95
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gdate.c
View File

@ -2556,9 +2556,7 @@ win32_strftime_helper (const GDate *d,
break; break;
case 'Z': case 'Z':
n = GetTimeZoneInformation (&tzinfo); n = GetTimeZoneInformation (&tzinfo);
if (n == TIME_ZONE_ID_UNKNOWN) if (n == TIME_ZONE_ID_UNKNOWN || n == TIME_ZONE_ID_STANDARD)
;
else if (n == TIME_ZONE_ID_STANDARD)
g_array_append_vals (result, tzinfo.StandardName, wcslen (tzinfo.StandardName)); g_array_append_vals (result, tzinfo.StandardName, wcslen (tzinfo.StandardName));
else if (n == TIME_ZONE_ID_DAYLIGHT) else if (n == TIME_ZONE_ID_DAYLIGHT)
g_array_append_vals (result, tzinfo.DaylightName, wcslen (tzinfo.DaylightName)); g_array_append_vals (result, tzinfo.DaylightName, wcslen (tzinfo.DaylightName));

23
glib/tests/date.c
View File

@ -826,6 +826,8 @@ test_two_digit_years (void)
GDate *d; GDate *d;
gchar buf[101]; gchar buf[101];
gchar *old_locale; gchar *old_locale;
gboolean use_alternative_format = FALSE;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
LCID old_lcid; LCID old_lcid;
#endif #endif
@ -848,6 +850,25 @@ test_two_digit_years (void)
g_date_strftime (buf, sizeof (buf), "%D", d); g_date_strftime (buf, sizeof (buf), "%D", d);
g_assert_cmpstr (buf, ==, "10/10/76"); g_assert_cmpstr (buf, ==, "10/10/76");
g_date_set_parse (d, buf); g_date_set_parse (d, buf);
#ifdef G_OS_WIN32
/*
* It depends on the locale setting whether the dd/mm/yy
* format is allowed for g_date_set_parse() on Windows, which
* corresponds to whether there is an d/M/YY or d/M/YYYY (or so)
* option in the "Date and Time Format" setting for the selected
* locale in the Control Panel settings. If g_date_set_parse()
* renders the GDate invalid with the dd/mm/yy format, use an
* alternative format (yy/mm/dd) for g_date_set_parse() for the
* 2-digit year tests.
*/
if (!g_date_valid (d))
use_alternative_format = TRUE;
#endif
if (use_alternative_format)
g_date_set_parse (d, "76/10/10");
g_assert_cmpint (g_date_get_month (d), ==, 10); g_assert_cmpint (g_date_get_month (d), ==, 10);
g_assert_cmpint (g_date_get_day (d), ==, 10); g_assert_cmpint (g_date_get_day (d), ==, 10);
g_assert_true ((g_date_get_year (d) == 1976) || g_assert_true ((g_date_get_year (d) == 1976) ||
@ -857,7 +878,7 @@ test_two_digit_years (void)
g_date_set_dmy (d, 10, 10, 29); g_date_set_dmy (d, 10, 10, 29);
g_date_strftime (buf, sizeof (buf), "%D", d); g_date_strftime (buf, sizeof (buf), "%D", d);
g_assert_cmpstr (buf, ==, "10/10/29"); g_assert_cmpstr (buf, ==, "10/10/29");
g_date_set_parse (d, buf); g_date_set_parse (d, use_alternative_format ? "29/10/10" : buf);
g_assert_cmpint (g_date_get_month (d), ==, 10); g_assert_cmpint (g_date_get_month (d), ==, 10);
g_assert_cmpint (g_date_get_day (d), ==, 10); g_assert_cmpint (g_date_get_day (d), ==, 10);
g_assert_true ((g_date_get_year (d) == 2029) || g_assert_true ((g_date_get_year (d) == 2029) ||