From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: bug#25177: Test failures don't cause some Python packages to fail [was Re: [PATCH 05/11] gnu: Add python-pygit2.] Date: Mon, 12 Dec 2016 00:34:34 +0100 Message-ID: <87vauqkpkl.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20161211181237.24485-1-ng0@libertad.pw> <20161211181237.24485-6-ng0@libertad.pw> <20161211223454.GA9474@jasmine> <871sxem5ix.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87y3zmkqwa.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20161211232300.GB24179@jasmine> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGDe6-0003iE-OR for bug-guix@gnu.org; Sun, 11 Dec 2016 18:35:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGDe2-00074Y-Kd for bug-guix@gnu.org; Sun, 11 Dec 2016 18:35:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cGDe2-00074Q-CU for bug-guix@gnu.org; Sun, 11 Dec 2016 18:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cGDe2-0004Jq-3w for bug-guix@gnu.org; Sun, 11 Dec 2016 18:35:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20161211232300.GB24179@jasmine> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Leo Famulari Cc: 25177@debbugs.gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > On Mon, Dec 12, 2016 at 12:05:57AM +0100, Marius Bakke wrote: >> Marius Bakke writes: >>=20 >> > Perhaps something like this would work (untested)? >>=20 >> Oops, here is the patch I wanted to attach: > > Can you make it a patch? :) I'm testing it now on a branch, will report on the results in while. Here it is in patch form: --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlhN4osACgkQoqBt8qM6 VPovqwgAjNNcnT38HjE0ORDIVJMAOtwjgZrw7BH8sVvZcgifddpEWFcOY84Ur/t8 vU+Xh2VJiT5yAP1V1Sa50ir1ZEkI6fWjPNvtubu4B4w9zqfrUZfILF2H2/SKCiCn M8gbdj243Q1bx1cAeir48sAUitmtxDWgninRSp3NjiHvfFKhKkkXB8RY9zRQsVcg MVSYzmzwANqExS8TtC1tN1t8IDxzkKEY4yQmkmRE/zg8juP/djJWEdxH8XZOt2yI lcTpT0ZnujKvLVglVsqMNCByKsNiWeW12NUsf0a946liRmpJa0YvuqpTbAcZQXdT JW0vvDILblpMvhHdsypALZw5Bb8ChQ== =7PmO -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-build-system-python-Make-sure-return-value-from-chec.patch >From e069a7f1927ade7a178cb876ee4b4c339a093ba5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2016 00:25:27 +0100 Subject: [PATCH] build-system/python: Make sure return value from 'check' is preserved. * guix/build/python-build-system.scm (check): Wrap 'call-setuppy' in 'if' so that it actually fails when the tests fail. --- guix/build/python-build-system.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 3f280b0ac..20eb24edc 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -137,11 +137,13 @@ ;; (given with `package_dir`). This will by copied to the output, too, ;; so we need to remove. (let ((before (find-files "build" "\\.egg-info$" #:directories? #t))) - (call-setuppy test-target '() use-setuptools?) - (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t)) - (inter (lset-difference eqv? after before))) - (for-each delete-file-recursively inter))) - #t)) + (if (call-setuppy test-target '() use-setuptools?) + (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t)) + (inter (lset-difference eqv? after before))) + (for-each delete-file-recursively inter) + #t)) + #f) + #t)) (define (get-python-version python) (let* ((version (last (string-split python #\-))) -- 2.11.0 --=-=-=--