From patchwork Wed Apr 9 19:01:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41509 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 1758727BC4B; Wed, 9 Apr 2025 20:02:27 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 515F327BC49 for ; Wed, 9 Apr 2025 20:02:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2agb-0003gj-07; Wed, 09 Apr 2025 15:02:09 -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 1u2agZ-0003gS-AZ for guix-patches@gnu.org; Wed, 09 Apr 2025 15:02:07 -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 1u2agZ-0007N7-1Q for guix-patches@gnu.org; Wed, 09 Apr 2025 15:02:07 -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=z+yZATgL21YitlVMybm30NePhGfmGoz+fHKXU1nb+Pg=; b=pbeZusEOLbd3Zdup+HUtYSR6O6yAZKhsnDSBk6aipVQJXFXuCPhgxRLhnuVzmqHgEy7+tw7vVVwQgzFbR6mSRMWSHD68YUIS0klWokgnf7s8DI6RHZVHtT9qe1kgbpMTt1y3+mJbRiXrnv+6opzllnFUtzF8+vYMs6HZG1XGyCBw7Bj8yDCz6gtTOtdI8iioCTFeC91ILrbItNh+D376lzVEFPqMZ8WR9yJUtgU2pO3UwqlnCIISrfMjdrRtQM1M3dZ2lH5kNPs7Q8ARYilBqFkn4mDdJV4dhdLO4P5uaI0TbTwDypsLEvD/uLRE0nXftbV/m08q33jaao4tC4FCNg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2agW-0001Ys-Cm; Wed, 09 Apr 2025 15:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77681] [PATCH 6/6] gnu: emacs: Run tests. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, hako@ultrarare.space, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 19:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77681@debbugs.gnu.org Cc: Morgan Smith , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 77681-submit@debbugs.gnu.org id=B77681.17442253175942 (code B ref 77681); Wed, 09 Apr 2025 19:02:04 +0000 Received: (at 77681) by debbugs.gnu.org; 9 Apr 2025 19:01:57 +0000 Received: from localhost ([127.0.0.1]:42092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2agO-0001Xl-Lc for submit@debbugs.gnu.org; Wed, 09 Apr 2025 15:01:57 -0400 Received: from mail-bn7nam10olkn2048.outbound.protection.outlook.com ([40.92.40.48]:35809 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 1u2agM-0001XG-17 for 77681@debbugs.gnu.org; Wed, 09 Apr 2025 15:01:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aB50YO4H0o7HLLyLyFeXVembgSFmh7B4rt340B5g9UcwBpHLJnSSVvz9tHL/BpcL/cB+7eRObSpVezQIW+9vhVSGHuOR0Rnwj9N4ND7MWu702jHgJIZ3xThFay3Kz9oNtMIfRChy30HO/Jj67dmBMRLya1j30qMq7p1Ts126oROD4Au/iWa1E2MlXxFuMPJgTGlY1zJ7z4fg2yMOr7N9dZO/IcV5IJa53Ks1Jkog4mEZHAThqPotdiUaJploSorh4Vttecr3ZPcV149gZInXxw8dsMuiyQgNHcwm9qpDawcgnX1rAyAxvoi7jd1EEvBWTgSo/ajlhoJ1QNNebWCmDg== 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=z+yZATgL21YitlVMybm30NePhGfmGoz+fHKXU1nb+Pg=; b=Zsg4f5+XoUluc97aFaO4B6Pnyc1duvF+EnnBjM9m6yNFeKvaqzKkox9l7aNu7XrXF1i8weVC7E/+YGNcC1WvlMYjmKZdJOONTr9KeuecfNiPqwIl+CmCAllbzjsZ+AJVLv3X2MJcLzFc+zJnsuLhlNzPyxNsuuIIOYtM5wZlTaoXdTdgupBrpwiLhfxHnK8RMr/IQM/RG/FdOMqlPrEp9idFi4fP+N65/Cmyy16lTIexdeUOmFrIHbSb5BinW6ZkAuRVsibivu5ypygIw2a/lhWR85Sb1G8rDXbO0UO6z0Xar7Mkvi5llZTT39hCztwYdXdd2bCDEOvbIwH193XB0g== 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=z+yZATgL21YitlVMybm30NePhGfmGoz+fHKXU1nb+Pg=; b=VhkLDhtPjaE6EBOopkZDaokg1EOw2ojZIgOSD1o87I+OrPHRcnVXrJbhASodsRaoAYKJzqycqebr02OS/EK968Di5pjUcYly+n0NCAIFPuxtYcuE86qcBdn2bychAD1dni9sQbDI3G3Pt4OwvfpcWBoIF7NS6E0FoA1Rh3/KqEo9rXSEn4Gi1c5rIFUiG6jvHn5wZk3z2oXB3qwKlGR6tnMe0pncBomZfh82jAbgv/VQ7hGqRN4lsaNIo/vPoV+6Fx+oNjRZVJPftqSmul9ald6q+Kv6e2glcyWrxv4pRiPWheR9mE+98oUTzLG0TArvItSNcHTMjDa6rU8ARxGkuw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by MW5PR84MB1356.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.37; Wed, 9 Apr 2025 19:01:45 +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.8606.033; Wed, 9 Apr 2025 19:01:45 +0000 From: Morgan Smith Date: Wed, 9 Apr 2025 15:01:04 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YT4PR01CA0333.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10a::21) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <1253ab062019421d80df6869d0bc6d12d907a48d.1744224698.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW5PR84MB1356:EE_ X-MS-Office365-Filtering-Correlation-Id: 896558a4-16d1-4a6d-a9f3-08dd7798f88d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|5072599009|8060799006|19110799003|7092599003|15080799006|440099028|3412199025|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: XSqJ5F7SHXHDNrGGoxQ0Fm0wuKOZxyf4pdU+jQy/pOLt7Z5qtlF9iRe1CGlxnraXj/DPKRL6qDnk1gqI2GJbIvTWHz32Uq7LbLQwjwyIFemTmIX8wxo6p4CScpxtimbwp6mWWGWSoDnwX9ELjbmS61hmzDJEkFlSoG5w3r1W4RE/1TrvntiBXJkysv6S8yGHPM/YVjJ3MouC5OKaPgToNl1m/EQYiFCF5cWIkfmLlE/mFHGonJCyYCWYoZtVvIb01sXz31v2RWJ7Qgh9mPd9O8ZhMXUAnTWVLWXdmJewoDAeALX8KANfMr/PdG058olDHx5iFdPxDpNFuvFW+8CVvrMsWZXfDaqn11rct4cbNMcV05fhDRs5WdnmVX1kPwCq8QfrqHFtdtQLW72scqNHPjIf30ULz6FWWQHisddwpcNGCccutgcdPdSHC465v5DTFK4vLAaNvi12znCuQEGTF+zgkTesw+dxL6yDaPF7I+OW2mlM74CjrqPgAs5I7QUGk1Tw3dDV/sHrYcoOxLwuWQrSuIcaBHOXrew6dX+ChIcaqPDEBjIPaj2P6Gzjczi3CEJzty6mZLRoRc7bCk6YRiwN9+H8n7So3R2C8AaXO0D/N0o7Vl3nwwfMwY34CWf+Pud2coqgjdvNdn1DjyHeuT+1eENjquyHSkAsBhz42cztvoPpo+vwoJS8Ju9v3bYMahdH6UKp8I2xQTCwAN5QlvPbz7a999VN3VxGLIzvxAlVW76bll70rWll/t9ZzVlz7dyjfG15wBlJ2dEiRqeqtJu0++Gpyxbrr5m/n3L6I3aANyQYzuJ6M901q2kxTNveBEcl//n1U8IF9W1I8HJFPrSkG9ebgEwURWtGlTP0dCKhB6yGZMTdzicP8A0wS0jGTMZs/hSm39sYSOm4Ku3EWqdIQO/fB0zJBXz6ekY6ig3LJbw9PnPkrN9vP0aih7NGd6Uw1hpn13QWBsD7842MrBoqW6E4q3tVFVO3qtGM5o7F9Zluv1FpRVLUPFKgKhG4C3gQ3kDFrJ9Nu/NdyDozL7ePt/hXsqnJ3H7irp7zmqKwP0hPKLpxTwUZvGg3TuMpyjKwQStqP/YTh01GbthyGo2k60xp/+KUMrJ1HRluqnwkLsd0yhVrs1uUwX0sSOwDhGO2JH4AiT8fHginfhJ5sEgpQYj66oCTU5REBhowhNM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: inyHIpEhhI/Zl7dfeQIjRsHmB/0lmml8/RmvB1Jb3XuI2g3hMVNt+F9FjTDxoGi51j9BSI5/bzi0k/q4c5oII1iV/TyzCRENi7fty32T4dVWjKuw+5WQKp3KHOFjTgNbRvdq726oxfQ6yyCENn6lsZneMke09lw7hQ3CDr83nEAbFhpP6r176Wim6sRinEjuN/62VSDUjLulcR887bJuWJZH4nqyWYeuv+bXQCsLE9RSLF4WNJ+5ghFQ/4Y7DwCk6N6BiMbsA/zA2jqcEnKUeES+r/5vnToIBef0r7FdWCB74eYWVwDRcHX6W51lx6KzhgtDDFF2IBcvO0N1o97YAFa2kN0YvgOWsTgpc8/Gxu9wuwK5qWLQ2LIUrFi3RUDHdLJtbGfXvBNWzhcqW3iV49hT3QHc2lbSPtKmgjnnPrFJVR9Eu1sv/eiDsovy2iT+sNHPFWNd+kyvriXqzzDCK200GPbj+B/p8ahLdlXbmhVI+PAtTOQxopKwk8bV3hQft+WPXIIz0vwtnCxZ7JVxsumFvx1M3DtJyeWALKai0bRxbwGiB3uX7t1Air/GM6MTFThT2KbaCuf6sTLjCJFvVDnt4ZzsWzfduzqb9thnz6C2BqJ7PcSKcO20/8i/iBfA1bik9D+scHUW52be6BlxrnTcKg1SucWbFGxRWzf33mV3XPEHQBwH2cdwRn7KBzaZj2TgM5NhFIKWeE7BXvtrpka1nf2rZt0/avNHpLnrYYMI42AWyKzZfnEfHiXwM1brq6Wb/Az1iAnsbQnsCLGzBMnxjXMJo4SHCL9G03b9EEl538vDvFuoRRYv6VlHD4SBgctDr90JyW3dBrl8sua/BX7qaGOo1512q2Npc01SRHZEXeWk0EGjdj4yPEE91CxA5dcmliV5fgpt9OxN40+XPUHWjqkE2J8XLxvJvOT6dW1z6HypCfzX6if0nB9P4E2UCdkausODY+Tphn+cG5VLcFQuvcfUN/4vk7gpDYFObB4j2BZHSduKKPBjXfAJtG4JagxUzwD/ekdTw2Sn4q+JOjOuoxIsKTC+UaFdBpZa0nlbT8ZIEvFdv/76gHh/IXnU8ptg1KoECmI+o2DLf7zc3ZryKUd1IXapazh1Vxfr75IfwTjkutV+iWdcRd6Z7gtj5FUNcfOghN+6X3aOzh/KJwY9N6RWT+AWHlMVHEwsCUHEIbU4/upXcEiPs1lC3wTD3amJPRA0/SKgnjdx+PU30mP8sw8RCzo2xZh/y3DLtnbHBfPJx22ig7elx4L2bi6JbwLCFeClnKY0EWYt6az6l3wfhZecpRYEX7L9Bu2cFgZ8DjVoLt3NEQcCA7V6XjJv X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 896558a4-16d1-4a6d-a9f3-08dd7798f88d X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2025 19:01:44.9153 (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: MW5PR84MB1356 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/emacs.scm (emacs-ert-selector): New function. (emacs-minimal): Run tests. (emacs-next-minimal): Run tests. (emacs-next-minimal): Run tests. (emacs->emacs-next): Run tests. Change-Id: Ib5ffeae9b7f49b5f1a56d348c15ce4c4fb28f5ec --- gnu/packages/emacs.scm | 89 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9a020d89aa..fbde2bd913 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -98,6 +98,26 @@ (define (%emacs-modules build-system) (srfi srfi-1) (ice-9 ftw)))) +(define* (emacs-ert-selector excluded-tests #:key run-nativecomp run-expensive run-unstable) + "Create an ERT selector that excludes tests." + (string-append + "(not (or " + (if run-nativecomp + "" + "(tag :nativecomp) ") + (if run-expensive + "" + "(tag :expensive-test) ") + (if run-unstable + "" + "(tag :unstable) ") + (string-join + (map + (lambda (test) + (string-append "\\\"" test "\\\"")) + excluded-tests)) + "))")) + (define-public emacs-minimal (package (name "emacs-minimal") @@ -153,9 +173,24 @@ (define-public emacs-minimal (build-system gnu-build-system) (arguments (list - #:tests? #f ; no check target #:modules (%emacs-modules build-system) #:configure-flags #~(list "--with-gnutls=no" "--disable-build-details") + #:make-flags #~(list + ;; Broken tests. This is inherited by other Emacs + ;; packages so test them all when changing this value + (string-append + "SELECTOR=" + #$(emacs-ert-selector + '("esh-util-test/path/get-remote" + "esh-var-test/path-var/preserve-across-hosts" + "ffap-tests--c-path" + "grep-tests--rgrep-abbreviate-properties-darwin" + "grep-tests--rgrep-abbreviate-properties-gnu-linux" + "grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics" + "grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics" + "info-xref-test-makeinfo" + "man-tests-find-header-file" + "tramp-test48-remote-load-path")))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'enable-elogind @@ -240,6 +275,13 @@ (define-public emacs-minimal (substitute* (find-files "." "^Makefile\\.in$") (("/bin/pwd") "pwd")))) + (add-after 'unpack 'fix-tests + (lambda* (#:key tests? inputs #:allow-other-keys) + (when tests? + (substitute* "test/src/process-tests.el" + (("/bin//sh") (search-input-file inputs "bin/sh"))) + (substitute* "test/lisp/eshell/em-script-tests.el" + (("/usr/bin/env") (search-input-file inputs "bin/env")))))) (add-after 'install 'install-site-start ;; Use 'guix-emacs' in "site-start.el", which is used autoload the ;; Elisp packages found in EMACSLOADPATH. @@ -595,7 +637,27 @@ (define-public emacs-next-minimal "emacs-native-comp-driver-options.patch" "emacs-next-native-comp-fix-filenames.patch" "emacs-native-comp-pin-packages.patch" - "emacs-pgtk-super-key-fix.patch"))))))) + "emacs-pgtk-super-key-fix.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments emacs-minimal) + ((#:make-flags _) + #~(list + (string-append + "SELECTOR=" + #$(emacs-ert-selector + '("bytecomp--fun-value-as-head" + "esh-util-test/path/get-remote" + "esh-var-test/path-var/preserve-across-hosts" + "ffap-tests--c-path" + "find-func-tests--locate-macro-generated-symbols" + "grep-tests--rgrep-abbreviate-properties-darwin" + "grep-tests--rgrep-abbreviate-properties-gnu-linux" + "grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics" + "grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics" + "info-xref-test-makeinfo" + "man-tests-find-header-file" + "tab-bar-tests-quit-restore-window" + "tramp-test48-remote-load-path")))))))))) (define* (emacs->emacs-next emacs #:optional name #:key (version (package-version emacs-next-minimal)) @@ -608,7 +670,28 @@ (define* (emacs->emacs-next emacs #:optional name (string-drop (package-name emacs) (string-length "emacs")))))) (version version) - (source source))) + (source source) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:make-flags _) + #~(list + (string-append + "SELECTOR=" + #$(emacs-ert-selector + '("bytecomp--fun-value-as-head" + "esh-util-test/path/get-remote" + "esh-var-test/path-var/preserve-across-hosts" + "ffap-tests--c-path" + "find-func-tests--locate-macro-generated-symbols" + "find-func-tests--locate-macro-generated-symbols" + "grep-tests--rgrep-abbreviate-properties-darwin" + "grep-tests--rgrep-abbreviate-properties-gnu-linux" + "grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics" + "grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics" + "info-xref-test-makeinfo" + "man-tests-find-header-file" + "tab-bar-tests-quit-restore-window" + "tramp-test48-remote-load-path"))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))