From e69035a8df9ff673ae9692ffd42eed29d3e022a3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 20 Feb 2024 21:48:01 -0500 Subject: [PATCH] gnu: elogind: Reinstate test-user-util test. * gnu/packages/freedesktop.scm (elogind) [configure-flags]: Add -Ddefault-user-shell=/bin/sh. [phases] : Re-instate test-user-util.c test. Change-Id: I123ee22c0a4a946c7c9120360d959497e9790385 --- gnu/packages/freedesktop.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f3a4e3dfbea..6df0e2c3012 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.