From cf9e0508b26196dc985302776d860a0359652c59 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 13 Feb 2023 16:01:12 -0500 Subject: gnu: hwloc: Skip failing test on non-x86 systems. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- 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: -- cgit v1.2.3