From patchwork Mon Jun 7 21:50:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 30012 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 19B3127BC81; Mon, 7 Jun 2021 22:53:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A491927BC78 for ; Mon, 7 Jun 2021 22:53:11 +0100 (BST) Received: from localhost ([::1]:54140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqNBG-0004En-JN for patchwork@mira.cbaines.net; Mon, 07 Jun 2021 17:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqNB8-00047w-9r for guix-patches@gnu.org; Mon, 07 Jun 2021 17:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45260) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqNB8-0006Ra-1R for guix-patches@gnu.org; Mon, 07 Jun 2021 17:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqNB7-0004FY-TM for guix-patches@gnu.org; Mon, 07 Jun 2021 17:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48850] [PATCH v2] gnu: coreutils: Disable inotify-dir-recreate test Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 21:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48850 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Cc: 48850@debbugs.gnu.org, Carl Dong Received: via spool by 48850-submit@debbugs.gnu.org id=B48850.162310277516322 (code B ref 48850); Mon, 07 Jun 2021 21:53:01 +0000 Received: (at 48850) by debbugs.gnu.org; 7 Jun 2021 21:52:55 +0000 Received: from localhost ([127.0.0.1]:56806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqNB0-0004FC-LZ for submit@debbugs.gnu.org; Mon, 07 Jun 2021 17:52:54 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:47463) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqNAz-0004Ez-CG for 48850@debbugs.gnu.org; Mon, 07 Jun 2021 17:52:53 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6072D14A7; Mon, 7 Jun 2021 17:52:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 07 Jun 2021 17:52:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=rmkNj4xtgj5aI HZlBzXbD2qufBh1+7wf1hOfzyTh3gM=; b=t8SLFG6G1aeYl6HQAprOtJxsIQckC 13wcgfdeGx6BbeLBS3apxSwvr37AKDKsl7+L2tCQM6FJuzkWSFeO8uyysz7CJWwQ sz6quKqLN+b5cLlYqBaQc2pTvbml49WyrKgi4bWHycE0FgBWuBLBp0N1lmLhqMtx MnENjRDPF5czhx9sDRCB9m1f4oi7MpxA1ccNRcvP0U9mwZry8zl3rJ/wNLSh8sK4 4oWW9Tl43dOtRYysS5tMDVxLjLjQxnP5RmAwS2ASXILctysWOHDh80zEU5BJmx3+ ctUQwReyLyEkH/tw36m8BoQaMm4W2o5e/8WHfcFZNa9jLWxQwNXHJKTEQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=rmkNj4xtgj5aIHZlBzXbD2qufBh1+7wf1hOfzyTh3gM=; b=kzMTGvxM mZrjagNzHYr5/C0wHaP9Pk+5U0yjuiI7NNb5VVxfHph9XuO6gzlEkeU12/wg/HqH xpFMtLxhOow+h+v2oHuyTnsTDh7d9g5QKInnpsMm01XIhZNY7SoDOmYInDJXlYCu eRjyyB4iAO7V+IW4seSZHG6kT4QhPDkis5jRxZv5wW0rMdjAjNqOpJ0HTLJOg+IR 1TTVlZRC8OsCApLQg7yOevl3wmMdOt911nTVz1Ipwteaw1CjaR3R02j8ZCi2JME/ xeRk6hOHTtBqodv+vqCy22Sq9E9MyjyPCdbSDMIRJ5G0idWJdNZa88Gt8XajyD7y 7pdawBD47cqZOg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedtjedgudeihecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeevrghrlhcuffhonhhguceotghonhhtrggtthestggrrhhl ughonhhgrdhmvgeqnecuggftrfgrthhtvghrnhepuefftefhteevgffflefffeevffefgf dvgefffffhvdetfeekudffgfeuvdejtdejnecuffhomhgrihhnpehgnhhurdhorhhgnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghonhhtrg gtthestggrrhhlughonhhgrdhmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Jun 2021 17:52:46 -0400 (EDT) From: Carl Dong Date: Mon, 7 Jun 2021 17:50:59 -0400 Message-Id: <20210607215058.3989424-1-contact@carldong.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <878s3onjzl.fsf@gnu.org> References: <878s3onjzl.fsf@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches > I’d write it like this: > > (lambda _ > ,@(if (hurd-target?) > '((substitute* …)) > '()) > > …) I'm not entirely familiar with the quoting here, but I trust that this is correct... Does the following patch look okay? --- This test fails on filesystems where tail detects that it cannot use inotify safely. See https://issues.guix.gnu.org/47935 for more details. * gnu/packages/base.scm (coreutils)[phases]: Disable inotify-dir-recreate tests. --- gnu/packages/base.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d30299a7b6..1ab50dfaf9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -378,13 +378,17 @@ used to apply commands with arbitrarily long arguments.") (("/bin/sh") (which "sh"))) (substitute* (find-files "tests" "\\.sh$") (("#!/bin/sh") (string-append "#!" (which "sh")))))) - ,@(if (hurd-target?) - `((add-after 'unpack 'remove-tests - (lambda _ - (substitute* "Makefile.in" - ;; this test hangs - (("^ *tests/misc/timeout-group.sh.*") ""))))) - '())))) + (add-after 'unpack 'remove-tests + (lambda _ + ,@(if (hurd-target?) + '(substitute* "Makefile.in" + ;; this test hangs + (("^ *tests/misc/timeout-group.sh.*") "")) + '()) + (substitute* "Makefile.in" + ;; fails on filesystems where inotify cannot be used, + ;; more info in #47935 + (("^ *tests/tail-2/inotify-dir-recreate.sh.*") ""))))))) (synopsis "Core GNU utilities (file, text, shell)") (description "GNU Coreutils package includes all of the basic command-line tools that