From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 03 17:08:00 2017 Received: (at submit) by debbugs.gnu.org; 3 Aug 2017 21:08:00 +0000 Received: from localhost ([127.0.0.1]:40428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddNLU-0001Me-IH for submit@debbugs.gnu.org; Thu, 03 Aug 2017 17:08:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddNLS-0001MP-DO for submit@debbugs.gnu.org; Thu, 03 Aug 2017 17:07:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddNLM-0003bs-7s for submit@debbugs.gnu.org; Thu, 03 Aug 2017 17:07:45 -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,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:55445) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddNLM-0003bi-4K for submit@debbugs.gnu.org; Thu, 03 Aug 2017 17:07:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddNLK-0006uP-KQ for guix-patches@gnu.org; Thu, 03 Aug 2017 17:07:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddNLG-0003W7-CL for guix-patches@gnu.org; Thu, 03 Aug 2017 17:07:42 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:47179) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddNLG-0003Vz-8b for guix-patches@gnu.org; Thu, 03 Aug 2017 17:07:38 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id F0FF32083F; Thu, 3 Aug 2017 17:07:37 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 03 Aug 2017 17:07:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=fm1; bh=IaEDfuxgrUUDGlvFXvmYrwc1S/JZj9 cGR31n02+POiM=; b=kNUHdYMX3JDe9lMV1IMEnTClR1ISxheO45xC4NifKqn1ut pr+asOGsfOSd7XCQAxdUwZ3+u/v/C5h2RoMZs+e9MYgTMctWRNDScRcgU1fe9IBk ErZ1Hx4NVvUdcKj6r8U3y/RoPw7U3kEkVhyUohi6ppTngUApRbo9CPXzolh4Tt98 vSLgouXP6tX1zKik1euSdES/4QTOCHWM5w0IuZlICKmGql4Mzm6TXjbkn+Af/f/a Ld8WJ3M/kXKhmLSRNz45JCSqlZ1Bacx4kJL6WYOpJaHLh0EHbw7fkurq4R3zCkCy pGAJmMWy9BeuA2H6XC5pp8c1E6AWPwvl+Mj2oETQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=IaEDfu xgrUUDGlvFXvmYrwc1S/JZj9cGR31n02+POiM=; b=Pkms/AKfVvXizF/2H5AWwF hXQFPncjV99RKaTbyu9MwwopidrJnyseDJ+JA2zo12l6x3eren+52cqTE3ADl5We 3Hyi4p/T2tTj8JRPIVI0Istl+CSZIcxqWMRGPLfXGgCEbVEYJ3+k1rBhZvmMyKWO pxw8SXFvNKWytvUcd/8+hck73gv/oWbEC3fhbyviCgFzKDSzRPudPa7Nw2ykgcYy QaGGNu3R4TvSRINTwMx2OEOElGvm0/pZTWSiGmoX+R3/dnGyvrLJjAK6ymKdXKLt tljRQo3uLWfc3fTvB8y5vqyGTt2EXbQctYdyp/QdT/kpru5IPHKXUM9yt8ABeveA == X-ME-Sender: X-Sasl-enc: dhaM870kzK4TLaAXKihwGOzWfCbDdPpAM8jw6H7gYu8g 1501794457 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 85C077E683; Thu, 3 Aug 2017 17:07:37 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH] gnu: git: Enable tests. Date: Thu, 3 Aug 2017 23:07:30 +0200 Message-Id: <20170803210730.1122-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke 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.7 (/) * gnu/packages/version-control.scm (git)[arguments]: Remove #:tests?. Add 'patch-tests' phase. --- gnu/packages/version-control.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9274a93f6..99b3dbc4e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -176,7 +176,6 @@ as well as the classic centralized workflow.") ;; nars; see . "NO_INSTALL_HARDLINKS=indeed") #:test-target "test" - #:tests? #f ; FIXME: Many tests are failing ;; The explicit --with-tcltk forces the build system to hardcode the ;; absolute file name to 'wish'. @@ -203,6 +202,37 @@ as well as the classic centralized workflow.") ;; Add the "PM.stamp" to avoid "no rule to make target". (call-with-output-file "perl/PM.stamp" (const #t)) #t)) + (add-before 'check 'patch-tests + (lambda _ + ;; These files contain some funny bytes that Guile is unable + ;; to decode for shebang patching. Just delete them. + (for-each delete-file '("t/t4201-shortlog.sh" + "t/t7813-grep-icase-iso.sh")) + ;; Many tests contain inline shell scripts (hooks etc). + (substitute* (find-files "t" "\\.sh$") + (("#!/bin/sh") (string-append "#!" (which "sh")))) + ;; Un-do shebang patching here to prevent checksum mismatch. + (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post") + (("^#!.*/bin/perl") "#!/usr/bin/perl")) + (substitute* "t/t5003-archive-zip.sh" + (("cp /bin/sh") (string-append "cp " (which "sh")))) + (substitute* "t/t6030-bisect-porcelain.sh" + (("\"/bin/sh\"") (string-append "\"" (which "sh") "\""))) + ;; FIXME: This test runs `git commit` with a bogus EDITOR + ;; and empty commit message, but does not fail the way it's + ;; expected to. The test passes when invoked interactively. + (substitute* "t/t7508-status.sh" + (("\tcommit_template_commented") "\ttrue")) + ;; More checksum mismatches due to odd shebangs. + (substitute* "t/t9100-git-svn-basic.sh" + (("\"#!/gnu.*/bin/sh") "\"#!/bin/sh")) + (substitute* "t/t9300-fast-import.sh" + (("\t#!/gnu.*/bin/sh") "\t#!/bin/sh") + (("'#!/gnu.*/bin/sh") "'#!/bin/sh")) + ;; FIXME: Some hooks fail with "basename: command not found". + ;; See 't/trash directory.t9164.../svn-hook.log'. + (delete-file "t/t9164-git-svn-dcommit-concurrent.sh") + #t)) (add-after 'install 'install-shell-completion (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.13.4 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 03 18:15:39 2017 Received: (at 27938) by debbugs.gnu.org; 3 Aug 2017 22:15:39 +0000 Received: from localhost ([127.0.0.1]:40484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddOP4-0002u6-Ui for submit@debbugs.gnu.org; Thu, 03 Aug 2017 18:15:39 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddOP3-0002tz-CX for 27938@debbugs.gnu.org; Thu, 03 Aug 2017 18:15:37 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DB2D220990; Thu, 3 Aug 2017 18:15:36 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Thu, 03 Aug 2017 18:15:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=Tg9vxockztQsiioWtGfd+vEwx7GGhtuNbwF9OX Gb8G4=; b=sLAPVHJziBrkVAPv/8jKqWwujCR0lK0zgyxjuzi6Qtgaw4z+n+OQ6y mJep951z7j2FKrHUGxRVzqg6YgZRySglYH4D7qR7X5IcwICS+KVSuDTH5W3zDACK NYOglhpzGnppk+CyPPiXjTHkYV3PLMQ/JOcpa3C7noywpnCaSZxSs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Tg9vxockztQsiioWtG fd+vEwx7GGhtuNbwF9OXGb8G4=; b=Flap+EEwTg1/EDi8S634JLhej+l8CzVG+3 kA397ibev9xPSxChHMZYl3whbRBM26tXtjdQ+UzEXL9uRlakr2Nw06m90jB5nCPe u9CzM4uneUgKyE88Emxn3qXhyTokzaAFFfJoQXY4w00GsBkDifd+O3YM4KjMI1XS 3VoFRw7B42m1WLFpe+VYKWQtrO8/BdPd2SxBVqKHVOfpoKXvLGrIiHRaaV3otxKR 2KYkzu/StXTt68YsoyA1yNJeqo/ZYht98gYcNTu9ODT3qmWr1W3K7KOE2moKsxH5 Ce3dhYc0xCOdygufiKnwX1npE6JBbficwTMICDmj1DZYwei0qEuQ== X-ME-Sender: X-Sasl-enc: XBqLOEo/MmOdSgOX1lmpxuKxr00hY3Ap94US+35biWDe 1501798536 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 9550A24580; Thu, 3 Aug 2017 18:15:36 -0400 (EDT) Date: Thu, 3 Aug 2017 18:15:34 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#27938] [PATCH] gnu: git: Enable tests. Message-ID: <20170803221534.GA2421@jasmine.lan> References: <20170803210730.1122-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pWyiEgJYm5f9v55/" Content-Disposition: inline In-Reply-To: <20170803210730.1122-1-mbakke@fastmail.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27938 Cc: 27938@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: -0.7 (/) --pWyiEgJYm5f9v55/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Aug 03, 2017 at 11:07:30PM +0200, Marius Bakke wrote: > * gnu/packages/version-control.scm (git)[arguments]: Remove #:tests?. Add > 'patch-tests' phase. Wow, awesome! LGTM. > + ;; Un-do shebang patching here to prevent checksum mismatch. > + (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post") > + (("^#!.*/bin/perl") "#!/usr/bin/perl")) I've been thinking, we should have a way to pass a list of directories or files to exclude from the shebang patcher. We have a few packages that include files where patching the shebang is the wrong thing to do. For example, the Git example hook scripts. --pWyiEgJYm5f9v55/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlmDoIYACgkQJkb6MLrK fwibwxAA4/7fPPlkFaVrjew6fRb6QAy/iFNhwHXrlD/CCbjAGctQb6vlExRZDwqh 6enI4XMWZ4Yz+TupDmny1uIG5yPzKhy4Zw3G5vgkIuksq3w/YvK8ueSnAxt8yDws 470AlPiuonysbTETpuNh7adca9GE4hnG2WLw0iF5cbY8Izqajr+XUZlbt8wG94El gjGwBEvQLOdA2tNhm81I7KpXhN+IyTfx6Um8NusnVXXu0SXz2mEpCl78RZAowKBR otCdYUjKbXWZ0RbSTboT9XtLkyE+YsdhwQQz7GVmc/ko3ZzILNXsZgra72lAN46F u2PxmWRNUTNBlkaRMCdTsT2rFvsLWVRVd7aDC7pwkgpKrJSaBqMl49pHSZHoGntm 4LTdae7P/rzpJDj+eRSVqO+IGA69NoV8yt4kKO7z2HcmR7a1zE3i3ilNJiao3iQV Vj7IrhUZFxwY0KqxytZe+zRaJ58/P1s/VRwN4o9ghyqim1sQQSutdo38nev7fbVB HWiIDVSOKs3erY0fFP4kRLJGkqmkd7Kd9o/Uya/p9/tzzHm393bJMnyRRfRget/z bCyA86NF1vY/ThHeMWQ6rEl3E0MGfPwhjgAkVvkIo4DG9wwG66FfCQtdXJEUygs8 yWvIaW0yVlEvbd1wArcSCgPHNGlFR5PBZLiP21CT/rba1YvONE4= =a4Bb -----END PGP SIGNATURE----- --pWyiEgJYm5f9v55/-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 03 19:35:39 2017 Received: (at 27938-done) by debbugs.gnu.org; 3 Aug 2017 23:35:39 +0000 Received: from localhost ([127.0.0.1]:40534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddPeV-0004jL-Cx for submit@debbugs.gnu.org; Thu, 03 Aug 2017 19:35:39 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddPeT-0004jE-3Z for 27938-done@debbugs.gnu.org; Thu, 03 Aug 2017 19:35:37 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D339D209AB; Thu, 3 Aug 2017 19:35:36 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 03 Aug 2017 19:35:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=ikuMvsnmWYIo/XdEITmHanI7Zgt1yT4lgm6qXWEkj og=; b=hbbadkAhm6ABUz758KHZrf3X4zU1RgwIEPvRvz7N7fa5f5c6SjyQ0k06O 9b7vO0X31MAG5M6qULZnTYPZ8Wv2Iy9RrRyPadojW0z9rbANVK9l5bt/KnIkZYTK iR4LibCJlkh9qIJOeBwHzZFgPt+cNy4BteG4P1K6VzyQse9KaIb+mGdva9Om3ENH 5y/p2ZEh9PBAUd3zl/1hCnlSsnIh++QgcHAIwZ5YalB4uhN6vsYzRgosHr0MjTH1 dlCWUH/rsJZFy0UVzdzskK1cb6BZ1TsBAFfKKsvdUuC4h1mqxPICPO62L7CwY/ES VOPWRJv8OeFEMj5ORaWL3Nf0l4fFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=ikuMvsnmWYIo/XdEIT mHanI7Zgt1yT4lgm6qXWEkjog=; b=k1hR1WRMOwK6ugPaRLsLm7t5uN1Lek+7cw Eky8Roibx9U1Kh6obiapkNuAYejrxLOSzJXzeVnhkw/Pt6f/TTDbeL8CAQIFoxQk XgG8StdCPG3L4yWjcZ3cYUKPECm9kTlV7Gmiu/xbjf9asH7FpTHb4iF09jodlqxJ MG4h2DRAJKtQ9L5dPFTNkOU0yhLJyspu9c7Z8AsI7D5+lsw1e1fPORO+KBPTwurT knsUBoPTN6XwnYQZSW/jVr27OScARrMV4dEwdm5FOoAxeblLZvG6RjLb0moMSZpp n6qy1TmskP/I9eaeElaVdE6n+q6G4Fd0ssxL2rrKT7o8ei4kOQFg== X-ME-Sender: X-Sasl-enc: V0xLYz1hm7eO5NRAFzO90ns5WPK6JXCbaYIXI/vIt3u7 1501803336 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 60D4224597; Thu, 3 Aug 2017 19:35:36 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: [bug#27938] [PATCH] gnu: git: Enable tests. In-Reply-To: <20170803221534.GA2421@jasmine.lan> References: <20170803210730.1122-1-mbakke@fastmail.com> <20170803221534.GA2421@jasmine.lan> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Fri, 04 Aug 2017 01:35:34 +0200 Message-ID: <87poccusvt.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27938-done Cc: 27938-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: -0.7 (/) --=-=-= Content-Type: text/plain Leo Famulari writes: > On Thu, Aug 03, 2017 at 11:07:30PM +0200, Marius Bakke wrote: >> * gnu/packages/version-control.scm (git)[arguments]: Remove #:tests?. Add >> 'patch-tests' phase. > > Wow, awesome! LGTM. Thanks for the fast review! Pushed in c9f4f56b24801718d89c2520bec08867516e1371. > >> + ;; Un-do shebang patching here to prevent checksum mismatch. >> + (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post") >> + (("^#!.*/bin/perl") "#!/usr/bin/perl")) > > I've been thinking, we should have a way to pass a list of directories > or files to exclude from the shebang patcher. We have a few packages > that include files where patching the shebang is the wrong thing to do. > For example, the Git example hook scripts. That would be nice. I guess we can experiment with overriding the various patching phases and see what works. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmDs0YACgkQoqBt8qM6 VPq77gf+MP2TEBvCjlVwvD684nswBjsTc0C/0HjXIa25h6VIWMESg1Ym3h5lIN9x sOQceADfeRo7t1OMegHExNOF6fgn5FPsYA3rlS9NgU9idqlw2kxefO44MdbRqjz0 MQMhzegcM/3pXxJlcEBRPotuR+dAlPap98/JmU9IMvtDIvxYGVHl07/40evfHk+Y LLfkq272WNK9zwTKgMQlYzcnkSTV2p7bUcxk6WjN0F8sUr5+mfmLinC2r7W+WdPo 3GegELs0yRxlaRda4S3N0yGUjMEgDRgoCe0IVg3t4ZII1s864Cgch/N4EwvJ46Hn bD08L20cAqUOWNmyMnkjhCvi5bPXkw== =SxVd -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Aug 18 11:31:58 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 01 Sep 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator