summaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2016-06-20 11:50:39 +1200
committerRobert Ancell <robert.ancell@canonical.com>2016-06-20 11:50:39 +1200
commitf65191323a51ce7fd5140b9db58e73475e3a2cfb (patch)
tree058346f60cdb68f55ea25f03d0377966c3e17707 /tests/Makefile.am
parentd38518cfed949f7bfc02e2c5a1788cf899c765b8 (diff)
downloadlightdm-git-f65191323a51ce7fd5140b9db58e73475e3a2cfb.tar.gz
Allow XMir to run on the xlocal seat using the new x-server-backend=mir option
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am12
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2005a53d..b616eb10 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -225,9 +225,9 @@ TESTS = \
test-mir-session-crash \
test-mir-session-compositor-crash \
test-mir-container-session \
- test-wayland-autologin \
- test-wayland-greeter \
- test-wayland-session \
+ test-xmir-autologin \
+ test-xmir-login \
+ test-xmir-switch \
test-unity-compositor-command \
test-unity-compositor-not-found \
test-unity-compositor-fail-start \
@@ -249,6 +249,9 @@ TESTS = \
test-unity-mir-switch \
test-unity-mir-switch-to-user-resettable \
test-unity-mir-script-hooks \
+ test-wayland-autologin \
+ test-wayland-greeter \
+ test-wayland-session \
test-invalid-seat \
test-seatdefaults-still-supported
@@ -634,6 +637,9 @@ EXTRA_DIST = \
scripts/xdmcp-server-xdm-authentication-no-key.conf \
scripts/xdmcp-server-xdm-authentication-required.conf \
scripts/xdmcp-server-xdm-authentication-short-data.conf \
+ scripts/xmir-autologin.conf \
+ scripts/xmir-login.conf \
+ scripts/xmir-switch.conf \
scripts/xremote-autologin.conf \
scripts/xremote-login.conf \
scripts/xserver-config.conf \