From patchwork Tue Jul 18 14:39:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51800 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 862DD27BBEA; Tue, 18 Jul 2023 15:42:37 +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=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 E3B2A27BBE2 for ; Tue, 18 Jul 2023 15:42:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltr-0007Wh-9h; Tue, 18 Jul 2023 10:42:03 -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-0007WN-MR 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-0000tm-6n 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-0006cd-3U for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 06/43] gnu: findutils: Move test-strerror_r from XFAIL to skip 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.168969127025155 (code B ref 64711); Tue, 18 Jul 2023 14:42:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:10 +0000 Received: from localhost ([127.0.0.1]:53736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlss-0006We-W6 for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlso-0006VB-O1 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:59 -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 1qLlsi-0000YD-QH; Tue, 18 Jul 2023 10:40:53 -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=bXwnusM9HJSfhxJDqo6hBlA7eThjgFMDtZtvN3xAmh4=; b=e+n+krr84AfFhH1aXjYg I4NAJTsL60hixZ2m1khDqlAW5FDKDU/3IyNeSgFrP+ciahRY21qq/lwiC8Jc1S2wN/tnDVmgKHknL siBcfc9nBh6UhoQhcovXWQkhTwwPKJgAQ9DszDUNYGpMnAaE0enXkslRXat9YV66aqyf4prFce4Il Mt43B3o+OOpRnCqBP41681oqBWzMGryWRd+KkbjdG+cKShCLW/9b77dFwAAthUY2uuhiHo0w/rln0 sLJr1tC+ZN6rwXlasn7qW0V7i7GhjRm3EnAUx4RI6c2LqIPtjHX5JqVmyuxaTR3oOb+djzuEE0eJ1 QDKD9YhzDaEQMA==; 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 1qLlsd-0004hp-Vh; Tue, 18 Jul 2023 10:40:49 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:59 +0200 Message-Id: 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 (findutils)[arguments]: When building natively on the Hurd, remove #:make-flags as "test-strerror_r" fails non-deterministically. Instead, add 'skip-test' phase and skip it. --- gnu/packages/base.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 00e59e6f46..14479c4951 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -340,10 +340,16 @@ (define-public findutils (substitute* '("tests/xargs/verbose-quote.sh" "tests/find/exec-plus-last-file.sh") (("#!/bin/sh") - (string-append "#!" (which "sh"))))))) - #:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-strerror_r") - ''()))) + (string-append "#!" (which "sh")))))) + ,@(if (system-hurd?) + '((add-after 'unpack 'skip-tests + (lambda _ + (substitute* + ;; This test fails non-deterministically + "gnulib-tests/test-strerror_r.c" + (("(^| )main *\\(.*" all) + (string-append all "{\n exit (77);//")))))) + '())))) (synopsis "Operating on files matching given criteria") (description "Findutils supplies the basic file directory searching utilities of the