mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-26 20:49:29 -05:00
gnu: elogind: Reinstate test-user-util test.
* gnu/packages/freedesktop.scm (elogind) [configure-flags]: Add -Ddefault-user-shell=/bin/sh. [phases] <adjust-tests>: Re-instate test-user-util.c test. Change-Id: I123ee22c0a4a946c7c9120360d959497e9790385
This commit is contained in:
parent
1c1f61bb53
commit
e69035a8df
1 changed files with 5 additions and 5 deletions
|
@ -827,7 +827,10 @@ (define-public elogind
|
|||
"-Dcgroup-controller=elogind"
|
||||
"-Dman=true"
|
||||
;; Disable some tests.
|
||||
"-Dslow-tests=false"))
|
||||
"-Dslow-tests=false"
|
||||
;; Adjust the default user shell to /bin/sh (otherwise it is set
|
||||
;; to /bin/bash).
|
||||
"-Ddefault-user-shell=/bin/sh"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-pkttyagent-path
|
||||
|
@ -846,11 +849,8 @@ (define-public elogind
|
|||
(("PKGSYSCONFDIR") "\"/etc/elogind\""))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
;; Skip the user-util tests, which depends on users such as
|
||||
;; 'root' existing in the build environment.
|
||||
(substitute* "src/test/meson.build"
|
||||
((".*'test-user-util.c'.*") "")
|
||||
((".*'test-cgroup.c'.*") ""))
|
||||
((".*'test-cgroup.c'.*") "")) ;no cgroup in container
|
||||
;; This test tries to copy some bytes from /usr/lib/os-release,
|
||||
;; which does not exist in the build container. Choose something
|
||||
;; more likely to be available.
|
||||
|
|
Loading…
Reference in a new issue