From 10de06bd07eca266bdd59333cb671682af70fdcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 10 Apr 2018 14:29:33 +0200 Subject: [PATCH] gnu: hwloc: Skip 'linux-libnuma' test. That test would fail on some machines, for instance build machines behind berlin.guixsd.org. * gnu/packages/mpi.scm (hwloc)[arguments]: Add 'skip-linux-libnuma-test' phase. (hwloc-2.0)[arguments]: Replace it. --- gnu/packages/mpi.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e4c1a491c3..5dfb26ae75 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -79,6 +79,14 @@ (define-public hwloc `(#:configure-flags '("--localstatedir=/var") #:phases (modify-phases %standard-phases + (add-before 'check 'skip-linux-libnuma-test + (lambda _ + ;; Arrange to skip 'tests/linux-libnuma', which fails on some + ;; machines: . + (substitute* "tests/linux-libnuma.c" + (("numa_available\\(\\)") + "-1")) + #t)) (add-after 'install 'refine-libnuma ;; Give -L arguments for libraries to avoid propagation (lambda* (#:key inputs outputs #:allow-other-keys) @@ -128,7 +136,19 @@ (define-public hwloc-2.0 "0jf0krj1h95flmb784ifv9vnkdnajjz00p4zbhmja7vm4v67axdr")))) ;; libnuma is no longer needed. - (inputs (alist-delete "numactl" (package-inputs hwloc))))) + (inputs (alist-delete "numactl" (package-inputs hwloc))) + (arguments + (substitute-keyword-arguments (package-arguments hwloc) + ((#:phases phases) + `(modify-phases ,phases + (replace 'skip-linux-libnuma-test + (lambda _ + ;; Arrange to skip 'tests/hwloc/linux-libnuma', which fails on + ;; some machines: . + (substitute* "tests/hwloc/linux-libnuma.c" + (("numa_available\\(\\)") + "-1")) + #t)))))))) (define-public openmpi (package