From patchwork Tue Jul 18 14:40:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51802 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 5005627BBE9; Tue, 18 Jul 2023 15:42:49 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 E01D427BBE2 for ; Tue, 18 Jul 2023 15:42:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltr-0007Ww-R0; Tue, 18 Jul 2023 10:42:04 -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 1qLltq-0007WS-SA for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -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 1qLltq-0000ts-KF for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltq-0006ck-Gc for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 07/43] gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969127125169 (code B ref 64711); Tue, 18 Jul 2023 14:42:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:11 +0000 Received: from localhost ([127.0.0.1]:53750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt0-0006Xl-RI for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlss-0006Vc-Ea for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLlsm-0000Yr-Pv; Tue, 18 Jul 2023 10:40:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=2irxo8WYMTUokOdx6+OD/VJ/hnitMYydqHMpkDneUOs=; b=j7CRoYmJRNFLur4sTzVR rbRUgEN/B1b44W3wTukTUGXAyq+cuaADLdzfVzpMYbl3rZlSujmHyqDJ/LPZWd0XtLl25ywRVYz9Z EnAo0qB9Ks0Fs1UowpuugK/7L/bIzt7f7VAG22/lzI8/GqJiRmlPZoVozbW0XpU7n+9/4u6QFNvOu 3M1T/gdyyEDiRfUngXaJQtRJdx4ePSch422zu9Y7kg208F83TxIHLXid8QlzYRKz7dOYZdWWnKfrH 6r6pydGL00QPAXFfIQgXw4YWwLfQtCKBn9GkRJjV06MKJIjMt85/eMnpRjmzpQpV1pzJ71uaycKYT 7Ym7Gm4mJwUhwg==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLlsi-0004hp-7s; Tue, 18 Jul 2023 10:40:54 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:00 +0200 Message-Id: <02a949b8a5db06eb0d5a521cc7e6f09e75f1464b.1689690897.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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/base.scm (diffutils)[arguments]: When building natively on the Hurd, Move "large-subopt" test from #:make-flags' XFAIL_TESTS to a new 'skip-tests' phase. Remove #:make-flags for the Hurd, as "test-perror2" now passes. --- gnu/packages/base.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 14479c4951..1fdfaf8a57 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -303,9 +303,15 @@ (define-public diffutils (patches (search-patches "diffutils-fix-signal-processing.patch")))) (build-system gnu-build-system) (arguments - `(#:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-perror2 large-subopt") - ''()))) + (list + #:phases (if (system-hurd?) + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-tests + (lambda _ + (substitute* "tests/large-subopt" + (("^#!.*" all) + (string-append all "exit 77;\n")))))) + #~%standard-phases))) (native-inputs (list perl)) (synopsis "Comparing and merging files") (description