branch core-updates updated: gnu: util-linux: Skip setarch tests when building on armhf-linux.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 3e902bb  gnu: util-linux: Skip setarch tests when building on 
armhf-linux.
3e902bb is described below

commit 3e902bbb56e34669bc3de8a3768104aa118a0881
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Mar 31 18:16:05 2020 +0200

    gnu: util-linux: Skip setarch tests when building on armhf-linux.
    
    * gnu/packages/linux.scm (util-linux)[arguments]: When building on
    armhf-linux, disable the setarch tests.
---
 gnu/packages/linux.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b568030..faedce7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -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"))