~ruther/guix-local

36d2a3afeb9fba6f00de77cc62ef51e74380aff9 — Ludovic Courtès 11 years ago f2122ed
gnu: glib: Work around unreliable GIO test.

Fixes <http://bugs.gnu.org/18445>.

* gnu/packages/patches/glib-tests-gapplication.patch: New file
* gnu/packages/glib.scm (glib)[source]: Add it.
* gnu-system.am (dist_patch_DATA): Add it.
3 files changed, 31 insertions(+), 1 deletions(-)

M gnu-system.am
M gnu/packages/glib.scm
A gnu/packages/patches/glib-tests-gapplication.patch
M gnu-system.am => gnu-system.am +1 -0
@@ 358,6 358,7 @@ dist_patch_DATA =						\
  gnu/packages/patches/glib-tests-homedir.patch			\
  gnu/packages/patches/glib-tests-prlimit.patch			\
  gnu/packages/patches/glib-tests-timer.patch			\
  gnu/packages/patches/glib-tests-gapplication.patch		\
  gnu/packages/patches/glibc-bootstrap-system.patch		\
  gnu/packages/patches/glibc-ldd-x86_64.patch			\
  gnu/packages/patches/gnunet-fix-scheduler.patch		\

M gnu/packages/glib.scm => gnu/packages/glib.scm +2 -1
@@ 129,7 129,8 @@ shared NFS home directories.")
            (patches (list (search-patch "glib-tests-homedir.patch")
                           (search-patch "glib-tests-desktop.patch")
                           (search-patch "glib-tests-prlimit.patch")
                           (search-patch "glib-tests-timer.patch")))))
                           (search-patch "glib-tests-timer.patch")
                           (search-patch "glib-tests-gapplication.patch")))))
   (build-system gnu-build-system)
   (outputs '("out"           ; everything
              "bin"           ; glib-mkenums, gtester, etc.; depends on Python

A gnu/packages/patches/glib-tests-gapplication.patch => gnu/packages/patches/glib-tests-gapplication.patch +28 -0
@@ 0,0 1,28 @@
This test has proven to be unreliable, often leading to things like this
in gapplication.log:

  PASS: gapplication 3 /gapplication/properties
  Failed to register: The connection is closed
  **
  GLib-GIO:ERROR:gapplication.c:564:test_quit: assertion failed: (activated)
  ok 4 /gapplication/app-id
  PASS: gapplication 4 /gapplication/app-id
  ../../tap-test: line 5: 24133 Aborted                 $1 -k --tap
  # GLib-GIO:ERROR:gapplication.c:564:test_quit: assertion failed: (activated)
  cleaning up pid 24154
  ERROR: gapplication - missing test plan
  ERROR: gapplication - exited with status 134 (terminated by signal 6?)

See <https://bugs.debian.org/756273> and <http://bugs.gnu.org/18445>.


--- glib-2.40.2/gio/tests/gapplication.c	2014-12-03 22:34:44.566667649 +0100
+++ glib-2.40.2/gio/tests/gapplication.c	2014-12-03 22:34:45.346674179 +0100
@@ -685,7 +685,6 @@ main (int argc, char **argv)
 /*  g_test_add_func ("/gapplication/non-unique", test_nonunique); */
   g_test_add_func ("/gapplication/properties", properties);
   g_test_add_func ("/gapplication/app-id", appid);
-  g_test_add_func ("/gapplication/quit", test_quit);
   g_test_add_func ("/gapplication/local-actions", test_local_actions);
 /*  g_test_add_func ("/gapplication/remote-actions", test_remote_actions); */
   g_test_add_func ("/gapplication/local-command-line", test_local_command_line);