ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hwloc: Skip 'linux-libnuma' test.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2018-04-10 14:29:33 +02:00 committed by Ludovic Courtès
parent a69e0cf3ca
commit 10de06bd07
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/mpi.scm
View file

@ -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: <https://github.com/open-mpi/hwloc/issues/213>.
(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: <https://github.com/open-mpi/hwloc/issues/213>.
(substitute* "tests/hwloc/linux-libnuma.c"
(("numa_available\\(\\)")
"-1"))
#t))))))))
(define-public openmpi
(package