From patchwork Tue Jul 18 14:40:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51828 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 8A0BA27BBE9; Tue, 18 Jul 2023 15:45:15 +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 0D45827BBE2 for ; Tue, 18 Jul 2023 15:45:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvl-0001Rd-9u; Tue, 18 Jul 2023 10:44:01 -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 1qLluw-0000l9-Dh for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:13 -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 1qLluu-00019g-PL for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLluu-0006m5-Lo for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 43/43] gnu: guile-2.0: Skip 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:43:08 +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.168969137825915 (code B ref 64711); Tue, 18 Jul 2023 14:43:08 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:58 +0000 Received: from localhost ([127.0.0.1]:53921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluk-0006jv-7p for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluh-0006jT-LB for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42: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 1qLluc-000156-EF; Tue, 18 Jul 2023 10:42:50 -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=iO37Tbcsug91AOXMOW1Yc8S4rf6iAGy3PfT1vcIGwHI=; b=aRWkqeGvmEOmhlg3+5Cj U42AiPER4w6m55B18jDX5rg0VwdliCj/XYjSldAOEu9FiKvVlDec9i0hgRT/ojTpXvlnNuSj+akzI AbG+H0KuX2Qfkzwlcxnr6Y+WgelHGzy0MkWKCIMPgf2//LDc3evdX2QdkD5baS4pq7+XiHH2aKKPQ 74nGqGxbjcjtgOcxd/0Xk55/zRKVYkZkf6TX4AUxHO6BIPdxXUOmV0NNDdn8DEZ82xTCPNAnIxi7+ UseoqZFnIGiSJGHWGYTEiqleWHBMKZGQY9QcY6tqFPilfgEwKRbmRTjZj45zJ9CJdLT/NsD1tJAf2 /Nf7hM5M66aKFg==; 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 1qLlub-0004hp-9q; Tue, 18 Jul 2023 10:42:50 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:36 +0200 Message-Id: <0e04074adec5abd0d5c621c7d2853326dc9f2e56.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/guile.scm (guile-2.0)[arguments]: When building natively on the Hurd, add stage 'disable-threads.tests'... (guile-2.2): ...and when building natively on the Hurd, delete it again. --- gnu/packages/guile.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e9bed75fb1..9aefead3b3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -212,8 +212,13 @@ (define-public guile-2.0 (rename-file "test-suite/tests/srfi-18.test" "srfi-18.test") ;; failed to remove 't-guild-compile-7215.go.tdL7yC (substitute* "test-suite/standalone/Makefile.in" - (("test-guild-compile ") "")) - #t))) + (("test-guild-compile ") ""))))) + '()) + ,@(if (system-hurd?) + '((add-after 'unpack 'disable-threads.tests + (lambda _ + ;; Many tests hang, esp. (join-thread ..), also others. + (rename-file "test-suite/tests/threads.test" "threads.test")))) '()) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) @@ -286,7 +291,12 @@ (define-public guile-2.2 (if (target-x86-32?) ; `(append '("--disable-static") '("CFLAGS=-g -O2 -fexcess-precision=standard")) - flags)))) + flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + #$@(if (system-hurd?) + #~((delete 'disable-threads.tests)) + '()))))) (properties '((timeout . 72000) ;20 hours (max-silent-time . 36000))) ;10 hours (needed on ARM