From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2eWc-0006MO-1t for guix-patches@gnu.org; Sun, 01 Apr 2018 11:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2eWY-0006E8-VG for guix-patches@gnu.org; Sun, 01 Apr 2018 11:04:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:54760) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f2eWY-0006Db-Ru for guix-patches@gnu.org; Sun, 01 Apr 2018 11:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f2eWY-00076K-I0 for guix-patches@gnu.org; Sun, 01 Apr 2018 11:04:02 -0400 Subject: [bug#31016] [PATCH] gnu: git: Fix checksum patch in 'patch-tests'. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2eVw-0005yt-7z for guix-patches@gnu.org; Sun, 01 Apr 2018 11:03:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2eVo-0005QJ-5X for guix-patches@gnu.org; Sun, 01 Apr 2018 11:03:24 -0400 Received: from mail-oln040092068107.outbound.protection.outlook.com ([40.92.68.107]:60912 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f2eVn-0005O9-6r for guix-patches@gnu.org; Sun, 01 Apr 2018 11:03:15 -0400 From: YOANN P Date: Sun, 1 Apr 2018 15:03:12 +0000 Message-ID: Content-Language: fr-FR Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31016@debbugs.gnu.org Hi Guix Team, First contribution to Guix project so i hope i forgot nothing in the proces= s to submit my patch. There is already some patchs for "t/t9100-git-svn-basic.sh" and "t/t9300-fa= st-import.sh" but they=20 assume than the store is always "/gnu/store". The bellow patch is intend to correct this and lets the check phase work th= e same way if a custom=20 store is used. Best regards, >From 08b8d3b9d32bd7f3f5b762541f38f95a2eb63c2a Mon Sep 17 00:00:00 2001 From: RockAndSka Date: Sun, 1 Apr 2018 16:11:30 +0200 Subject: [PATCH] gnu: git: Fix checksum patch in 'patch-tests'. * gnu/packages/version-control.scm (git)[arguments]: In 'patch-tests' phase, use %store-directory instead of '/gnu' to prevent tests failure in case a custom store path is used. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro= l.scm index ba985f6..60a509e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -238,10 +238,10 @@ as well as the classic centralized workflow.") (("\tcommit_template_commented") "\ttrue")) ;; More checksum mismatches due to odd shebangs. (substitute* "t/t9100-git-svn-basic.sh" - (("\"#!/gnu.*/bin/sh") "\"#!/bin/sh")) + (((string-append "\"#!" (%store-directory) ".*/bin/sh")) "\"= #!/bin/sh") ) (substitute* "t/t9300-fast-import.sh" - (("\t#!/gnu.*/bin/sh") "\t#!/bin/sh") - (("'#!/gnu.*/bin/sh") "'#!/bin/sh")) + (((string-append "\t#!" (%store-directory) ".*/bin/sh")) "\t= #!/bin/sh") + (((string-append "'#!" (%store-directory) ".*/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") --=20 2.7.4