From patchwork Tue Jul 18 14:39:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51794 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 6E39C27BBE9; Tue, 18 Jul 2023 15:41:29 +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 40DD227BBE2 for ; Tue, 18 Jul 2023 15:41:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlt0-0006ob-SQ; Tue, 18 Jul 2023 10:41:10 -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 1qLlss-0006cW-TP for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41: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 1qLlss-0000aF-L2 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlss-0006WR-Ha for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 04/43] gnu: grep: Update hanging and failing 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:41: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.168969125725021 (code B ref 64711); Tue, 18 Jul 2023 14:41:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:40:57 +0000 Received: from localhost ([127.0.0.1]:53723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsm-0006VR-MC for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsj-0006Ut-5O for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:55 -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 1qLlsa-0000XC-Cr; Tue, 18 Jul 2023 10:40:47 -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=cbdlCtkCzLxi4FBO6Twh6qr0mbpWPENwQ5iHS+jrNrw=; b=m6VnQvDFG0iX6xS9Ijfz AeDuozbrqUd9BL2NeWCMm0zjcEsXhxxbsDtraZOpot2oBT0kE0Cguh/oILyYHG6rhC9OCNBcn0duo e7PfI0jPv2mcgQ88xMikqafma9ujhA6JG0Z0zP9lbKefqHf1IHCliVtHm1ifDDCfaLRoMUTwqxSR3 FH2aaHpd9YRbYXdVSk8wfJQi8Au6/gZu+tin9vZk9WtAsFxbIQaXab7UKDtH9OFqQmuiSeNQkdDYK 8zy5CgGy1kLs7/FWlO5fiauT6obIVFpoFy8lY9x7zowNyz4fggt+AJofy2co/x1hmzBxkRjeOstXR JAKc/5SdxVTLRg==; 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 1qLlsZ-0004hp-0y; Tue, 18 Jul 2023 10:40:43 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:57 +0200 Message-Id: <30ff4538c1f67249b2720dcef60877b9a7cab7ad.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 (grep)[arguments]: When building natively on the Hurd, remove Rename phase 'skip-triple-backref-test' to 'skip-tests'. Remove "tests/triple-backref" as it now passes. Add the hanging "tests/hash-collision-perf" test, and the failing "tests/file" test. --- gnu/packages/base.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e941853d20..f1b027b0dc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -134,21 +134,17 @@ (define-public grep (string-append bin "/fgrep")) (("^exec grep") (string-append "exec " bin "/grep")))))) - ,@(if (target-hurd?) - '((add-before 'check 'skip-triple-backref-test + ,@(if (system-hurd?) + '((add-before 'check 'skip-test (lambda _ - ;; This test is marked as malfunctioning on glibc systems - ;; due to - ;; - ;; and it triggers a segfault with glibc 2.33 on GNU/Hurd. - ;; Skip it. - (substitute* "tests/triple-backref" - (("^warn_" all) - (string-append "exit 77\n" all)))))) - '())) - #:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX - ''()))) + (substitute* + ;; This test hangs + '("tests/hash-collision-perf" + ;; This test fails + "tests/file") + (("^#!.*" all) + (string-append all "exit 77;\n")))))) + '())))) (synopsis "Print lines matching a pattern") (description "grep is a tool for finding text inside files. Text is found by