amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fakeroot: Fix test failures.

Browse source 
Fixes <https://bugs.gnu.org/41090>.
Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>.

* gnu/packages/linux.scm (fakeroot)[inputs]: Change from LIBCAP to LIBCAP/NEXT.
[arguments]: Add substitution for tests that use 'ls' to test for block
devices.
This commit is contained in:
Marius Bakke 2020-05-05 16:29:57 +02:00
parent 7431553bd6
commit ba151b7e1a
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/linux.scm
View file

@ -6641,13 +6641,21 @@ the superuser to make device nodes.")
;; We don't have an /etc/passwd entry for "root" - use numeric IDs. ;; We don't have an /etc/passwd entry for "root" - use numeric IDs.
(substitute* "test/compare-tar" (substitute* "test/compare-tar"
(("tar -tvf") "tar --numeric-owner -tvf")) (("tar -tvf") "tar --numeric-owner -tvf"))
;; coreutils 8.32 changed 'ls' to use the statx() syscall instead
;; of lstat(). fakeroot 1.24 does not support the former, so
;; adjust these tests to use 'test -b' instead of 'ls' to test for
;; block device. See <https://bugs.gnu.org/41090>.
(substitute* '("test/t.mknod" "test/t.chmod_dev")
(("ls -ld? \\$tmp/hda3")
"test -b $tmp/hda3 && echo block || echo fail"))
#t))))) #t)))))
(native-inputs (native-inputs
`(("acl" ,acl) `(("acl" ,acl)
("sharutils" ,sharutils) ; for the tests ("sharutils" ,sharutils) ; for the tests
("xz" ,xz))) ; for the tests ("xz" ,xz))) ; for the tests
(inputs (inputs
`(("libcap" ,libcap) `(("libcap" ,libcap/next)
("util-linux" ,util-linux))) ("util-linux" ,util-linux)))
(synopsis "Provides a fake root environment") (synopsis "Provides a fake root environment")
(description "@command{fakeroot} runs a command in an environment where (description "@command{fakeroot} runs a command in an environment where