From patchwork Tue Jul 18 14:39:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51797 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 CB7DB27BBE2; Tue, 18 Jul 2023 15:41:51 +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 06A1F27BBE9 for ; Tue, 18 Jul 2023 15:41:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltR-000734-LZ; Tue, 18 Jul 2023 10:41:38 -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 1qLlsv-0006iQ-0a for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:06 -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 1qLlst-0000an-Rx for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlst-0006Wu-Ow for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 03/43] gnu: coreutils: Skip hanging and failing test 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:03 +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.168969126325085 (code B ref 64711); Tue, 18 Jul 2023 14:41:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:03 +0000 Received: from localhost ([127.0.0.1]:53729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsp-0006Vm-DM for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsj-0006Uu-5S for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:56 -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 1qLlsY-0000X7-IB; 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=GLvunAsLvEYkScm/lgz+A+tjh2OM0xs+5SREORMwtNY=; b=JWHAPz4p95gzRTTmwYH7 jOwiKueM5C2OEeA5JlJVPatvZusdKrpdrBd3iSsc1q1aGIQ4agRpzMeviBII0Juc2GzFluTXsB1O0 O/QeLSIFspVNijU5Sm6qsXBc0aCKSVgE//4dsOwb+O8bI/0xtDvggUkL9wMYHPz62YhzRX20w1sU0 ngdEXxek9cetB3+aLh/DQVURx5MvQKlC3wvBjTPnNtpD6hxwTG6nO+hKiSUC2J1O8CNEuAWZKlkjx yQmbOOczZBHpVlHnihEEG6w5Dv+PnYaxHr9C+iwj0giV/h8rGM8BpFFTIiorySQcSDbP9MlGF8ITp ml1sVJ7/dSJNrg==; 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 1qLlsX-0004hp-5E; Tue, 18 Jul 2023 10:40:42 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:56 +0200 Message-Id: <53cd3ef833e0f894e620f8e3a43cdbe6e1f6f62b.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 (coreutils)[arguments]: When building natively on the Hurd, remove "test/df/unreadable.sh" and "test-perror2" from #:make-flags's XFAIL_TESTS as they now pass. Move failing script tests from XFAIL_TESTS to 'remove-tests' phase. In phase 'remove-tests' rewrite substitute* to skip tests instead of removing them. Add hanging and failing tests. --- gnu/packages/base.scm | 47 ++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 55fe70309c..e941853d20 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -397,23 +397,13 @@ (define-public coreutils (outputs '("out" "debug")) (arguments `(#:parallel-build? #f ; help2man may be called too early - ,@(if (target-hurd?) + ,@(if (system-hurd?) '(#:make-flags ; these tests fail deterministically - (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" - " tests/misc/kill.sh" - " tests/misc/nice.sh" - " tests/misc/pwd-long.sh" - " tests/split/fail.sh" - - ;; /hurd/fifo issue: - ;; . - " tests/df/unreadable.sh" - + (list (string-append "XFAIL_TESTS=" ;; Gnulib tests. " test-fdutimensat" " test-futimens" " test-linkat" - " test-perror2" " test-renameat" " test-renameatu" " test-utimensat"))) @@ -435,10 +425,35 @@ (define-public coreutils (("#!/bin/sh") (string-append "#!" (which "sh")))))) (add-after 'unpack 'remove-tests (lambda _ - ,@(if (target-hurd?) - '((substitute* "Makefile.in" - ;; this test hangs - (("^ *tests/misc/timeout-group.sh.*") "")) + ,@(if (system-hurd?) + '((substitute* + ;; These tests hang + '("tests/cp/sparse-to-pipe.sh" + "tests/split/fail.sh" + ;; These tests error + "tests/dd/nocache.sh" + ;; These tests fail + "tests/cp/sparse.sh" + "tests/cp/special-f.sh" + "tests/dd/bytes.sh" + "tests/dd/stats.sh" + "tests/ls/dangle.sh" + "tests/ls/follow-slink.sh" + "tests/ls/hyperlink.sh" + "tests/ls/infloop.sh" + "tests/ls/inode.sh" + "tests/ls/selinux-segfault.sh" + "tests/misc/env-S.pl" + "tests/misc/factor-parallel.sh" + "tests/misc/ls-misc.pl" + "tests/misc/nice.sh" + "tests/misc/pwd-long.sh" + "tests/misc/shred-passes.sh" + "tests/misc/stat-slash.sh" + "tests/rm/fail-eperm.xpl" + "tests/split/filter.sh") + (("^#!.*" all) + (string-append all "exit 77;\n"))) (substitute* "gnulib-tests/Makefile.in" ;; This test sometimes fails and sometimes ;; passes, but it does this consistently, so