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

Merge branch 'timezone-test-toolbox' into 'master'

Browse Source 
Fix gdatetime tests on toolbox

See merge request GNOME/glib!1168
This commit is contained in:
Sebastian Dröge 2019-10-18 14:34:07 +00:00
commit 51c3cf759e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gtimezone.c
View File

@ -1485,7 +1485,8 @@ rules_from_identifier (const gchar *identifier,
* the local time.
*
* In UNIX, the `TZ` environment variable typically corresponds
* to the name of a file in the zoneinfo database, or string in
* to the name of a file in the zoneinfo database, an absolute path to a file
* somewhere else, or a string in
* "std offset [dst [offset],start[/time],end[/time]]" (POSIX) format.
* There are no spaces in the specification. The name of standard
* and daylight savings time zone must be three or more alphabetic

4
glib/tests/gdatetime.c
View File

@ -2585,11 +2585,11 @@ test_identifier (void)
g_time_zone_unref (tz);
/* System timezone. We can’t change this, but we can at least assert that
* the identifier is non-NULL and doesn’t start with a slash. */
* the identifier is non-NULL and non-empty. */
tz = g_time_zone_new (NULL);
g_test_message ("System time zone identifier: %s", g_time_zone_get_identifier (tz));
g_assert_nonnull (g_time_zone_get_identifier (tz));
g_assert_cmpstr (g_time_zone_get_identifier (tz), !=, "");
g_assert_true (*g_time_zone_get_identifier (tz) != '/');
g_time_zone_unref (tz);
/* Local timezone tests. */