diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-02-20 21:48:01 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:48 +0200 |
| commit | e69035a8df9ff673ae9692ffd42eed29d3e022a3 (patch) | |
| tree | 72b52bfddbd1f9c7aa3c67488cf685e37f56a2fc | |
| parent | 1c1f61bb53d63be0e8677d8609493bb4b9a832a6 (diff) | |
| download | guix-e69035a8df9ff673ae9692ffd42eed29d3e022a3.tar.gz guix-e69035a8df9ff673ae9692ffd42eed29d3e022a3.zip | |
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 f3a4e3dfbe..6df0e2c301 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -827,7 +827,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 @@ -846,11 +849,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. |