From unknown Sun Jun 22 00:30:42 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2017 19:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 28600 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 28600@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.150636950718213 (code B ref -1); Mon, 25 Sep 2017 19:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2017 19:58:27 +0000 Received: from localhost ([127.0.0.1]:58975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwZWM-0004jg-PJ for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwZWL-0004jU-71 for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwZWF-0003PF-7m for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:20 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:40809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwZWF-0003P9-4u for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwZWD-0000vO-S9 for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwZWA-0003Ny-Qp for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:17 -0400 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:55699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwZWA-0003NW-KB for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:14 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 971D013D6AB; Mon, 25 Sep 2017 20:58:11 +0100 (BST) Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 7385B13D1D9 for ; Mon, 25 Sep 2017 20:58:11 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1526303f for ; Mon, 25 Sep 2017 19:58:11 +0000 (UTC) From: Christopher Baines Date: Mon, 25 Sep 2017 20:58:10 +0100 Message-Id: <20170925195810.26912-1-mail@cbaines.net> X-Mailer: git-send-email 2.14.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Rather than adding the service to the system. The previous approach is causing the system tests to fail, as the os already contains a service of type gc-root-service-type, and the way that this service extends the system-service doesn't compose, causing an error if its added twice. ERROR: In procedure symlink: File exists * gnu/tests/install.scm (operating-system-with-gc-roots): Modify the existing gc-root-service, rather than adding another. --- gnu/tests/install.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 49743860e..28dfc3b8b 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -127,8 +127,9 @@ "Return a variant of OS where ROOTS are registered as GC roots." (operating-system (inherit os) - (services (cons (service gc-root-service-type roots) - (operating-system-user-services os))))) + (services + (modify-services (operating-system-user-services os) + (gc-root-service-type _ => roots))))) (define MiB (expt 2 20)) -- 2.14.1 From unknown Sun Jun 22 00:30:42 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2017 20:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28600 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 28600@debbugs.gnu.org Received: via spool by 28600-submit@debbugs.gnu.org id=B28600.150636978318754 (code B ref 28600); Mon, 25 Sep 2017 20:04:02 +0000 Received: (at 28600) by debbugs.gnu.org; 25 Sep 2017 20:03:03 +0000 Received: from localhost ([127.0.0.1]:58981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwZap-0004sQ-9u for submit@debbugs.gnu.org; Mon, 25 Sep 2017 16:03:03 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:40986 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwZam-0004rw-Tv for 28600@debbugs.gnu.org; Mon, 25 Sep 2017 16:03:01 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 2855313D6AB; Mon, 25 Sep 2017 21:03:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id BCF8713D1D9 for <28600@debbugs.gnu.org>; Mon, 25 Sep 2017 21:02:59 +0100 (BST) Date: Mon, 25 Sep 2017 21:02:55 +0100 From: Christopher Baines Message-ID: <20170925210255.0302fb81@cbaines.net> In-Reply-To: <20170925195810.26912-1-mail@cbaines.net> References: <20170925195810.26912-1-mail@cbaines.net> X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/8P.v6CN=B8rjy.leHNRaarJ"; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --Sig_/8P.v6CN=B8rjy.leHNRaarJ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Mon, 25 Sep 2017 20:58:10 +0100 Christopher Baines wrote: > Rather than adding the service to the system. >=20 > The previous approach is causing the system tests to fail, as the os > already contains a service of type gc-root-service-type, and the way > that this service extends the system-service doesn't compose, causing > an error if its added twice. >=20 > ERROR: In procedure symlink: File exists >=20 > * gnu/tests/install.scm (operating-system-with-gc-roots): Modify the > existing gc-root-service, rather than adding another. > --- > gnu/tests/install.scm | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm > index 49743860e..28dfc3b8b 100644 > --- a/gnu/tests/install.scm > +++ b/gnu/tests/install.scm > @@ -127,8 +127,9 @@ > "Return a variant of OS where ROOTS are registered as GC roots." > (operating-system > (inherit os) > - (services (cons (service gc-root-service-type roots) > - (operating-system-user-services os))))) > + (services > + (modify-services (operating-system-user-services os) > + (gc-root-service-type _ =3D> roots))))) > =20 > =0C > (define MiB (expt 2 20)) Quite a few of the system tests seem to be failing, I got the results below testing some version of Guix which I think roughly equivalent to the master branch. I think the above patch helps, but I'm not sure if it actually fixes any of the failing tests, as I think there are other issues. TOTAL: 27 PASS: /gnu/store/62pr6a9gpza57yx7qzk6mhr6d0l750wa-tailon-test PASS: /gnu/store/r06chj5z1sjwf839qyd0sg1lni8na137-mpd-test PASS: /gnu/store/p111z34c1in1h6g2gwqbncqlwnb65m6s-basic PASS: /gnu/store/pixmmgv3ms5fam9h9x7lawq71jr6sx22-memcached-test PASS: /gnu/store/4ns63ifvdd019m0pdgypx3xyvnhh7asw-elogind PASS: /gnu/store/cck9b28c7nrjb6hnmb6b2f53dngz1zk0-dicod PASS: /gnu/store/yxkbmsad9ji59wd8f2w4g7zby5vjf4cg-exim-test PASS: /gnu/store/9a5i3y1mq51l352k8gksf18v43myihb0-opensmtpd-test PASS: /gnu/store/9dvmrk9wjyki6ij4k7rg3wp0yi4miydh-prosody PASS: /gnu/store/0p8mpifvqwrn7pcgs15pvd9v5akxadly-inetd-test PASS: /gnu/store/h2xd8gdzjam94zbw1rapkcdpczg6nxa0-nfs PASS: /gnu/store/y2xlfj2kqz5119ibz88v7np49zn4qq2s-rsync-test PASS: /gnu/store/98yj0djybbahp7mmbhp9w8aq1700b98h-openssh PASS: /gnu/store/s1sjx6kp3zdbbb79qj6mw2d4n1zy5fwa-dropbear PASS: /gnu/store/jh45gkxlz40xcjbqr44fvkjcwabamrsm-libvirt-test PASS: /gnu/store/4m3csmgrb6lm8825y8z1mbns1r5jvlbc-nginx-test FAIL: /gnu/store/fz270kg3fsb79gmgrn4g3jhlvdncsy7p-nss-mdns FAIL: /gnu/store/2brmg8qyhig1fg8f1dxcnz2ii9q2jm55-mcron FAIL: /gnu/store/0mn5w20mgjcjlcl43dqs1mzp855bh7dd-halt FAIL: /gnu/store/zbmp1x95h7skfw9ns3k21lx7vk5nqb53-iso-image-installer FAIL: /gnu/store/mac0aa8r5711mivzhhar43a5dyg1in67-installed-os FAIL: /gnu/store/gk4zc3g40lnm2ijps27hkwrrd1yvajkn-installed-extlinux-os FAIL: /gnu/store/9653l9z5mqjpjs75b17h2k449s5lf689-btrfs-root-os FAIL: /gnu/store/cnp72hfl9nd08m3zqb93vhr8b59bdng0-raid-root-os FAIL: /gnu/store/3qqp3ps3s6hilw6zgriyvm3qpca8a0kv-encrypted-root-os FAIL: /gnu/store/n2a8hvrppj5c34cgd8m41yz6zxj1yhk2-separate-store-os FAIL: /gnu/store/2np47fqwi4vmhls0l69la6mbwayv1ygq-separate-home-os --Sig_/8P.v6CN=B8rjy.leHNRaarJ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnJYO9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xd/5g/9HQt0Pqpbn2qZevYhi/jWgQ7VxnSMqtSRBbcX7EDmjqypA8xHFkIplqbi hp4ekOkVuQbAGLr+SPdEeyZTfM8QCvcFgopGRi1cDmKzl7S+AgzTRFiQr42GbgYY b47vY1GdLBV56L9dvJwahZ2plIR0Gwsk/UyjIzgG44H0p7YcVSrfk+jQATU9/pJT eXtkI2QpOkurzxcgR6aXMWfdB9siTCj+jcDprlhjy2V/HIzYrlrom/25Nst4Dxju HFe/FoYrWS1zD+2vP+4F7Vm/mq9YMJYph1lQUWg/eZUgDQdYqkA6607B/eeFtKSs FvxzloEVpJC/uGYmrob02Yfel806yXYirg/4UhpV7H5tJVSmEyy0pBVEBGf0gNsd GEmWLcDcj0sbk2kju3jX3Uh3rQ3ASfoOdKFHajWFeYFIPjekEA/R4oIYdiwwY7VB kPzDMr5MAq48P/Sl2BqENoz/bkydW3y+wAnvNsKFgEizYGYFHKSKe5mj2bfufnVY i2NaOBPB3LU+Dt/GJ5nIKodL79OuTMjMvzPkd+zDi93DtZ4uSusjn89NY8U79SFs d4X42rzo6hMd7Lp0icARyUKqwiZ2BD66uLsZRuyFqV0Lg+mQuoOOizzlMToKKZXf VRD8QdoDhDORUL0BF4FXakz8/eWqtSI5izCi91v6oJC8z8yb5iI= =HfWV -----END PGP SIGNATURE----- --Sig_/8P.v6CN=B8rjy.leHNRaarJ-- From unknown Sun Jun 22 00:30:42 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2017 07:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28600 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 28600@debbugs.gnu.org Received: via spool by 28600-submit@debbugs.gnu.org id=B28600.150641198215187 (code B ref 28600); Tue, 26 Sep 2017 07:47:02 +0000 Received: (at 28600) by debbugs.gnu.org; 26 Sep 2017 07:46:22 +0000 Received: from localhost ([127.0.0.1]:59583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwkZS-0003wt-HN for submit@debbugs.gnu.org; Tue, 26 Sep 2017 03:46:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwkZR-0003wg-PM for 28600@debbugs.gnu.org; Tue, 26 Sep 2017 03:46:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwkZI-0000lK-QP for 28600@debbugs.gnu.org; Tue, 26 Sep 2017 03:46:16 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwkZI-0000lE-MQ; Tue, 26 Sep 2017 03:46:12 -0400 Received: from [193.50.110.164] (port=57482 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dwkZI-0003JP-7x; Tue, 26 Sep 2017 03:46:12 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170925195810.26912-1-mail@cbaines.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 5 =?UTF-8?Q?Vend=C3=A9miaire?= an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 26 Sep 2017 09:46:10 +0200 In-Reply-To: <20170925195810.26912-1-mail@cbaines.net> (Christopher Baines's message of "Mon, 25 Sep 2017 20:58:10 +0100") Message-ID: <878th13nst.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi! Christopher Baines skribis: > Rather than adding the service to the system. > > The previous approach is causing the system tests to fail, as the os alre= ady > contains a service of type gc-root-service-type, and the way that this se= rvice > extends the system-service doesn't compose, causing an error if its added > twice. > > ERROR: In procedure symlink: File exists Good catch! > * gnu/tests/install.scm (operating-system-with-gc-roots): Modify the exis= ting > gc-root-service, rather than adding another. > --- > gnu/tests/install.scm | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm > index 49743860e..28dfc3b8b 100644 > --- a/gnu/tests/install.scm > +++ b/gnu/tests/install.scm > @@ -127,8 +127,9 @@ > "Return a variant of OS where ROOTS are registered as GC roots." > (operating-system > (inherit os) > - (services (cons (service gc-root-service-type roots) > - (operating-system-user-services os))))) > + (services > + (modify-services (operating-system-user-services os) > + (gc-root-service-type _ =3D> roots))))) What about: (services (cons (simple-service 'extra-root gc-root-service-type roots) (operating-system-user-services os))) This would make sure there=E2=80=99s always a single =E2=80=98gc-root-servi= ce-type=E2=80=99 instance, and we=E2=80=99re just extending it with additional roots, rather= than overriding what it does. I can push that if it works for you. Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 00:30:42 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2017 08:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28600 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Cc: 28600@debbugs.gnu.org Received: via spool by 28600-submit@debbugs.gnu.org id=B28600.150641285516597 (code B ref 28600); Tue, 26 Sep 2017 08:01:02 +0000 Received: (at 28600) by debbugs.gnu.org; 26 Sep 2017 08:00:55 +0000 Received: from localhost ([127.0.0.1]:59593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwknX-0004Jc-2J for submit@debbugs.gnu.org; Tue, 26 Sep 2017 04:00:55 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:41548 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwknV-0004JU-09 for 28600@debbugs.gnu.org; Tue, 26 Sep 2017 04:00:54 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 2F07313E308; Tue, 26 Sep 2017 09:00:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id B5B1913D6AE; Tue, 26 Sep 2017 09:00:51 +0100 (BST) Date: Tue, 26 Sep 2017 09:00:48 +0100 From: Christopher Baines Message-ID: <20170926090048.72724ba9@cbaines.net> In-Reply-To: <878th13nst.fsf@gnu.org> References: <20170925195810.26912-1-mail@cbaines.net> <878th13nst.fsf@gnu.org> X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/RU3J.us4F3nj/hqJ4cJaTCu"; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --Sig_/RU3J.us4F3nj/hqJ4cJaTCu Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Tue, 26 Sep 2017 09:46:10 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Hi! >=20 > Christopher Baines skribis: >=20 > > Rather than adding the service to the system. > > > > The previous approach is causing the system tests to fail, as the > > os already contains a service of type gc-root-service-type, and the > > way that this service extends the system-service doesn't compose, > > causing an error if its added twice. > > > > ERROR: In procedure symlink: File exists =20 >=20 > Good catch! >=20 > > * gnu/tests/install.scm (operating-system-with-gc-roots): Modify > > the existing gc-root-service, rather than adding another. > > --- > > gnu/tests/install.scm | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm > > index 49743860e..28dfc3b8b 100644 > > --- a/gnu/tests/install.scm > > +++ b/gnu/tests/install.scm > > @@ -127,8 +127,9 @@ > > "Return a variant of OS where ROOTS are registered as GC roots." > > (operating-system > > (inherit os) > > - (services (cons (service gc-root-service-type roots) > > - (operating-system-user-services os))))) > > + (services > > + (modify-services (operating-system-user-services os) > > + (gc-root-service-type _ =3D> roots))))) =20 >=20 > What about: >=20 > (services (cons (simple-service 'extra-root > gc-root-service-type roots) > (operating-system-user-services os))) >=20 > This would make sure there=E2=80=99s always a single =E2=80=98gc-root-ser= vice-type=E2=80=99 > instance, and we=E2=80=99re just extending it with additional roots, rath= er > than overriding what it does. That fixes this issue, but I'm not sure what it means for the tests. If the roots are not replaced, then the bare-bones-os will be present as well as the roots added for each test. This is just a thought though, I'm fine with either fix. --Sig_/RU3J.us4F3nj/hqJ4cJaTCu Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnKCTBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdJRw/7B9M/5FoZPHY6yG2gK1Czh0mTR55fWGDr81tjJElTkFdZ0Xm1KG0FZQDP grSvAcdqZ6sGA39RhP6qak7WGZd8dqqCHB8jPPHrTbwrgddke6mpCUBDylSptU9c OOOjlD1v83JFiSd8fDhwpLTaLdOfJFjkRKyOiFbvNvAr/TEgtW/jDXnNvUDhqRzJ zNqAHxZtxYQSSQgsWr/xub8pC3+jcPNbyqS5Htz9cfB6vQlqMccQfQe6LzbosLMZ 5FybsA3cLlwwkghY50axSO4ed9yKVjb2fnNjQTsIqft3hPr1Lgk/uzLZv82iHrez JJuqiReTIIpsw4cMwYRVrh7qCBIIteaC9+s5jYpHBMMsUqvsj2GqYt//iQOdydVB sftoI5onpfAfkaRq12ukGqYSkxHMJDA7GLp9FfMTfOe8iLTftjeEZIiSGEoe5o0u 28xh+18VnCfUaK9KJ649mMEaTAVWIIwN94+Ju96IokC6vW1wRG6y4P4Rpd1emBvi zckH3XJyoaDoTCooXUqxak4GC3T9wQy1LouHXP9Nw86SKch3IL7gk9WVavB/uF0u sn2h/f41crlCePPH7DUDmw++jPj246SJOjPHXs5duGWC9Jfcjf9zUM0vVP+QjPCs 1SiZApblhz1+9SMmt5XSaLlIwMfLLLcFfqSTm1zNRrXwx7ViJ3M= =38ZG -----END PGP SIGNATURE----- --Sig_/RU3J.us4F3nj/hqJ4cJaTCu-- From unknown Sun Jun 22 00:30:42 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2017 08:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28600 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 28600@debbugs.gnu.org Received: via spool by 28600-submit@debbugs.gnu.org id=B28600.150641520320314 (code B ref 28600); Tue, 26 Sep 2017 08:41:02 +0000 Received: (at 28600) by debbugs.gnu.org; 26 Sep 2017 08:40:03 +0000 Received: from localhost ([127.0.0.1]:59664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwlPP-0005HZ-IY for submit@debbugs.gnu.org; Tue, 26 Sep 2017 04:40:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwlPN-0005H1-NX for 28600@debbugs.gnu.org; Tue, 26 Sep 2017 04:40:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwlPE-0000xd-Pw for 28600@debbugs.gnu.org; Tue, 26 Sep 2017 04:39:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwlPE-0000xX-MG; Tue, 26 Sep 2017 04:39:52 -0400 Received: from [193.50.110.164] (port=60070 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dwlPE-0001Vx-86; Tue, 26 Sep 2017 04:39:52 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170925195810.26912-1-mail@cbaines.net> <20170925210255.0302fb81@cbaines.net> Date: Tue, 26 Sep 2017 10:39:50 +0200 In-Reply-To: <20170925210255.0302fb81@cbaines.net> (Christopher Baines's message of "Mon, 25 Sep 2017 21:02:55 +0100") Message-ID: <8760c526qx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Christopher Baines skribis: > FAIL: /gnu/store/2brmg8qyhig1fg8f1dxcnz2ii9q2jm55-mcron Commit 077f1e6384fbd28ffd02e9e10a413bb3c24aaa15 fixes this one. The =E2=80=9Chalt=E2=80=9D test works for me. I haven=E2=80=99t looked at the installation tests. Ludo=E2=80=99. From unknown Sun Jun 22 00:30:42 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Christopher Baines Subject: bug#28600: closed (Re: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type.) Message-ID: References: <871smt26gl.fsf@gnu.org> <20170925195810.26912-1-mail@cbaines.net> X-Gnu-PR-Message: they-closed 28600 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 28600@debbugs.gnu.org Date: Tue, 26 Sep 2017 08:47:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1506415622-20938-1" This is a multi-part message in MIME format... ------------=_1506415622-20938-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #28600: [PATCH] tests: install: Switch to modifying the gc-root-service-typ= e. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 28600@debbugs.gnu.org. --=20 28600: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D28600 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1506415622-20938-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 28600-done) by debbugs.gnu.org; 26 Sep 2017 08:46:14 +0000 Received: from localhost ([127.0.0.1]:59670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwlVO-0005Qg-9u for submit@debbugs.gnu.org; Tue, 26 Sep 2017 04:46:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwlVN-0005QS-7n for 28600-done@debbugs.gnu.org; Tue, 26 Sep 2017 04:46:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwlVE-0003uO-Om for 28600-done@debbugs.gnu.org; Tue, 26 Sep 2017 04:46:07 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwlVE-0003uK-LK; Tue, 26 Sep 2017 04:46:04 -0400 Received: from [193.50.110.164] (port=60250 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dwlVE-0003fQ-8C; Tue, 26 Sep 2017 04:46:04 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Christopher Baines Subject: Re: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. References: <20170925195810.26912-1-mail@cbaines.net> <878th13nst.fsf@gnu.org> <20170926090048.72724ba9@cbaines.net> Date: Tue, 26 Sep 2017 10:46:02 +0200 In-Reply-To: <20170926090048.72724ba9@cbaines.net> (Christopher Baines's message of "Tue, 26 Sep 2017 09:00:48 +0100") Message-ID: <871smt26gl.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 28600-done Cc: 28600-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Christopher Baines skribis: > On Tue, 26 Sep 2017 09:46:10 +0200 > ludo@gnu.org (Ludovic Court=C3=A8s) wrote: [...] >> What about: >>=20 >> (services (cons (simple-service 'extra-root >> gc-root-service-type roots) >> (operating-system-user-services os))) >>=20 >> This would make sure there=E2=80=99s always a single =E2=80=98gc-root-se= rvice-type=E2=80=99 >> instance, and we=E2=80=99re just extending it with additional roots, rat= her >> than overriding what it does. > > That fixes this issue, but I'm not sure what it means for the tests. If > the roots are not replaced, then the bare-bones-os will be present as > well as the roots added for each test. I think it=E2=80=99s OK, because that=E2=80=99s what we want to test: we wa= nt to test the installation image with few modifications compared to what we=E2=80=99re shipping. Pushed as 945a8fc240dbc48e3e4e212ef527eadc70231d39. Now to see if there are still issues? Thanks! Ludo=E2=80=99. ------------=_1506415622-20938-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Sep 2017 19:58:27 +0000 Received: from localhost ([127.0.0.1]:58975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwZWM-0004jg-PJ for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwZWL-0004jU-71 for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwZWF-0003PF-7m for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:20 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:40809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwZWF-0003P9-4u for submit@debbugs.gnu.org; Mon, 25 Sep 2017 15:58:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwZWD-0000vO-S9 for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwZWA-0003Ny-Qp for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:17 -0400 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:55699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwZWA-0003NW-KB for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:14 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 971D013D6AB; Mon, 25 Sep 2017 20:58:11 +0100 (BST) Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 7385B13D1D9 for ; Mon, 25 Sep 2017 20:58:11 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1526303f for ; Mon, 25 Sep 2017 19:58:11 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] tests: install: Switch to modifying the gc-root-service-type. Date: Mon, 25 Sep 2017 20:58:10 +0100 Message-Id: <20170925195810.26912-1-mail@cbaines.net> X-Mailer: git-send-email 2.14.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Rather than adding the service to the system. The previous approach is causing the system tests to fail, as the os already contains a service of type gc-root-service-type, and the way that this service extends the system-service doesn't compose, causing an error if its added twice. ERROR: In procedure symlink: File exists * gnu/tests/install.scm (operating-system-with-gc-roots): Modify the existing gc-root-service, rather than adding another. --- gnu/tests/install.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 49743860e..28dfc3b8b 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -127,8 +127,9 @@ "Return a variant of OS where ROOTS are registered as GC roots." (operating-system (inherit os) - (services (cons (service gc-root-service-type roots) - (operating-system-user-services os))))) + (services + (modify-services (operating-system-user-services os) + (gc-root-service-type _ => roots))))) (define MiB (expt 2 20)) -- 2.14.1 ------------=_1506415622-20938-1--