From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 2/4] gnu: glib: Drop glib-tests-homedir.patch. Date: Sun, 3 Apr 2016 13:09:34 +0300 Message-ID: <20160403100934.GA6142@debian-netbook> References: <1459650631-13117-1-git-send-email-iyzsong@gmail.com> <1459650631-13117-2-git-send-email-iyzsong@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="WIyZ46R2i8wDzkSu" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ameyU-0004wC-Di for guix-devel@gnu.org; Sun, 03 Apr 2016 06:09:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ameyQ-0005tx-BY for guix-devel@gnu.org; Sun, 03 Apr 2016 06:09:42 -0400 Received: from flashner.co.il ([178.62.234.194]:41494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ameyQ-0005tt-10 for guix-devel@gnu.org; Sun, 03 Apr 2016 06:09:38 -0400 Content-Disposition: inline In-Reply-To: <1459650631-13117-2-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: =?utf-8?B?5a6L5paH5q2m?= Cc: guix-devel@gnu.org --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 03, 2016 at 10:30:29AM +0800, =E5=AE=8B=E6=96=87=E6=AD=A6 wrote: > * gnu/packages/glib.scm (glib)[source]: Remave glib-tests-homedir.patch. s/Remave/remove > [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 >=20 > 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 =3D \ > 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")) > =20 > ;; Some tests want write access there. > + (setenv "HOME" (getcwd)) > (setenv "XDG_CACHE_HOME" (getcwd)) > =20 > (substitute* '("glib/gspawn.c" > @@ -179,6 +179,9 @@ shared NFS home directories.") > (("/bin/sh") > (string-append (assoc-ref inputs "bash") "/bin/sh"))) > =20 > + ;; 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 build= s. > -The gdbus tests use it to lookup .dbus-keyrings, so they cannot run in o= ur > -chroot build environment. Thus, disable them. > - > ---- glib-2.34.3/gio/tests/gdbus-connection-flush.c 2013-01-16 17:29:46.0= 00000000 +0100 > -+++ glib-2.34.3/gio/tests/gdbus-connection-flush.c 2013-01-16 17:29:47.0= 00000000 +0100 > -@@ -373,10 +373,6 @@ main (int argc, > - g_type_init (); > - g_test_init (&argc, &argv, NULL); > -=20 > -- 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); > -=20 > - ret =3D g_test_run(); > - > ---- glib-2.38.0.orig/gio/tests/gdbus-peer.c 2013-08-08 12:00:40.0000= 00000 +0200 > -+++ glib-2.38.0/gio/tests/gdbus-peer.c 2013-09-30 19:36:40.000000000 +0= 200 > -@@ -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 =3D g_test_run(); > -=20 > ---- glib-2.37.1/gio/tests/gdbus-exit-on-close.c 2013-06-07 23:41:34.0000= 00000 +0200 > -+++ glib-2.37.1/gio/tests/gdbus-exit-on-close.c 2013-06-07 23:41:40.0000= 00000 +0200 > -@@ -211,6 +211,7 @@ main (int argc, > -=20 > - g_test_init (&argc, &argv, NULL); > -=20 > -+ return g_test_run(); > - for (i =3D 0; cases[i].name !=3D NULL; i++) > - { > - gchar *name; > -@@ -224,5 +225,4 @@ main (int argc, > - g_free (name); > - } > -=20 > -- return g_test_run(); > - } > - > ---- glib-2.34.3/gio/tests/gdbus-non-socket.c 2013-01-16 18:13:25.0000000= 00 +0100 > -+++ glib-2.34.3/gio/tests/gdbus-non-socket.c 2013-01-16 18:13:27.0000000= 00 +0100 > -@@ -294,7 +294,6 @@ main (int argc, > - g_type_init (); > - g_test_init (&argc, &argv, NULL); > -=20 > -- g_test_add_func ("/gdbus/non-socket", test_non_socket); > -=20 > - ret =3D g_test_run(); > -=20 > - > --=20 > 2.6.3 >=20 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --WIyZ46R2i8wDzkSu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXAOveAAoJEPTB05F+rO6TdIsQAIdkDd8G4fO6SvUBmzIspEug ++gCwwpb8amGwTdVIboKVUgK+X5VgAhwjijJ4gDpvFxDhCcktL5NiJfoPz8A+0O3 EK4qxz8rPx9YKFdpcxnEDKVN+mrH3Mc+MHlF3QMl9W7uvelytfqH1lEmdvZigTHh 8rFyT8cqq8RJjr4Ce3yY9cyFMdFmqyPv8xQoUtmEFl9lEqTMY05j102pMsiKSFyu M3dx+I2AZthePyfx0LDyAgoLFtdFRRF+Eq9lB8NPmd5aCtzO6LPRqxmolwCyn1D/ 51Iy+DgDQ/sUrUHeuWozCaM/tUIzGilMt1VN8+XULKt0VxFreSmoFzWvgN0b//O1 iJa0KWGwZtUgzrt2uCDkqjrcuE1T0+az7qOwIe+4kViNQahyjyvERCXaQK7kSmwa 2zE8WhAuTHQwX+UTOPtXaYsunm/cyFMT8u6PviQeGW4dsvkprt/iRNKROdMz+D6i 1fgboYdV7wsSr3mHHAmoFlep7/mOLGSajwJlRLNYfE14yJpMZzRLynBeXWB0b0m2 D8bSAbBymH3OT31/Eu8eGB0FMkS6DeDcIX3fZEUVMo1KvdWLJWYeH4MYxQh6nHZO 2gs8jyFkEEbgi4645UvhfV5ytmsYNYDHs0R6sBkWi8qwse/TDH6Tv2Yb47soz/AA S3YfMUCxt72XWJ4zZvzK =oeeR -----END PGP SIGNATURE----- --WIyZ46R2i8wDzkSu--