Message ID | 86a9ff0068ac21d4fa340f450f0835fa840111b2.1689690897.git.janneke@gnu.org |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC14A27BBEA; Tue, 18 Jul 2023 15:41:48 +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 34C5327BBE2 for <patchwork@mira.cbaines.net>; Tue, 18 Jul 2023 15:41:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qLlsx-0006ka-2n; Tue, 18 Jul 2023 10:41:07 -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 <Debian-debbugs@debbugs.gnu.org>) id 1qLlss-0006b1-Hf for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41: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 <Debian-debbugs@debbugs.gnu.org>) id 1qLlss-0000a3-9L 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 <Debian-debbugs@debbugs.gnu.org>) id 1qLlss-0006WK-62 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 02/43] gnu: guile: Skip hanging and failing pipe tests on the Hurd. Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:41:02 +0000 Resent-Message-ID: <handler.64711.B64711.168969124924987@debbugs.gnu.org> 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.168969124924987 (code B ref 64711); Tue, 18 Jul 2023 14:41:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:40:49 +0000 Received: from localhost ([127.0.0.1]:53715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qLlsf-0006Ux-9s for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@gnu.org>) id 1qLlsd-0006UW-J0 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:47 -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 <janneke@gnu.org>) id 1qLlsW-0000Ww-Qo; Tue, 18 Jul 2023 10:40:42 -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=r5uKUBmJn0ssPQS75PNriSoU4ZxOVPlWO331igslL7Y=; b=rxT7ikrrAIHgR3pqZFZi cdIfczGtFhRb8Q5qIkXJrpXzu7ezgCXM5+uLZ3+4JEDbLqXAEptF8MhV8OsiAnhnnjVhuyxXOoXgf 8ZEuqgsu5wMlU5Ken/VFogrlviGUu1xUOtCoPZs5IL7CemvYcBo36dnOwLw3EwjetX5mFRh/FmonO lpTURudtY3hCS9sQJIx6XL4eE0XjLi9G8YkudW+DoLOZdMOIUOZmtiDR0c2vhSBmxy5lS/P2CY57w oTSz9VI1sWseA+o9/WO8xPWpIBrdSik8htR6XWvQ4HnwAi1rpWBX46RKJ0iO0a9iajwV9DDn+on+e jCQQrYCGYMB6lA==; 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 <janneke@gnu.org>) id 1qLlsV-0004hp-3J; Tue, 18 Jul 2023 10:40:39 -0400 From: Janneke Nieuwenhuizen <janneke@gnu.org> Date: Tue, 18 Jul 2023 16:39:55 +0200 Message-Id: <86a9ff0068ac21d4fa340f450f0835fa840111b2.1689690897.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <cover.1689690897.git.janneke@gnu.org> References: <cover.1689690897.git.janneke@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
Series |
Fix builds and skip failing tests for the Hurd.
|
|
Commit Message
Janneke Nieuwenhuizen
July 18, 2023, 2:39 p.m. UTC
* gnu/packages/guile.scm (guile-3.0)[arguments]: When building on the Hurd, add stage 'disable-popen.test-open-pipe' to avoid running the open-input-pipe test (hangs) and open-output-pipe test (fails. --- gnu/packages/guile.scm | 9 +++++++++ 1 file changed, 9 insertions(+)
Comments
Hi, (+Cc: Josselin.) Janneke Nieuwenhuizen <janneke@gnu.org> skribis: > * gnu/packages/guile.scm (guile-3.0)[arguments]: When building on the Hurd, > add stage 'disable-popen.test-open-pipe' to avoid running the > open-input-pipe test (hangs) and open-output-pipe test (fails. [...] > + #~((add-after 'unpack 'disable-popen.test-no-duplicate > + ;; This test hangs on the Hurd. > + (lambda _ > + (substitute* "test-suite/tests/popen.test" > + (("\\(pass-if \"no duplicate\".*" all) > + (string-append all " (when (string-ci= \"GNU\" (vector-ref (uname) 0)) (throw 'unresolved)) > +")))))) Maybe write: (string-append all (object->string '(when …))) Out of curiosity, is there a bug report for this one? IIRC, the test suite of Guile 3.0.9 + ‘guile-hurd-posix-spawn.patch’ used to pass on glibc 2.35. As discussed on IRC, skipping this test is not great in that it’ll likely come to haunt us. However, like you write, we can do that for now in the interest of making progress :-) and remove it with a proper fix once we have it. So… LGTM! Ludo’.
Ludovic Courtès writes: Hi! > (+Cc: Josselin.) > > Janneke Nieuwenhuizen <janneke@gnu.org> skribis: > >> * gnu/packages/guile.scm (guile-3.0)[arguments]: When building on the Hurd, >> add stage 'disable-popen.test-open-pipe' to avoid running the >> open-input-pipe test (hangs) and open-output-pipe test (fails. > > [...] > >> + #~((add-after 'unpack 'disable-popen.test-no-duplicate >> + ;; This test hangs on the Hurd. >> + (lambda _ >> + (substitute* "test-suite/tests/popen.test" >> + (("\\(pass-if \"no duplicate\".*" all) >> + (string-append all " (when (string-ci= \"GNU\" (vector-ref (uname) 0)) (throw 'unresolved)) >> +")))))) > > Maybe write: > > (string-append all > (object->string '(when …))) That's a neat trick; changed to (string-append all (object->string '(when (string-ci= "GNU" (vector-ref (uname) 0)) (throw 'unresolved))))))))) > Out of curiosity, is there a bug report for this one? Sorry, no! I was kinda hoping this would resolve itself somehow, I think. Let's make sure there's a bug report if we still need this after Josselin's work. > IIRC, the test suite of Guile 3.0.9 + ‘guile-hurd-posix-spawn.patch’ > used to pass on glibc 2.35. Ok, good to know. > As discussed on IRC, skipping this test is not great in that it’ll > likely come to haunt us. However, like you write, we can do that for > now in the interest of making progress :-) and remove it with a proper > fix once we have it. > > So… LGTM! Thanks! Janneke
Ludovic Courtès writes: Hi! > (+Cc: Josselin.) > > Janneke Nieuwenhuizen <janneke@gnu.org> skribis: > >> * gnu/packages/guile.scm (guile-3.0)[arguments]: When building on the Hurd, >> add stage 'disable-popen.test-open-pipe' to avoid running the >> open-input-pipe test (hangs) and open-output-pipe test (fails. > > [...] > >> + #~((add-after 'unpack 'disable-popen.test-no-duplicate >> + ;; This test hangs on the Hurd. >> + (lambda _ >> + (substitute* "test-suite/tests/popen.test" >> + (("\\(pass-if \"no duplicate\".*" all) >> + (string-append all " (when (string-ci= \"GNU\" (vector-ref (uname) 0)) (throw 'unresolved)) >> +")))))) > > Maybe write: > > (string-append all > (object->string '(when …))) That's a neat trick; changed to (string-append all (object->string '(when (string-ci= "GNU" (vector-ref (uname) 0)) (throw 'unresolved))))))))) > Out of curiosity, is there a bug report for this one? Sorry, no! I was kinda hoping this would resolve itself somehow, I think. Let's make sure there's a bug report if we still need this after Josselin's work. > IIRC, the test suite of Guile 3.0.9 + ‘guile-hurd-posix-spawn.patch’ > used to pass on glibc 2.35. Ok, good to know. > As discussed on IRC, skipping this test is not great in that it’ll > likely come to haunt us. However, like you write, we can do that for > now in the interest of making progress :-) and remove it with a proper > fix once we have it. > > So… LGTM! Thanks! Janneke
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 48bee600a9..ed20c1dfbc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -378,6 +378,15 @@ (define-public guile-3.0 (search-patch "guile-hurd-posix-spawn.patch"))) (invoke "patch" "--force" "-p1" "-i" patch)))) #~()) + #$@(if (system-hurd?) + #~((add-after 'unpack 'disable-popen.test-no-duplicate + ;; This test hangs on the Hurd. + (lambda _ + (substitute* "test-suite/tests/popen.test" + (("\\(pass-if \"no duplicate\".*" all) + (string-append all " (when (string-ci= \"GNU\" (vector-ref (uname) 0)) (throw 'unresolved)) +")))))) + #~()) #$@(if (target-ppc32?) #~((add-after 'unpack 'adjust-bootstrap-flags (lambda _