From patchwork Sun Apr 13 14:57:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41631 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 F306827BC49; Sun, 13 Apr 2025 16:09:58 +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=unavailable 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 6575E27BC4A for ; Sun, 13 Apr 2025 16:09:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3yxN-0004ml-Jg; Sun, 13 Apr 2025 11:09:13 -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 1u3yxD-0004kz-EP for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:04 -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 1u3yxD-0000So-4g for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:03 -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=LeuKLJ2cwI/P6/tShwhmzZhtcUf0CXxi4HHl+/HXsa4=; b=RZSiHK1Rfk4yC7TreLDB1a2pw6XstKYAezvosyU0ka3ahXssxZ4KZk46Y9ZJVqSgK5hJKRNjliDcpDaPx8pmGlXIkp7LOMd1+xjafEaHN2Vil7uUx9Kk9BqCYD4UMK2I/7WWGpKBMQEFK6mEH0pzCk4NNa1glEobWDq4ZvUqikxitSqNm1RHERcP6TpnI+oaxUahlcyFSgF1Kyo44xiPNP468YlwtCGdX3CG3ataTpvGYQDFAYdbGjzv0W+D6udbEVqGhynDk7ls+mn+iiW4i7BfAZFkZ0gRIr7834idlv9hdV4OUvGvU4PWwBAhD06cljlF0KAcDg59vzya/dCaig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3yxD-0001NY-0Z for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 1/5] gnu: quilt: Respect #:tests? key in check phase. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 15:09: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.17445568945183 (code B ref 76594); Sun, 13 Apr 2025 15:09:02 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 15:08:14 +0000 Received: from localhost ([127.0.0.1]:43387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ywP-0001LX-Gp for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:13 -0400 Received: from mail-bn7nam10olkn20805.outbound.protection.outlook.com ([2a01:111:f403:2804::805]:14176 helo=NAM10-BN7-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 1u3ywI-0001KU-Lx for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FNxwNeHZx39bhwsoLbEOcuzLLp9YKA7SNfZ8brYSUZkuzrIoabofDcgMf/qetHuOUKbnhWsgrSl3LaeyJoCzs192hUk6NH7VCUOdc6mV/CutIMy9KC96DCichyKFMT3cIXhDZURiRO+Mo07b4qRl5pvnhAMt+gWb00TV8ypGLjVyY0SPLMbVBjSOUf/oO28joZ1RqcYtYuDKeXfSKSKs9wYfIR3L8ha2MpE9isdtigPDtqnuuOxhhvd10OmheTIRMvF03Yyb5RXkcMZ5gV2IOuQsorAOYcHGKQg7jTfaJEOBEPUm/hM/D663kmUhlqcfxKvxs10OdBwQuueYygAFkw== 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=LeuKLJ2cwI/P6/tShwhmzZhtcUf0CXxi4HHl+/HXsa4=; b=T5gmQZlliM/MyLlprMhSSUNvI/+Ydqrs65K1cc4XKzLnrX18JgFyDhXtUZseq6FGMhIoLVXfXK+3Z7Ycm3UzHVqUU1mmA+7+i7ZjhDdwcdKuJ+iLx6lSlTEsfgKhIw2JZAcopoAWdU4vlnjdKiuR+eshXqg3NKpIY6VElP7cpRscw36MqQU2Rs+oYZjwj87iKN9Ikm6fAK9eaqRvVjpdtcIgpIxr1wR48Y0nFeXAoGkbtNTIM8+Zerr4fY51NNYKOhDzFeCv+EHAThoXTBQ04DYAiSOjHZ18uPInhF0HgJPOVdI6Ii7nz96xMB66pFOdJocBsA/nK9Ek0Zp26O1FkQ== 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=LeuKLJ2cwI/P6/tShwhmzZhtcUf0CXxi4HHl+/HXsa4=; b=LCH/OtPzLMRVFrSESDlXC13r8xkMRcdY/GpkjkToJv2PHZkEe31P8S/nct/H8UVAQ9pHBfu5guZNjqGAiioMhe5kHXZbpshHR6vDbkW9b8cmvjo0TR2QQ8ktLepnvnxtykJG18tSnOLW0Mq8p4XsiAHhZ5CXrjAJWmd8vULxl7tOOYjkhgVtGezHMysICDrBUsW/2XMVpHINlR5jc1gZnkRUGEY8Q7pI2oaRKHvTTrW9a81z4vDktPEzJLna5Mgrjs2kv8pDl4uaVOw4DlwOJwKl0pv42RkyxVWUpkJ9rVPzv0CW/vGkn2/52W0x1Wnk+oYtiF0wyvVmEH66dfvE8A== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3165.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:251::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Sun, 13 Apr 2025 15:08:01 +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 15:08:01 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 10:57:02 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQBPR0101CA0302.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6d::17) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <7a2c3282617f976f5e4e3a4912af05ca94a3686a.1744556226.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SA1PR84MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f9a3770-fec2-4cbf-8d0c-08dd7a9cfb67 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|5072599009|15080799006|7092599003|19110799003|10035399004|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: UNdInWVh3uEZjSlhe76RmU3CQu6NFlAoD4sNIhhIVuvgwy31qxpJN+VQuIoOulFCrMQypsEldSzzjQqB1avCsUIMntgfg0ODbmxUNCoU1/OZRy+H1jbsNKJrDb0BKRjHsQhbtW7ej1wE/wEEXm+Y/VZ6ziaKMjIJujsk7FCVf18ZigtAIQkFLS91j8M4qmfkTA+LBIh+cnEpgbn6BJdF4R+0cAVVk3pxJgNOh9Bn4W9fHRnX3UwaFhHtgsS01/iYwL2Swowo8Of91zigvlwBwh5Z9rpUhEffFgbioDeUkEEqy983TQWzfh4xfd/yZyruugLGE6CkeFrFKRu2IRaSFhPieBtztIOU9PONHjp/eAULYeha7867R2HZaTVCvQHwaF0FyI+do5wDQ1AOgWcB4GLu9mxNDA5DDBCAQ2gw5CksszStXBtX/I2Z4wpSl14FC2yTOM1d65P7x875DZhluuVIZeyyy03b1YhHEdaIzvJulYv6w7CsKCmylquzm9mibz6ZISIzzpJTf7vjgqd47n8fOHrQo8CROxvwgIGNK9YSDAO+xiJtpaAYmpZs9Xnsh0BJg7AExIQ0eepK5wPXYaurj3eY/xvLQPlV3Lk9aOyDPGepTPplPH7n3Jqrotu6k9Qcyi010PHJOJbFcD9zbEgDBruYsAUA+/mCXhOQ24HjcmmFLn6w62zwjXq9YjRpdwsFbJszTGlYZ6KzEyNvZMehiZKu/02AiP1gQ+UmCxHW6Fc4OrAyP9JpeYbvBsNLpjs2YrO+kevtKbCZBSYWDhT3RQzuV67HLnBhvSnSqBe3IVerF8edOziWF280ylYU2K75YK9iYkMV6M+plj3D9UApYfZHVQCgicu3TL8aygOVIK292VWNZJZzKAobc2KqzSos6P1jqbOc3b0KryVDDQRPMTwRf9qKvD9rsVh9tLjIBmg1hA7+TBiDv2RWSA0mVDG5Ing9roSyE5SKh8Bag2iy7EGJ4jk5gUrwxd+u498Boqgb9nXQA9vkaG0PYWSW1NShGbFL2tgpPARIyBf8zuLjxmIJxTwJVgVNwyS0R0BJn6ea6mtk0ji9B8+2pfW0nnZgnSx3X3GCdgH/rXMdayMbGDONYZgJKYJ8Axhskkp8BEltc/O/1Evu+dza6COySJv6l3zLvdi6H47SFpXee0UbXU2zx1cFYhMMQx9vumxVyeZzYFVlthtsxGNARLtdLkck91eMebfenBH0vDr6POk/JVDeky62yKEwg7578+nPK+noLVTHxKFRVmUAX/ZN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rUUBKSKR/EUWq7VSLAe1TdjKi6f4BBhPx/qa/NW4LbsQoK6GjDXR4pKt/d+fjJfmeeFHiPScolcico/bLMsxyEGGIg+jQ/l7SeVCgqreOCykpRNX+dgGG8uI9Mu/8PniSIZQBgDdRNNNK+gVpsOdKAw/BS51Kloc33JiyN1mq2j5BT7tuWzmoVnSGXrD1LIlSraUDAu8/jgSVMn4we+ZBOw/ehYNy8e8uBG0pPkUV3hkDhAm03v387qFJ/BWTUSj9MA5yA9h+HJfcSvbDcs0HGw6e7e+kdoMWTmX7l0WDxTxaoLum657e9y4wbfJkYNd04020OmlnBRLtNaWn84RTdqml05aD3FkG2EFCnMh0uVi+HvfO0g+8t7Ix6947oQGLwCzK5/ksGipWNgxEMoHl1WtFAPxKkulielhu9xXDhAd+EkSWyxiLBC2YRVejh426QpdUkwRd6KjyWGuNFNO/AWmKMJ9gQcFQ2mnEiaz/EN4ks0+ycHbRuPHjqrQqx3I4yv4xoaXexJJ9Uc0dnchjmPLSVISxqozzLWmZpyXWV6Xgma/7ox1buCdXXxtwErUrwbQh2ckeMVKDbqArYTiZhj5+mMFS7NQ/CGHhF9PjkD0UOUElf9+djWTaM9WbRMw7/xcE1nCPwBNqbLaIEY+Nc15jmosGEd+QQuX+7V4hLGFJ4Fh7+bCkmKQBJY6B7mAtgyQ9AptHljdA0EB8Of1Eg41FU2vQrCm8cSA1EBMcAkegOYWpa+omOMTY+aHKPO2sm3aahJi/zo/ReS9iF9BxE9h3V06ZG3gTGo7KMowl9dCmIhyLaxUaI2NPVaZXXhIsVeIkRgtdghzSfhswqWJ3BXQLzsBBi+9tF2H34wg6LA6nV36MfONvbPFodqoy5B5wzONx9kG1tAW1zAT2NfWZQvb4hvfj8psfLqrOgfsfcvulrYVulIP9B0o7D0XmeW0XfXhcTQZae2yiGWgaU2Z7IZpRxLf4I646YewNnHmGAd6Wxn0qAkjubDgCa1yvtzI5lcjAQEFX+Oa+wnwkRIg/5tYzF46vQkSB0+zXJ+8swMMFIaZP+Nh+cq2dy2ZxKxtuA/vR/7BoVjsfIr8trQLbmyucQPlfn9XPterRmffPVo4GEi8GywJNwSlGhv+9VoZ6/2/Ddm5dLwVlbrJdcQQsRtCyiWZaxD+Azm0QeIz4BTZrnh07N4jlhJDTfaLQllAcIlhmOrd3AQGSeH0Hr2dy0fDdAzCa5LbxLVG8demh2TD8FJ3eJkHbqDFIpwCg/xm X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f9a3770-fec2-4cbf-8d0c-08dd7a9cfb67 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 15:08:01.1510 (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: SA1PR84MB3165 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): Respect #:tests? key in check phase. Change-Id: Ie44938ee080f2ac6b3947899e9589174fd3c6446 --- gnu/packages/patchutils.scm | 65 +++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 3cd3507b07..8ba227a3d3 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -205,38 +205,39 @@ (define-public quilt ,(map cmd-path (list "find" "grep" "mkdir"))))))) (add-after 'compress-documentation 'check - (lambda _ - (substitute* '("test/run" "test/edit.test") - (("/bin/sh") (which "sh")) - (("rm -rf") (string-append (which "rm") " -rf"))) - (substitute* "Makefile" - (("^(PATH|QUILT_DIR).*" &) - (string-append "#" &)) ; Test the installed 'quilt' - (("export QUILT_DIR") "export") - (("\\| sort") (string-append "| " (which "sort"))) - (("\\| sed") (string-append "| " (which "sed"))) - (("(chmod|touch)" &) (which &))) - ;; Tests are scripts interpreted by `test/run` and may specify - ;; the execution of several tools. But PATH will be empty, so - ;; rewrite with the full file name: - (setenv "PATH" (string-append %output "/bin" ":" (getenv "PATH"))) - (substitute* (find-files "test" "\\.test$") - (("([\\$\\|] )([[:graph:]]+)([[:blank:]\n]+)" - & > cmd <) - (if (string=? cmd "zcat") - ;; The `zcat` program is a script, and it will not be able - ;; to invoke its `gzip` with PATH unset. It's a simple - ;; script though, so just translate here: - (string-append > (which "gzip") " -cd " <) - (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"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (substitute* '("test/run" "test/edit.test") + (("/bin/sh") (which "sh")) + (("rm -rf") (string-append (which "rm") " -rf"))) + (substitute* "Makefile" + (("^(PATH|QUILT_DIR).*" &) + (string-append "#" &)) ; Test the installed 'quilt' + (("export QUILT_DIR") "export") + (("\\| sort") (string-append "| " (which "sort"))) + (("\\| sed") (string-append "| " (which "sed"))) + (("(chmod|touch)" &) (which &))) + ;; Tests are scripts interpreted by `test/run` and may specify + ;; the execution of several tools. But PATH will be empty, so + ;; rewrite with the full file name: + (setenv "PATH" (string-append %output "/bin" ":" (getenv "PATH"))) + (substitute* (find-files "test" "\\.test$") + (("([\\$\\|] )([[:graph:]]+)([[:blank:]\n]+)" + & > cmd <) + (if (string=? cmd "zcat") + ;; The `zcat` program is a script, and it will not be able + ;; to invoke its `gzip` with PATH unset. It's a simple + ;; script though, so just translate here: + (string-append > (which "gzip") " -cd " <) + (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")))))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") (description