luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-24 22:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/pwithnall/553-tz-freebsd-tests' into 'master'

Browse Source 
tests: Fix GDateTime tests on FreeBSD

See merge request GNOME/glib!1767
This commit is contained in:
Sebastian Dröge
2020-11-24 09:33:47 +00:00
parent 72360eb8bd 2237db78f1
commit ec981cf570
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glib/tests/gdatetime.c
View File

@@ -2849,8 +2849,13 @@ test_time_zone_caching (void)
/* Check the default timezone, local and UTC. These are cached internally in /* Check the default timezone, local and UTC. These are cached internally in
* GLib, so should persist even after the last third party reference is * GLib, so should persist even after the last third party reference is
* dropped. */ * dropped.
*
* The default timezone could be NULL on some platforms (FreeBSD) if
* `/etc/localtime` is not set correctly. */
tz1 = g_time_zone_new_identifier (NULL); tz1 = g_time_zone_new_identifier (NULL);
if (tz1 != NULL)
{
g_assert_nonnull (tz1); g_assert_nonnull (tz1);
g_time_zone_unref (tz1); g_time_zone_unref (tz1);
tz2 = g_time_zone_new_identifier (NULL); tz2 = g_time_zone_new_identifier (NULL);
@@ -2858,6 +2863,7 @@ test_time_zone_caching (void)
g_time_zone_unref (tz2); g_time_zone_unref (tz2);
g_assert_true (tz1 == tz2); g_assert_true (tz1 == tz2);
}
tz1 = g_time_zone_new_utc (); tz1 = g_time_zone_new_utc ();
g_time_zone_unref (tz1); g_time_zone_unref (tz1);