futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: util-linux: Skip setarch tests when building on armhf-linux.

Browse Source 
* gnu/packages/linux.scm (util-linux)[arguments]: When building on
armhf-linux, disable the setarch tests.
This commit is contained in:
Marius Bakke 2020-03-31 18:16:05 +02:00
parent 95ac5cd668
commit 3e902bbb56
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/linux.scm
View File

@ -1216,6 +1216,21 @@ providing the system administrator with some help in common tasks.")
(substitute* "tests/ts/column/invalid-multibyte"
(("C\\.UTF-8") "en_US.utf8"))
#t)))
;; TODO: Remove the conditional on the next rebuild cycle.
,@(if (string-prefix? "arm" (%current-system))
'((add-before 'check 'disable-setarch-test
(lambda _
;; The setarch tests are unreliable in QEMU's
;; user-mode emulation, which is our primary
;; method of building ARMv7 packages.
;; <https://github.com/karelzak/util-linux/issues/601>
(substitute* "tests/ts/misc/setarch"
(("ts_init_subtest.*" all)
(string-append
all "\n"
"ts_skip \"setarch tests are unreliable under QEMU\"")))
#t)))
'())
(add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys)
(let ((lib (assoc-ref outputs "lib"))