From patchwork Sun Apr 13 17:39:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41641 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1721027BC4B; Sun, 13 Apr 2025 18:41:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9943F27BC49 for ; Sun, 13 Apr 2025 18:41:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u41KN-0002pJ-04; Sun, 13 Apr 2025 13:41:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u41KJ-0002oc-99 for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u41KI-00036O-Rw for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3yJ8lnlOCPcK7hRFUgk/y3XTICoUCEFgGG58pu0M2ms=; b=uA3shi5FbOATsiBbB0El53E8EeP6Ek5xlanWn1kgbytfFtdSQcdNn1f9nxozVzlbo/aE5NYtqWWptkSK7xmLQuC0OiRYD54eKuS3/fz6ObY6UtH6ZM0TgjmZGaXEmUWeUGHBRRjsj6lJ5MNTl+rjUbI2apiQTg32qBGRTZwAAlffi7cRnO0DqhLAOkZLjXO671UXGIWTxjGnILA6rnDtb27NJ9hI4+Q40Poq74wRwM7UkhhE180x/lzr+5gx945NrNG4Cwjcp0BsMlIQ2tnw/hGjkTrybPJHHC6LSRYGeFfH+ECk2NEZKXvwUdoSPoh3dSTOKzpXbj/YXI2f9xHTKw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u41KI-0000aX-ME for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v3 3/4] gnu: quilt: Use standard check phase. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 17:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445660302193 (code B ref 76594); Sun, 13 Apr 2025 17:41:02 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 17:40:30 +0000 Received: from localhost ([127.0.0.1]:43720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u41Jl-0000ZJ-NI for submit@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:30 -0400 Received: from mail-co1nam11olkn2051.outbound.protection.outlook.com ([40.92.18.51]:30560 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u41Jj-0000Yz-DY for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xmjLX+OYsyPC1y5pd8VwVxE4HcS9vFvjwB21WIHs2yVS4k+ssW7Ylbw1UxhTLYoPmcNo5SbYEWhW1p2M+9Rb1pp7GKVUDN0AsYg0cbn1xhJb8laEA5hVVeOEoVQc5O7XbWXn1tlyjNNEH9rfbCZfag/eukBEEwEaVarZrphsDdaBLjNobNBr6QZZE7GyM1Za0EbTJGTpKyeig9pCViKxuxds7Qra7HZDuwXFWjcscxuJR2ogHbCWnvsj9fRfKNKHgj3/tDzPx9OMJ2q2TBKkx0+bI2dqwfwgc3bYs2O+3Ayl+TMCmUym2+7w7nPmfKCEcj/v4KpxB1Bqb1L8rBTf+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3yJ8lnlOCPcK7hRFUgk/y3XTICoUCEFgGG58pu0M2ms=; b=tEYeYMNcgauvJAT1+FQsO6dLhw3g5agAhp3GGWMEzvqQ5AJBFNRugBUd9Bbze0Ov7BCsgrZ1aMyj2AzBGp/acSJqAF9llw6rV8gHLx7wVgtRb8l7WiL3HJgWx1uAmIHpm3H20ZrPnx7zhEE9Xb2OrV65poca6n5YyR9iJXi/mekabwYHR/6cp7gWZYvxJ1OuPT72cjjPeRP/f7EIW32T31sUIEDUERnRJ8HQ0eYrO9ZhfCjohc3oquup+M8qJCCF8YCF7rZggqR7HvbhKO4jZn9Y6y598RZH3Qn4lsWLwIb86XNKpNYLHUtBOXlzwct2qpXFwXAgcPLbQRQ7lmQvKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3yJ8lnlOCPcK7hRFUgk/y3XTICoUCEFgGG58pu0M2ms=; b=hSVn1ivf/mMGeyYzT+7HIyY4th2DFtXK/9FS8dP2c+qInjXlK7g/EsGCoFfOJ4INYzybunBozwn8rh57mqRFzNec7MuCgxs/TxL9/bX3OdLm3RVOPXQiHcSS4efgDsvWdRxYCfgWk8Uy+FBZni6pH3BN+/0gmXObEC0yauYKncBvV7si2C4RgaFCx8FCDXOBE80P1fqebz7zLqHrT4WCIyOmefOKEAuq0PD6l5busTQ5cIlUwQhEDIGXISLKx08BIBKT+6YiYpkXbQq5BgWY3L1Od+Pl8T1LBeoHK9u0+1KNPEH1kidqGRM2QjBaA2/4IA69gCR9Jhb1CuOdvQ/QCA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH8PR84MB3137.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:1c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.28; Sun, 13 Apr 2025 17:40:19 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 17:40:19 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 13:39:43 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> References: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: YQBP288CA0033.CANP288.PROD.OUTLOOK.COM (2603:10b6:c01:9d::10) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH8PR84MB3137:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e8bbee5-91ca-40dc-cf44-08dd7ab24214 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599009|15080799006|7092599003|10035399004|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: VaWoZ+v+BEKq65oIKYDApJPMxYvpi/V3p8v53jDzHo8i3w05cZki90spm2cUeRAlELgXBcC0x63EEWEV3PFPK5XKg5oRLoJHYebYzIsRNU2SecWysywGthbj++3ptrgrDXwfWYQDwYsAQ7Zwov4y2TEUliFzWzZNvg56weuDrvPds6wcPO5qdm3ij44ZIuCq5qW/Xlp4d1jrJj9g4jDoNZwI6K/o0eRb/7CcL9YSl0zjRrAyX7acIjpQw5T+L6qyOvR4tLaY9aVN28WqGAI7Z4pBDioXVY0KLKh1rWvcYq/3/nt7sx26+62vWEHOvZ7dDBREkpuULzXolfbSrawp+3vfG6NftyH0Xn6unsSvtvrzSoACEHIFkjSO001AK8VqZo89hrAulGGWTWk7uw0syuWpydBNl00G2rk49lzgBWM57UZazw5RBIGXwlRyzuzzdJiO9YpUTY1BoRHyqxqjzHeQAPX+VA5A4KIvzlSzKiUhPU7BUjK3jk3zFYHaezMsRY1YjYv1VsBqyZPVctXhNsXNupkI/JNw6az4uLdPQfPXODu5KWmk/znqUXHrbE3MJxSsNGyMc4n94fh/0v+XlaFVghleiVqOAN0gDXZj6xCeeLP3LFkxukwSK2AS/x93eD5q/o4+M6JTJZsHTTrWECW9NNZHO4qUlgSrZtHKUj48uOVKQm9H3mMHJDQdFXKLEREg0w1CQJQxNhrXI+xVc2jgg5sOXoI4DqoM8FwuhCxG/iwZX6v9XnhGawttvMbz0dV5XZVrlJaF8QZ453KBAV3IvNf8Ql9Bqnl7UtcwxA79kOqhRHYQ8Ggh1iuk3MXcVSh345M8RmBmcdidfw7qmRsVAZ52hMn8/fDqarcSm+nxJ1D2/P6aKkNRYeLwZ6EQoBXTaK4psef2FKoVgLvM1/oRkUFuczgsu5ZmcC5rbpHTJ6SI4hm1mMpotwCYr41RN5MF3vV8Bd86wOy/veyOC/xEamWiJp84FI7JndJ16b78+Vyyam1YjJBV4ppAPkavMUYG02UqqwSAgZUT4BehekNN6EceFF6RGjy6lVLINZLi2fZA6p+FRn1nSHcNnJENSCz4FStJ3EKrz1UUAVXn9LaF3+itoLfcYbMt6UsrLZQu955LGA9U42KsvpMjMbmv3wNBxhCPRxSaXZnGlUGQRlDUbuTt6SkkZBr7rKfqRfec0ZRnwwuyT5QVwWSYWVGj5Lc7VGnkB6O6k9d7txFMQYnT/Nm32ADqvGHstRpspklVYJfJq4qgKBnKqp5Emuk0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dKKFwCXnNcx7g3QBMEfYwrqy381RYNxZH8Rs0mbjwTXxFgBXVUvbNsrcybU9aS2Yxp0BzW8qM2IqNzzqHMQBmgDx5Mgot5DQHDvH5scp8wdvzj8wb5SWthcsEazQ/YgTzcVx4PJTRr+/HFfzBLuMXwGrLSCgpto/Toeid3UFPXbBPAVhiLcNUfFBKxCtR8s8DdvyhZx2aYGahXLKRRt8IjOmx1BipLMfHm6Ed+SnclWoHTJX+TtnJt7BCeADLn+QoiIf8VhAfLZHOoDKEy+I+NVCLrKIe/Yb+btWa5KImakd6icpMB279fxZ1Z9OtSiaIF+A420XKuBfCNXDPCV5RgTc5zXu3hQQl+hcDPF/iBOJHo/U8aCUcRza+wR7thmUBKIV3IjjTSm5A8p9eQT6GzDSpkOzpfPmhBNnQ9+at03uzkaN/exqQ2ieHc/3+NDT2NLHHk6euOqIYiymV6GAuQxAI+haamsXzcvOxpfI6ocAdCmH9+pMjqX+PCtgg1tdMOyFeOkBe3cpU4p4423YfVldujvKPfP4Ie6AZ8SibIiwddWUAM47TY/xvupLHweMc/hPUEwaoTdu+Ivqc5Qfab2JG6PBkLCMjfdp6XInoKhJ0EWVCu4KipKmRFuQjjxSAC7U1eUdTuKwHqRlc+SzbPVfzZm6q3v/Ixq+1vEs7AKA4pTu7r+GPgY63Ts21m3vsYtAmjdsNgm9aayj590WgGz6FM7lOINgcaVuRyuokewApgKVLoRLrdaXrmFk+eyHIqJagpdokH8oZPRaOtvskNn/RHhb42FwwyTtsNCaUg5BIhpL8ilFcg2I40oW7XMsDzjlaDZW9sx//hqtlQwkQMb78nBHwSxEd0ZJD+32GlFkwX7711wVDmbvBoYQjkErU6paL4RyKmpD73XwsR4pCmjMgY3sbpcAiz4YJyImiymw37C753d5kmI8oVEnZL7J/m0sHJoDdOsy5o9xQ0ZPhE2tdY5TJDaLpQfPXIBK69baJHXBKrWFYsGAjYRF7d2baMhWMu43IeqwhwJzt9a9jSCfwXoibidvy7FVbgktPvxdR+cpEU9cTGc2Th+3MzPPjxymaJ/uiqAN9Hgs17q2Hl1Lcxf7ylhBl3UJc6O2ZBT92t97YBb9TflT06648G7N/2ESSQxmxlIEfSIwJMQ0ihil/L5Tbh9YMmho7TONfCgf8kOcz9fXe12jCpeba7prFYggUsNw8mAeon3yeQ8zKGrLQ2A05VRmdSr74WtcRD3NBPM270B2nI39+/57NzSF X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e8bbee5-91ca-40dc-cf44-08dd7ab24214 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 17:40:19.0369 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR84MB3137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patchutils.scm (quilt): Use standard check phase. Change-Id: I79cb2828a877b7b6ba3cf7b16a56f454ea44803d --- gnu/packages/patchutils.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index ea784c5acd..3da1e7b3b4 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -206,7 +206,9 @@ (define-public quilt ,(map cmd-path (list "find" "grep" "mkdir"))))))) (add-after 'compress-documentation 'check - (lambda _ + (assoc-ref %standard-phases 'check)) + (add-before 'check 'fix-check + (lambda* (#:key inputs #:allow-other-keys) (substitute* '("test/run" "test/edit.test") (("/bin/sh") (which "sh")) (("rm -rf") (string-append (which "rm") " -rf"))) @@ -232,12 +234,12 @@ (define-public quilt (or (and=> (which cmd) (lambda (p) (string-append > p <))) &)))) - (let ((make (which "make"))) - ;; Assert the installed 'quilt' can find utilities it needs. - (unsetenv "PATH") - ;; Used by some tests for access to internal "scripts" - (setenv "QUILT_DIR" (string-append #$output "/share/quilt")) - (invoke make "check"))))))) + ;; Assert the installed 'quilt' can find utilities it needs by + ;; emptying PATH of everything except make. + (setenv "PATH" (string-append (assoc-ref inputs "make") "/bin")) + + ;; Used by some tests for access to internal "scripts" + (setenv "QUILT_DIR" (string-append #$output "/share/quilt"))))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") (description