42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
|
Since glibc 2.17 doesn't install timezone data by default (see
|
||
|
|
http://thread.gmane.org/gmane.comp.lib.glibc.alpha/17516), and since we
|
||
|
|
don't have that around, shamelessly skip this test.
|
||
|
|
|
||
|
|
--- glib-2.34.3/glib/tests/gdatetime.c 2013-01-16 15:47:57.000000000 +0100
|
||
|
|
+++ glib-2.34.3/glib/tests/gdatetime.c 2013-01-16 15:47:58.000000000 +0100
|
||
|
|
@@ -186,14 +186,6 @@ test_GDateTime_equal (void)
|
||
|
|
g_assert (g_date_time_equal (dt1, dt2));
|
||
|
|
g_date_time_unref (dt1);
|
||
|
|
|
||
|
|
- /* America/Recife is in UTC-0300 */
|
||
|
|
- tz = g_time_zone_new ("America/Recife");
|
||
|
|
- dt1 = g_date_time_new (tz, 2010, 5, 24, 8, 0, 0);
|
||
|
|
- g_time_zone_unref (tz);
|
||
|
|
- g_assert_cmpint (g_date_time_get_utc_offset (dt1) / G_USEC_PER_SEC, ==, (-3 * 3600));
|
||
|
|
- g_assert (g_date_time_equal (dt1, dt2));
|
||
|
|
- g_date_time_unref (dt1);
|
||
|
|
- g_date_time_unref (dt2);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void
|
||
|
|
@@ -608,7 +608,6 @@ test_GDateTime_new_full (void)
|
||
|
|
g_assert_cmpint (8, ==, g_date_time_get_hour (dt));
|
||
|
|
g_assert_cmpint (4, ==, g_date_time_get_minute (dt));
|
||
|
|
g_assert_cmpint (0, ==, g_date_time_get_second (dt));
|
||
|
|
- g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt));
|
||
|
|
g_assert (!g_date_time_is_daylight_savings (dt));
|
||
|
|
g_date_time_unref (dt);
|
||
|
|
}
|
||
|
|
@@ -1354,11 +1354,8 @@ main (gint argc,
|
||
|
|
g_test_add_func ("/GDateTime/to_timeval", test_GDateTime_to_timeval);
|
||
|
|
g_test_add_func ("/GDateTime/to_utc", test_GDateTime_to_utc);
|
||
|
|
g_test_add_func ("/GDateTime/now_utc", test_GDateTime_now_utc);
|
||
|
|
- g_test_add_func ("/GDateTime/dst", test_GDateTime_dst);
|
||
|
|
g_test_add_func ("/GDateTime/test_z", test_z);
|
||
|
|
g_test_add_func ("/GDateTime/test-all-dates", test_all_dates);
|
||
|
|
- g_test_add_func ("/GTimeZone/find-interval", test_find_interval);
|
||
|
|
- g_test_add_func ("/GTimeZone/adjust-time", test_adjust_time);
|
||
|
|
g_test_add_func ("/GTimeZone/no-header", test_no_header);
|
||
|
|
|
||
|
|
return g_test_run ();
|