From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Subject: [PATCH 2/4] gnu: glib: Drop glib-tests-homedir.patch. Date: Sun, 3 Apr 2016 10:30:29 +0800 Message-ID: <1459650631-13117-2-git-send-email-iyzsong@gmail.com> References: <1459650631-13117-1-git-send-email-iyzsong@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amXoZ-0005C7-67 for guix-devel@gnu.org; Sat, 02 Apr 2016 22:31:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amXoV-0001d5-VO for guix-devel@gnu.org; Sat, 02 Apr 2016 22:30:59 -0400 Received: from smtp10.openmailbox.org ([62.4.1.44]:42064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amXoV-0001cw-Ma for guix-devel@gnu.org; Sat, 02 Apr 2016 22:30:55 -0400 In-Reply-To: <1459650631-13117-1-git-send-email-iyzsong@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= * gnu/packages/glib.scm (glib)[source]: Remave 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(-) delete mode 100644 gnu/packages/patches/glib-tests-homedir.patch diff --git a/gnu-system.am b/gnu-system.am index d45b3d1..293bda3 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -486,7 +486,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(); - - -- 2.6.3