summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/glib-tests-timer.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/glib-tests-timer.patch')
-rw-r--r--gnu/packages/patches/glib-tests-timer.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/patches/glib-tests-timer.patch
new file mode 100644
index 00000000000..1ac364fcc10
--- /dev/null
+++ b/gnu/packages/patches/glib-tests-timer.patch
@@ -0,0 +1,26 @@
1* On i686 floating-point roundoff errors could sometimes cause this check to
2 fail depending on the elapsed microseconds. Improve rounding by adding a
3 fractional bit.
4
5* The /timer/stop test fails if compiler optimizations are enabled, which they
6 are by default. Disable that test.
7
8--- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600
9+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500
10@@ -35,7 +35,7 @@
11 elapsed = g_timer_elapsed (timer, &micros);
12
13 g_assert_cmpfloat (elapsed, <, 1.0);
14- g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000);
15+ g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6 + 0.5)) % 1000000);
16
17 g_timer_destroy (timer);
18 }
19@@ -204,7 +204,6 @@
20 g_test_init (&argc, &argv, NULL);
21
22 g_test_add_func ("/timer/basic", test_timer_basic);
23- g_test_add_func ("/timer/stop", test_timer_stop);
24 g_test_add_func ("/timer/continue", test_timer_continue);
25 g_test_add_func ("/timer/reset", test_timer_reset);
26 g_test_add_func ("/timeval/add", test_timeval_add);