121/203: gnu: util-linux: Globally disable the lsns test.

[guix-commits]

apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit cc857e43c834e57a77da60541ae034b30e72cd4e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 15 14:19:53 2021 -0400

    gnu: util-linux: Globally disable the lsns test.
    
    Justification: the test also failed on the CI for x86_64 and caused an
    evaluation to fail.
    
    * gnu/packages/linux.scm (util-linux)[phases]{disable-lsns-test}: Disable
    globally.
---
 gnu/packages/linux.scm | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 81fdace..c862454 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1907,16 +1907,14 @@ providing the system administrator with some help in 
common tasks.")
                          (string-append
                           all "\n"
                           "ts_skip \"setarch tests are unreliable under 
QEMU\"")))))
-                  ,@(if (target-x86-32?)
-                        `((add-before 'check 'disable-lsns-test
-                            (lambda _
-                              ;; The lsns tests can fail due to ioctl(_, 
NS_GET_USERNS)
-                              ;; returning ENOTTY, indicating this kernel does 
not
-                              ;; support user namespaces.  Curiously, this 
test can fail
-                              ;; on i686 even if the same test passes on 
x86_64 on the
-                              ;; same machine.  See 
<https://issues.guix.gnu.org/49933>.
-                              (delete-file "tests/ts/lsns/ioctl_ns"))))
-                        '())
+                  (add-before 'check 'disable-lsns-test
+                    (lambda _
+                      ;; The lsns tests can fail due to ioctl(_, NS_GET_USERNS)
+                      ;; returning ENOTTY, indicating this kernel does not
+                      ;; support user namespaces.  Curiously, this test can 
fail
+                      ;; on i686 even if the same test passes on x86_64 on the
+                      ;; same machine.  See 
<https://issues.guix.gnu.org/49933>.
+                      (delete-file "tests/ts/lsns/ioctl_ns")))
                   (add-after 'install 'move-static-libraries
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((lib    (assoc-ref outputs "lib"))