Merged changes from parent branch.

[sojka/lightdm.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 41b2e8b11678dabc8b8afd641d94597e08c2c7b6..ec2919669d6cbaa98518c05033b243c629cbb6ea 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -130,9 +130,11 @@ TESTS = \
        test-dbus \
        test-lock-seat \
        test-lock-seat-after-vt-switch \
+       test-lock-seat-twice \
        test-lock-seat-resettable \
        test-lock-seat-return-session \
        test-lock-session \
+       test-lock-session-twice \
        test-lock-session-no-password \
        test-lock-session-resettable \
        test-lock-session-return-session \
@@ -164,12 +166,10 @@ TESTS = \
        test-vnc-command \
        test-vnc-dimensions \
        test-vnc-open-file-descriptors \
-       test-vnc-guest \
        test-xdmcp-client \
        test-xdmcp-server-autologin \
        test-xdmcp-server-login \
        test-xdmcp-server-double-login \
-       test-xdmcp-server-guest \
        test-utmp-login \
        test-utmp-autologin \
        test-utmp-wrong-password \
@@ -411,14 +411,17 @@ EXTRA_DIST = \
        scripts/language-env.conf \
        scripts/language-no-accounts-service.conf \
        scripts/lock-seat.conf \
-       scripts/lock-seat-console-kit.conf \    
+       scripts/lock-seat-after-vt-switch.conf
+       scripts/lock-seat-console-kit.conf \
        scripts/lock-seat-resettable.conf \
        scripts/lock-seat-return-session.conf \
        scripts/lock-seat-return-session-console-kit.conf \
+       scripts/lock-seat-twice.conf \
        scripts/lock-session.conf \
        scripts/lock-session-no-password.conf \
        scripts/lock-session-resettable.conf \
        scripts/lock-session-return-session.conf \
+       scripts/lock-session-twice.conf \
        scripts/login.conf \
        scripts/login-crash-authenticate.conf \
        scripts/login-guest.conf \
@@ -558,7 +561,6 @@ EXTRA_DIST = \
        scripts/utmp-wrong-password.conf \
        scripts/vnc-command.conf \
        scripts/vnc-dimensions.conf \
-       scripts/vnc-guest.conf \
        scripts/vnc-login.conf \
        scripts/vnc-open-file-descriptors.conf \
        scripts/xauthority.conf \
@@ -567,7 +569,6 @@ EXTRA_DIST = \
        scripts/xdmcp-client.conf \
        scripts/xdmcp-server-autologin.conf \
        scripts/xdmcp-server-double-login.conf \
-       scripts/xdmcp-server-guest.conf \
        scripts/xdmcp-server-login.conf \
        scripts/xdmcp-server-open-file-descriptors.conf \
        scripts/xserver-fail-start.conf \