[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/97: gnu: glib: Drop glib-tests-homedir.patch.
From: |
Ludovic Courtès |
Subject: |
12/97: gnu: glib: Drop glib-tests-homedir.patch. |
Date: |
Wed, 13 Apr 2016 17:31:45 +0000 |
civodul pushed a commit to branch gnome-updates
in repository guix.
commit 28bf66a0b6431afb321e7c24207caf3dd9d2fdea
Author: å®‹æ–‡æ¦ <address@hidden>
Date: Sat Apr 2 18:00:41 2016 +0800
gnu: glib: Drop glib-tests-homedir.patch.
* gnu/packages/glib.scm (glib)[source]: Remove glib-tests-homedir.patch.
[arguments]: Set HOME and disable '/gdbus/codegen-peer-to-peer' test.
* gnu/packages/patches/glib-tests-homedir.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
---
gnu-system.am | 1 -
gnu/packages/glib.scm | 7 ++-
gnu/packages/patches/glib-tests-homedir.patch | 59 -------------------------
3 files changed, 5 insertions(+), 62 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 8822d0b..35352f7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -484,7 +484,6 @@ dist_patch_DATA =
\
gnu/packages/patches/ghostscript-runpath.patch \
gnu/packages/patches/glib-networking-ssl-cert-file.patch \
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/glib-tests-gapplication.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 2fb601c..2b90c12 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -139,8 +139,7 @@ shared NFS home directories.")
(sha256
(base32
"1yzxr1ip3l0m9ydk5nq32piq70c9f17p5f0jyvlsghzbaawh67ss"))
- (patches (list (search-patch "glib-tests-homedir.patch")
- (search-patch "glib-tests-desktop.patch")
+ (patches (list (search-patch "glib-tests-desktop.patch")
(search-patch "glib-tests-prlimit.patch")
(search-patch "glib-tests-timer.patch")
(search-patch "glib-tests-gapplication.patch")))))
@@ -171,6 +170,7 @@ shared NFS home directories.")
"/share/zoneinfo"))
;; Some tests want write access there.
+ (setenv "HOME" (getcwd))
(setenv "XDG_CACHE_HOME" (getcwd))
(substitute* '("glib/gspawn.c"
@@ -179,6 +179,9 @@ shared NFS home directories.")
(("/bin/sh")
(string-append (assoc-ref inputs "bash") "/bin/sh")))
+ ;; Disable a test that requires /etc/machine-id.
+ (substitute* "gio/tests/gdbus-peer.c"
+ (("g_test_add_func.*/gdbus/codegen-peer-to-peer.*") ""))
;; Disable a test that requires dbus.
(substitute* "gio/tests/gdbus-serialization.c"
(("g_test_add_func \
diff --git a/gnu/packages/patches/glib-tests-homedir.patch
b/gnu/packages/patches/glib-tests-homedir.patch
deleted file mode 100644
index 0a2bcf1..0000000
--- a/gnu/packages/patches/glib-tests-homedir.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-`g_get_home_dir' looks at /etc/passwd first, which fails in chroot builds.
-The gdbus tests use it to lookup .dbus-keyrings, so they cannot run in our
-chroot build environment. Thus, disable them.
-
---- glib-2.34.3/gio/tests/gdbus-connection-flush.c 2013-01-16
17:29:46.000000000 +0100
-+++ glib-2.34.3/gio/tests/gdbus-connection-flush.c 2013-01-16
17:29:47.000000000 +0100
-@@ -373,10 +373,6 @@ main (int argc,
- g_type_init ();
- g_test_init (&argc, &argv, NULL);
-
-- g_test_add ("/gdbus/connection/flush/busy", Fixture, NULL,
-- setup, test_flush_busy, teardown);
-- g_test_add ("/gdbus/connection/flush/idle", Fixture, NULL,
-- setup, test_flush_idle, teardown);
-
- ret = g_test_run();
-
---- glib-2.38.0.orig/gio/tests/gdbus-peer.c 2013-08-08 12:00:40.000000000
+0200
-+++ glib-2.38.0/gio/tests/gdbus-peer.c 2013-09-30 19:36:40.000000000 +0200
-@@ -1746,11 +1746,6 @@
-
- g_test_add_func ("/gdbus/peer-to-peer", test_peer);
- g_test_add_func ("/gdbus/delayed-message-processing",
delayed_message_processing);
-- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
--
-- g_test_add_func ("/gdbus/tcp-anonymous", test_tcp_anonymous);
-- g_test_add_func ("/gdbus/credentials", test_credentials);
-- g_test_add_func ("/gdbus/codegen-peer-to-peer", codegen_test_peer);
-
- ret = g_test_run();
-
---- glib-2.37.1/gio/tests/gdbus-exit-on-close.c 2013-06-07
23:41:34.000000000 +0200
-+++ glib-2.37.1/gio/tests/gdbus-exit-on-close.c 2013-06-07
23:41:40.000000000 +0200
-@@ -211,6 +211,7 @@ main (int argc,
-
- g_test_init (&argc, &argv, NULL);
-
-+ return g_test_run();
- for (i = 0; cases[i].name != NULL; i++)
- {
- gchar *name;
-@@ -224,5 +225,4 @@ main (int argc,
- g_free (name);
- }
-
-- return g_test_run();
- }
-
---- glib-2.34.3/gio/tests/gdbus-non-socket.c 2013-01-16 18:13:25.000000000
+0100
-+++ glib-2.34.3/gio/tests/gdbus-non-socket.c 2013-01-16 18:13:27.000000000
+0100
-@@ -294,7 +294,6 @@ main (int argc,
- g_type_init ();
- g_test_init (&argc, &argv, NULL);
-
-- g_test_add_func ("/gdbus/non-socket", test_non_socket);
-
- ret = g_test_run();
-
-
- 16/97: gnu: shared-mime-info: Update to 1.6., (continued)
- 16/97: gnu: shared-mime-info: Update to 1.6., Ludovic Courtès, 2016/04/13
- 19/97: gnu: gobject-introspection: Update to 1.48.0., Ludovic Courtès, 2016/04/13
- 21/97: gnu: libsigc++: Update to 2.8.0., Ludovic Courtès, 2016/04/13
- 27/97: gnu: gtk+: Update to 3.20.2., Ludovic Courtès, 2016/04/13
- 22/97: gnu: glibmm: Update to 2.48.1., Ludovic Courtès, 2016/04/13
- 15/97: gnu: harfbuzz: Update to 1.2.4., Ludovic Courtès, 2016/04/13
- 33/97: gnu: gcr: Update 3.20.0., Ludovic Courtès, 2016/04/13
- 04/97: gnu: cairo: Update to 1.14.6., Ludovic Courtès, 2016/04/13
- 17/97: gnu: gdk-pixbuf: Update to 2.34.0., Ludovic Courtès, 2016/04/13
- 08/97: gnu: poppler: Update to 0.42.0., Ludovic Courtès, 2016/04/13
- 12/97: gnu: glib: Drop glib-tests-homedir.patch.,
Ludovic Courtès <=
- 03/97: gnu: pixman: Update to 0.34.0., Ludovic Courtès, 2016/04/13
- 06/97: gnu: poppler: Enable GObject introspection., Ludovic Courtès, 2016/04/13
- 39/97: gnu: libpeas: Update to 1.18.0., Ludovic Courtès, 2016/04/13
- 38/97: gnu: adwaita-icon-theme: Update to 3.20., Ludovic Courtès, 2016/04/13
- 50/97: gnu: seahorse: Update to 3.20.0., Ludovic Courtès, 2016/04/13
- 52/97: gnu: python-pygobject: Update to 3.20.0., Ludovic Courtès, 2016/04/13
- 46/97: gnu: libwnck: Update to 3.14.1., Ludovic Courtès, 2016/04/13
- 69/97: gnu: clutter-gtk: Update to 1.8.0., Ludovic Courtès, 2016/04/13
- 55/97: gnu: dconf: Update to 0.26.0., Ludovic Courtès, 2016/04/13
- 20/97: gnu: pango: Update to 1.40.0., Ludovic Courtès, 2016/04/13