r35798 - in /desktop/experimental/glib2.0/debian: changelog patches/09_mainloop_test_relax.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Mon Sep 24 07:02:37 2012
New Revision: 35798

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35798
Log:
Add 09_mainloop_test_relax.patch: On slower architectures like ARM,
/mainloop/timeouts insistently fails with having done fewer iterations in
1050 ms than expected. Relax the required minimum loop runs.

Added:
    desktop/experimental/glib2.0/debian/patches/09_mainloop_test_relax.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35798&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Mon Sep 24 07:02:37 2012
@@ -9,6 +9,9 @@
     max time. On slow architectures like armel, this test often fails due to
     "(poll_duration < 110000): (154022 < 110000)".
   * debian/control.in: Bump pcre dependency to >= 1:8.31.
+  * Add 09_mainloop_test_relax.patch: On slower architectures like ARM,
+    /mainloop/timeouts insistently fails with having done fewer iterations in
+    1050 ms than expected. Relax the required minimum loop runs.
 
   [ Michael Biebl ]
   * New upstream release.

Added: desktop/experimental/glib2.0/debian/patches/09_mainloop_test_relax.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/09_mainloop_test_relax.patch?rev=35798&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/09_mainloop_test_relax.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/09_mainloop_test_relax.patch [utf-8] Mon Sep 24 07:02:37 2012
@@ -1,0 +1,40 @@
+From 8c34d1a6a6e3e6400119d2962e56e6b94d9976c9 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Mon, 24 Sep 2012 08:56:50 +0200
+Subject: [PATCH] Relax /mainloop/timeouts test
+
+On slower architectures like ARM, tests insistently fail with
+
+  test_timeouts: assertion failed (a >= 9): (8 >= 9)
+  test_timeouts: assertion failed (b == 4): (3 == 4)
+
+Relax the required minimum loop runs.
+
+Note that this should not necessarily go upstream, on fast/unloaded build
+machines it is better to test for the more exact numbers.
+---
+ glib/tests/mainloop.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
+index 3b78c65..5a4c963 100644
+--- a/glib/tests/mainloop.c
++++ b/glib/tests/mainloop.c
+@@ -192,10 +192,11 @@ test_timeouts (void)
+   g_main_loop_run (loop);
+ 
+   /* this is a race condition; under some circumstances we might not get 10
+-   * 100ms runs in 1050 ms, so consider 9 as "close enough" */
+-  g_assert_cmpint (a, >=, 9);
++   * 100ms runs in 1050 ms, likewise for the others */
++  g_assert_cmpint (a, >=, 8);
+   g_assert_cmpint (a, <=, 10);
+-  g_assert_cmpint (b, ==, 4);
++  g_assert_cmpint (b, >=, 3);
++  g_assert_cmpint (b, <=, 4);
+   g_assert_cmpint (c, ==, 3);
+ 
+   g_main_loop_unref (loop);
+-- 
+1.7.10.4
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35798&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Mon Sep 24 07:02:37 2012
@@ -6,6 +6,7 @@
 06_thread_test_ignore_prctl_fail.patch
 07_socket_test_bump_max_time.patch
 08_disable_gapplication_basic_test.patch
+09_mainloop_test_relax.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 92_revert_appinfo_command_line.patch