r35807 - in /desktop/experimental/glib2.0/debian: changelog patches/07_disable_tests_on_slow_archs.patch patches/07_socket_test_bump_max_time.patch patches/09_mainloop_test_relax.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Sep 25 09:09:45 2012
New Revision: 35807

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35807
Log:
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.

Drop 07_socket_test_bump_max_time.patch and 09_mainloop_test_relax.patch again.
Now that we do not run the problematic ones on arm at all any more, we go back
to the stricter upstream tests.

Added:
    desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
Removed:
    desktop/experimental/glib2.0/debian/patches/07_socket_test_bump_max_time.patch
    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=35807&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Sep 25 09:09:45 2012
@@ -5,13 +5,11 @@
     long for all three and does not give us a lot of extra confidence.
   * debian/rules: Manually create debian/stamp-makefile-check, as with above
     change it's not created automatically any more.
-  * Add 07_socket_test_bump_max_time.patch: Increase /socket/timed_wait test
-    max time. On slow architectures like armel, this test often fails due to
-    "(poll_duration < 110000): (154022 < 110000)".
+  * 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.
   * 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/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=35807&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] Tue Sep 25 09:09:45 2012
@@ -1,0 +1,46 @@
+Description: Disable tests on slow architectures which keep failing the tests.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Forwarded: No
+
+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
+@@ -828,7 +828,9 @@
+   g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
+ #endif
+   g_test_add_func ("/socket/close_graceful", test_close_graceful);
++#if !defined(__arm__)
+   g_test_add_func ("/socket/timed_wait", test_timed_wait);
++#endif
+   g_test_add_func ("/socket/address", test_sockaddr);
+ #ifdef G_OS_UNIX
+   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 @@
+ 
+   g_test_add_func ("/maincontext/basic", test_maincontext_basic);
+   g_test_add_func ("/mainloop/basic", test_mainloop_basic);
++#if !defined(__arm__)
+   g_test_add_func ("/mainloop/timeouts", test_timeouts);
++#endif
+   g_test_add_func ("/mainloop/priorities", test_priorities);
+   g_test_add_func ("/mainloop/invoke", test_invoke);
+   g_test_add_func ("/mainloop/child_sources", test_child_sources);
+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
+@@ -102,7 +102,9 @@
+   g_test_init (&argc, &argv, NULL);
+ 
+   g_test_add_func ("/timeout/seconds", test_seconds);
++#if !defined(__arm__)
+   g_test_add_func ("/timeout/rounding", test_rounding);
++#endif
+ 
+   return g_test_run ();
+ }

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35807&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue Sep 25 09:09:45 2012
@@ -4,9 +4,8 @@
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch
-07_socket_test_bump_max_time.patch
+07_disable_tests_on_slow_archs.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