[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/10: gnu: hwloc: Skip failing test on non-x86 systems.
From: |
guix-commits |
Subject: |
10/10: gnu: hwloc: Skip failing test on non-x86 systems. |
Date: |
Mon, 27 Feb 2023 10:00:34 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit cf9e0508b26196dc985302776d860a0359652c59
Author: Simon South <simon@simonsouth.net>
AuthorDate: Mon Feb 13 16:01:12 2023 -0500
gnu: hwloc: Skip failing test on non-x86 systems.
* 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.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
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 b318acd4b9..baef62616f 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -165,10 +165,19 @@ bind processes, and much more.")
(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:
- branch master updated (2cf07434d8 -> cf9e0508b2), guix-commits, 2023/02/27
- 02/10: gexp: computed-file: Do not honor %guile-for-build., guix-commits, 2023/02/27
- 04/10: gnu: Add scheme48-prescheme., guix-commits, 2023/02/27
- 05/10: gnu: Add font-microsoft-cascadia., guix-commits, 2023/02/27
- 08/10: gnu: nvme-cli: Update to 2.3., guix-commits, 2023/02/27
- 07/10: gnu: Add libnvme., guix-commits, 2023/02/27
- 09/10: gnu: hwloc: Remove obsolete comments., guix-commits, 2023/02/27
- 10/10: gnu: hwloc: Skip failing test on non-x86 systems.,
guix-commits <=
- 01/10: pack: Make sure tests can run without a world rebuild., guix-commits, 2023/02/27
- 03/10: scripts: repl: Extend REPL %load-path with all channels., guix-commits, 2023/02/27
- 06/10: gnu: podman: Update to 4.4.1., guix-commits, 2023/02/27