From f1fc45a9fd168f3b44f03112815bda83d2c6f3ed Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 2 Jul 2014 13:52:12 -0500 Subject: gnu: libbonobo: Skip failing test case. * gnu/packages/patches/libbonobo-activation-test-race.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (libbonobo)[source]: New 'patches' field. --- gnu-system.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index ec697c556a..862d16dcf2 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -320,6 +320,7 @@ dist_patch_DATA = \ gnu/packages/patches/icu4c-test-date-format.patch \ gnu/packages/patches/inkscape-stray-comma.patch \ gnu/packages/patches/kmod-module-directory.patch \ + gnu/packages/patches/libbonobo-activation-test-race.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libffi-mips-n32-fix.patch \ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ -- cgit v1.2.3 From 8360758d5c3e8afdc5daa0b5f557360bd6116562 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 10 Jul 2014 16:43:17 -0500 Subject: gnu: Remove overlooked patch. * gnu-system.am (dist_patch_DATA): Remove patch deleted previously. --- gnu-system.am | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 862d16dcf2..5822c82138 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -299,7 +299,6 @@ dist_patch_DATA = \ gnu/packages/patches/gd-mips64-deplibs-fix.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ - gnu/packages/patches/glib-tests-newnet.patch \ gnu/packages/patches/glib-tests-prlimit.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ -- cgit v1.2.3 From ca9ea1a849d685db46adcb92449dff36427c48bd Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 10 Jul 2014 17:03:42 -0500 Subject: gnu: glib: Fix build on i686. * gnu/packages/patches/glib-tests-timer.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/glib.scm: Use it. --- gnu-system.am | 1 + gnu/packages/glib.scm | 3 ++- gnu/packages/patches/glib-tests-timer.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glib-tests-timer.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 5822c82138..6a22420e63 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -300,6 +300,7 @@ dist_patch_DATA = \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ gnu/packages/patches/glib-tests-prlimit.patch \ + gnu/packages/patches/glib-tests-timer.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/gnunet-fix-scheduler.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index c3b0b39f10..239715ecc7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -116,7 +116,8 @@ (define glib (base32 "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd")) (patches (list (search-patch "glib-tests-homedir.patch") (search-patch "glib-tests-desktop.patch") - (search-patch "glib-tests-prlimit.patch"))))) + (search-patch "glib-tests-prlimit.patch") + (search-patch "glib-tests-timer.patch"))))) (build-system gnu-build-system) (outputs '("out" ; everything "bin" ; glib-mkenums, gtester, etc.; depends on Python diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/patches/glib-tests-timer.patch new file mode 100644 index 0000000000..1ac364fcc1 --- /dev/null +++ b/gnu/packages/patches/glib-tests-timer.patch @@ -0,0 +1,26 @@ +* On i686 floating-point roundoff errors could sometimes cause this check to + fail depending on the elapsed microseconds. Improve rounding by adding a + fractional bit. + +* The /timer/stop test fails if compiler optimizations are enabled, which they + are by default. Disable that test. + +--- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 ++++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 +@@ -35,7 +35,7 @@ + elapsed = g_timer_elapsed (timer, µs); + + g_assert_cmpfloat (elapsed, <, 1.0); +- g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000); ++ g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6 + 0.5)) % 1000000); + + g_timer_destroy (timer); + } +@@ -204,7 +204,6 @@ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/timer/basic", test_timer_basic); +- g_test_add_func ("/timer/stop", test_timer_stop); + g_test_add_func ("/timer/continue", test_timer_continue); + g_test_add_func ("/timer/reset", test_timer_reset); + g_test_add_func ("/timeval/add", test_timeval_add); -- cgit v1.2.3