From ba4be4629773633ea873db824ff0743a5d0dda8a Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sat, 7 Aug 2021 23:41:10 +0200 Subject: [PATCH core-updates-frozen v2] gnu: util-linux: Disable unreliable ioctl_ns test on IA-32. * gnu/packages/linux.scm (util-linux)[arguments]<#:phases>{delete-lsns-test}: New phase. --- gnu/packages/linux.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a5fd8ddaee..5690b81bf1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2020 pukkamustard ;;; Copyright © 2021 B. Wilson ;;; Copyright © 2021 Ivan Gankevich +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1804,6 +1805,16 @@ 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 . + (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")) base-commit: 944ba4237f4c0ccab1bc62a23a31f577ce1878e5 -- 2.32.0