r35821 - in /desktop/experimental/glib2.0/debian: changelog patches/07_disable_tests_on_slow_archs.patch

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Sep 27 04:25:56 2012
New Revision: 35821

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35821
Log:
07_disable_tests_on_slow_archs.patch: Disable some more tests on ARM.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35821&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Sep 27 04:25:56 2012
@@ -7,8 +7,9 @@
     change it's not created automatically any more.
   * Add 07_disable_tests_on_slow_archs.patch: Disable tests on slow
     architectures which keep failing the tests. These are currently
-    /socket/timed_wait, /mainloop/timeouts, and /timeout/rounding on armhf and
-    armel.
+    /socket/timed_wait, /mainloop/timeouts, /mainloop/child_sources,
+    /timeout/rounding, and the upper bound on /gdbus/method-calls-in-thread on
+    ARM platforms.
   * debian/control.in: Bump pcre dependency to >= 1:8.31.
 
   [ Michael Biebl ]

Modified: desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch?rev=35821&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] Thu Sep 27 04:25:56 2012
@@ -4,8 +4,8 @@
 
 Index: glib2.0-2.33.14/gio/tests/socket.c
 ===================================================================
---- glib2.0-2.33.14.orig/gio/tests/socket.c	2012-09-25 08:10:26.029164560 +0200
-+++ glib2.0-2.33.14/gio/tests/socket.c	2012-09-25 08:14:38.249176766 +0200
+--- glib2.0-2.33.14.orig/gio/tests/socket.c	2012-09-26 08:43:08.193418592 +0200
++++ glib2.0-2.33.14/gio/tests/socket.c	2012-09-26 14:29:34.842424607 +0200
 @@ -828,7 +828,9 @@
    g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
  #endif
@@ -18,9 +18,9 @@
    g_test_add_func ("/socket/unix-from-fd", test_unix_from_fd);
 Index: glib2.0-2.33.14/glib/tests/mainloop.c
 ===================================================================
---- glib2.0-2.33.14.orig/glib/tests/mainloop.c	2012-09-25 08:10:25.869164551 +0200
-+++ glib2.0-2.33.14/glib/tests/mainloop.c	2012-09-25 08:14:13.969175591 +0200
-@@ -684,7 +684,9 @@
+--- glib2.0-2.33.14.orig/glib/tests/mainloop.c	2012-09-26 08:43:08.193418592 +0200
++++ glib2.0-2.33.14/glib/tests/mainloop.c	2012-09-26 14:29:54.946425580 +0200
+@@ -684,11 +684,15 @@
  
    g_test_add_func ("/maincontext/basic", test_maincontext_basic);
    g_test_add_func ("/mainloop/basic", test_mainloop_basic);
@@ -29,11 +29,17 @@
 +#endif
    g_test_add_func ("/mainloop/priorities", test_priorities);
    g_test_add_func ("/mainloop/invoke", test_invoke);
++#if !defined(__arm__)
    g_test_add_func ("/mainloop/child_sources", test_child_sources);
+   g_test_add_func ("/mainloop/recursive_child_sources", test_recursive_child_sources);
++#endif
+   g_test_add_func ("/mainloop/swapping_child_sources", test_swapping_child_sources);
+   g_test_add_func ("/mainloop/source_time", test_source_time);
+ 
 Index: glib2.0-2.33.14/glib/tests/timeout.c
 ===================================================================
---- glib2.0-2.33.14.orig/glib/tests/timeout.c	2012-08-27 22:12:27.000000000 +0200
-+++ glib2.0-2.33.14/glib/tests/timeout.c	2012-09-25 08:14:29.341176334 +0200
+--- glib2.0-2.33.14.orig/glib/tests/timeout.c	2012-09-26 08:43:08.193418592 +0200
++++ glib2.0-2.33.14/glib/tests/timeout.c	2012-09-26 14:29:34.846424607 +0200
 @@ -102,7 +102,9 @@
    g_test_init (&argc, &argv, NULL);
  
@@ -44,3 +50,17 @@
  
    return g_test_run ();
  }
+Index: glib2.0-2.33.14/gio/tests/gdbus-threading.c
+===================================================================
+--- glib2.0-2.33.14.orig/gio/tests/gdbus-threading.c	2012-09-26 08:43:08.193418592 +0200
++++ glib2.0-2.33.14/gio/tests/gdbus-threading.c	2012-09-26 14:29:34.850424607 +0200
+@@ -406,7 +406,9 @@
+ 
+       /* elapsed_msec should be 4000 msec +/- change for overhead/inaccuracy */
+       g_assert_cmpint (elapsed_msec, >=, 3950);
++#if !defined(__arm__)
+       g_assert_cmpint (elapsed_msec,  <, 8000);
++#endif
+ 
+       g_print (" ");
+     }