diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-02-20 21:48:01 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-02-20 22:18:35 -0500 |
| commit | f5a867765b26041e1ecc852ebcbc64c193d36648 (patch) | |
| tree | cb50561b38b6b881ba127c28acc15799497a43f7 | |
| parent | e9efc904db222f07e97e99401b92254036dea202 (diff) | |
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
| -rw-r--r-- | gnu/packages/freedesktop.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 66561d11c1..b67f9183ca 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -697,7 +697,10 @@ the freedesktop.org XDG Base Directory specification.") "-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 @@ -716,11 +719,8 @@ the freedesktop.org XDG Base Directory specification.") (("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. |