summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/freedesktop.scm6
-rw-r--r--gnu/tests/desktop.scm105
3 files changed, 112 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 2f85510767..1ac9d5efea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -487,6 +487,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests/audio.scm \
%D%/tests/base.scm \
%D%/tests/databases.scm \
+ %D%/tests/desktop.scm \
%D%/tests/dict.scm \
%D%/tests/nfs.scm \
%D%/tests/install.scm \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 3307a4ae80..606859771a 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -227,6 +227,12 @@ the freedesktop.org XDG Base Directory specification.")
(list (string-append "--with-udevrulesdir="
(assoc-ref %outputs "out")
"/lib/udev/rules.d")
+
+ ;; Let elogind be its own cgroup controller, rather than relying
+ ;; on systemd or OpenRC. By default, 'configure' makes an
+ ;; incorrect guess.
+ "--with-cgroup-controller=elogind"
+
(string-append "--with-rootprefix="
(assoc-ref %outputs "out"))
(string-append "--with-rootlibexecdir="
diff --git a/gnu/tests/desktop.scm b/gnu/tests/desktop.scm
new file mode 100644
index 0000000000..be64c4e7e5
--- /dev/null
+++ b/gnu/tests/desktop.scm
@@ -0,0 +1,105 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu tests desktop)
+ #:use-module (gnu tests)
+ #:use-module (gnu services)
+ #:use-module (gnu services dbus)
+ #:use-module (gnu services desktop)
+ #:use-module (gnu system vm)
+ #:use-module (guix gexp)
+ #:use-module (srfi srfi-1)
+ #:export (%test-elogind))
+
+
+;;;
+;;; Elogind.
+;;;
+
+(define (run-elogind-test vm)
+ (define test
+ (with-imported-modules '((gnu build marionette)
+ (guix build syscalls))
+ #~(begin
+ (use-modules (gnu build marionette)
+ (guix build syscalls)
+ (srfi srfi-64))
+
+ (define marionette
+ (make-marionette '(#$vm)))
+
+ (mkdir #$output)
+ (chdir #$output)
+
+ (test-begin "elogind")
+
+ ;; Log in as root on tty1, and check what 'loginctl' returns.
+ (test-equal "login on tty1"
+ '(("c1" "0" "root" "seat0" "/dev/tty1") ;session
+ ("seat0") ;seat
+ ("0" "root")) ;user
+
+ (begin
+ ;; Wait for tty1.
+ (marionette-eval
+ '(begin
+ (use-modules (gnu services herd))
+ (start-service 'term-tty1))
+ marionette)
+ (marionette-control "sendkey ctrl-alt-f1" marionette)
+
+ ;; Now we can type.
+ (marionette-type "root\n" marionette)
+ (marionette-type "loginctl list-users --no-legend > users\n"
+ marionette)
+ (marionette-type "loginctl list-seats --no-legend > seats\n"
+ marionette)
+ (marionette-type "loginctl list-sessions --no-legend > sessions\n"
+ marionette)
+
+
+ ;; Read the three files.
+ (marionette-eval '(use-modules (rnrs io ports)) marionette)
+ (let ((guest-file (lambda (file)
+ (string-tokenize
+ (wait-for-file file marionette
+ #:read 'get-string-all)))))
+ (list (guest-file "/root/sessions")
+ (guest-file "/root/seats")
+ (guest-file "/root/users")))))
+
+ (test-end)
+ (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
+
+ (gexp->derivation "elogind" test))
+
+(define %test-elogind
+ (system-test
+ (name "elogind")
+ (description
+ "Test whether we can log in when elogind is enabled, and whether
+'loginctl' reports accurate user, session, and seat information.")
+ (value
+ (let ((os (marionette-operating-system
+ (simple-operating-system
+ (service elogind-service-type)
+ (service polkit-service-type)
+ (service dbus-root-service-type))
+ #:imported-modules '((gnu services herd)
+ (guix combinators)))))
+ (run-elogind-test (virtual-machine os))))))