From patchwork Mon Feb 13 21:01:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46937 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 113761674E; Mon, 13 Feb 2023 21:02:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 20D0016725 for ; Mon, 13 Feb 2023 21:02:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRfxg-0003mZ-FM; Mon, 13 Feb 2023 16:02:10 -0500 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 1pRfxb-0003kA-Ja for guix-patches@gnu.org; Mon, 13 Feb 2023 16:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRfxb-00089T-9M for guix-patches@gnu.org; Mon, 13 Feb 2023 16:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRfxb-0007ly-4u for guix-patches@gnu.org; Mon, 13 Feb 2023 16:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61493] [PATCH 1/2] gnu: hwloc: Remove obsolete comments. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Feb 2023 21:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61493@debbugs.gnu.org Received: via spool by 61493-submit@debbugs.gnu.org id=B61493.167632208529811 (code B ref 61493); Mon, 13 Feb 2023 21:02:03 +0000 Received: (at 61493) by debbugs.gnu.org; 13 Feb 2023 21:01:25 +0000 Received: from localhost ([127.0.0.1]:51809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRfwz-0007kf-5U for submit@debbugs.gnu.org; Mon, 13 Feb 2023 16:01:25 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:40930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRfwv-0007jw-4X for 61493@debbugs.gnu.org; Mon, 13 Feb 2023 16:01:21 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 518CE686C1 for <61493@debbugs.gnu.org>; Mon, 13 Feb 2023 21:01:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ii4gjwlRkCPF for <61493@debbugs.gnu.org>; Mon, 13 Feb 2023 21:01:15 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 1968467F6A for <61493@debbugs.gnu.org>; Mon, 13 Feb 2023 21:01:15 +0000 (UTC) From: Simon South Date: Mon, 13 Feb 2023 16:01:11 -0500 Message-Id: <16ef00ad362bd07513600591e70e49997d60adde.1676319305.git.simon@simonsouth.net> X-Mailer: git-send-email 2.39.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 hwloc 2.x become the default with commit 8ec7ca22d3, "gnu: hwloc: Default to 2.x.". * gnu/packages/mpi.scm (hwloc-1): Remove obsolete comment. (hwloc-2): Remove obsolete comment. --- gnu/packages/mpi.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 70b14c30b3..febd0b4124 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -53,8 +53,6 @@ (define-module (gnu packages mpi) #:use-module (ice-9 match)) (define-public hwloc-1 - ;; Note: For now we keep 1.x as the default because many packages have yet - ;; to migrate to 2.0. (package (name "hwloc") (version "1.11.13") @@ -140,7 +138,6 @@ (define-public hwloc-1 (license license:bsd-3))) (define-public hwloc-2 - ;; Note: 2.x isn't the default yet, see above. (package (inherit hwloc-1) (version "2.9.0") From patchwork Mon Feb 13 21:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46936 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 4C6CC1678D; Mon, 13 Feb 2023 21:02:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 44B4F16705 for ; Mon, 13 Feb 2023 21:02:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRfxd-0003li-Ja; Mon, 13 Feb 2023 16:02:05 -0500 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 1pRfxb-0003jb-2P for guix-patches@gnu.org; Mon, 13 Feb 2023 16:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRfxa-00089K-PK for guix-patches@gnu.org; Mon, 13 Feb 2023 16:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRfxa-0007lq-Je for guix-patches@gnu.org; Mon, 13 Feb 2023 16:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61493] [PATCH 2/2] gnu: hwloc: Skip failing test on non-x86 systems. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Feb 2023 21:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61493@debbugs.gnu.org Received: via spool by 61493-submit@debbugs.gnu.org id=B61493.167632208529804 (code B ref 61493); Mon, 13 Feb 2023 21:02:02 +0000 Received: (at 61493) by debbugs.gnu.org; 13 Feb 2023 21:01:25 +0000 Received: from localhost ([127.0.0.1]:51807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRfwy-0007kb-Rf for submit@debbugs.gnu.org; Mon, 13 Feb 2023 16:01:25 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:40938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRfwv-0007jx-0a for 61493@debbugs.gnu.org; Mon, 13 Feb 2023 16:01:21 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 6A31E67F6A for <61493@debbugs.gnu.org>; Mon, 13 Feb 2023 21:01:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MBLlZD_tH0v2 for <61493@debbugs.gnu.org>; Mon, 13 Feb 2023 21:01:15 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 306FF6866F for <61493@debbugs.gnu.org>; Mon, 13 Feb 2023 21:01:15 +0000 (UTC) From: Simon South Date: Mon, 13 Feb 2023 16:01:12 -0500 Message-Id: X-Mailer: git-send-email 2.39.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/mpi.scm (hwloc-2)[arguments]<#:phases>: Rename "skip-test-that-requires-/sys" phase to "skip-tests-that-require-/sys" and expand to skip additional test requiring /sys on non-x86 systems. --- gnu/packages/mpi.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index febd0b4124..22d47b966c 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -164,10 +164,19 @@ (define-public hwloc-2 (substitute* "tests/hwloc/linux-libnuma.c" (("numa_available\\(\\)") "-1")))) - (add-before 'check 'skip-test-that-requires-/sys + (add-before 'check 'skip-tests-that-require-/sys (lambda _ ;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it. - (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0"))) + (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0") + + ;; 'hwloc_backends' also requires /sys on non-x86 systems, for + ;; which hwloc lacks a topology backend not reliant on the + ;; operating system; skip it also on these machines. + (substitute* "tests/hwloc/hwloc_backends.c" + ,@(if (not (target-x86?)) + '((("putenv\\(\\(char \\*\\) \"HWLOC_L" all) + (string-append "exit (77);\n" all))) + '())))) (add-before 'check 'skip-test-that-fails-on-qemu (lambda _ ;; Skip test that fails on emulated hardware due to QEMU bug: