Also set XDG_SESSION_TYPE

diff --git a/src/mir-server.c b/src/mir-server.c
index c2317e0e4bf6becd2c049ae0c8c70237ac3a1de7..69a492d60a26b0c6bcb19d8cf28f812d43e71fd9 100644 (file)
--- a/src/mir-server.c
+++ b/src/mir-server.c
@@ -67,6 +67,8 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
 {
     MirServer *server;
 
+    session_set_env (session, "XDG_SESSION_TYPE", "mir");
+
     server = MIR_SERVER (display_server);
     if (server->priv->parent_socket)
         session_set_env (session, "MIR_SOCKET", server->priv->parent_socket);
@@ -81,6 +83,7 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
 static void
 mir_server_disconnect_session (DisplayServer *display_server, Session *session)
 {
+    session_unset_env (session, "XDG_SESSION_TYPE");
     session_unset_env (session, "MIR_SOCKET");
     session_unset_env (session, "MIR_SERVER_VT");
 }

diff --git a/src/unity-system-compositor.c b/src/unity-system-compositor.c
index 94662ff708c56b257ce67d658b047fa5c796e90e..7ba95e4289708e00bf1de0c57b94c1b93a5cad9d 100644 (file)
--- a/src/unity-system-compositor.c
+++ b/src/unity-system-compositor.c
@@ -179,6 +179,8 @@ unity_system_compositor_connect_session (DisplayServer *display_server, Session
     UnitySystemCompositor *compositor = UNITY_SYSTEM_COMPOSITOR (display_server);
     const gchar *name;
 
+    session_set_env (session, "XDG_SESSION_TYPE", "mir");
+
     if (compositor->priv->socket)
         session_set_env (session, "MIR_SOCKET", compositor->priv->socket);
     if (IS_GREETER (session))
@@ -198,6 +200,7 @@ unity_system_compositor_connect_session (DisplayServer *display_server, Session
 static void
 unity_system_compositor_disconnect_session (DisplayServer *display_server, Session *session)
 {
+    session_unset_env (session, "XDG_SESSION_TYPE");
     session_unset_env (session, "MIR_SOCKET");
     session_unset_env (session, "MIR_SERVER_NAME");
     session_unset_env (session, "XDG_VTNR");

diff --git a/src/x-server.c b/src/x-server.c
index eab026cfea0580c03c4b96dd1a885485e90669d3..c23fe1f93ed0f40377fe428023730d028ef292ca 100644 (file)
--- a/src/x-server.c
+++ b/src/x-server.c
@@ -149,6 +149,8 @@ x_server_connect_session (DisplayServer *display_server, Session *session)
 {
     gint vt;
 
+    session_set_env (session, "XDG_SESSION_TYPE", "x11");
+
     display_server = session_get_display_server (session);
 
     vt = display_server_get_vt (display_server);
@@ -180,6 +182,7 @@ x_server_disconnect_session (DisplayServer *display_server, Session *session)
 {
     gint vt;
 
+    session_unset_env (session, "XDG_SESSION_TYPE");
     vt = display_server_get_vt (display_server);
     if (vt > 0)
     {

diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf
index b0bd89de32e2169459e6534b1c7852c66e99689c..3ab14c98c77b075e53a2f157341d1fd97045d292 100644 (file)
--- a/tests/scripts/additional-config-priority.conf
+++ b/tests/scripts/additional-config-priority.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf
index 6efca7da002b0d27fde6bbcd94fe631f3b4dadd0..d5e215c5ddf71204c1f05932a80e725c6df55dd7 100644 (file)
--- a/tests/scripts/additional-config.conf
+++ b/tests/scripts/additional-config.conf
@@ -20,7 +20,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/additional-system-config-priority.conf b/tests/scripts/additional-system-config-priority.conf
index f0926ff04b62ab4a55bbb6ea282d11f6a4c47418..b19a3a2f65ee9c6c2b3fc9a6db5bd2d7a0eedbe7 100644 (file)
--- a/tests/scripts/additional-system-config-priority.conf
+++ b/tests/scripts/additional-system-config-priority.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/additional-system-config.conf b/tests/scripts/additional-system-config.conf
index 76a9aa15bfefa2450d97638c5e95e2d60163a1e4..68f0f344523d8eff028b5744577f44a5d33f74a4 100644 (file)
--- a/tests/scripts/additional-system-config.conf
+++ b/tests/scripts/additional-system-config.conf
@@ -20,7 +20,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index 955d37f3dfda323f7ef7c3d489f97478e04fdc8e..10dfa03ecadf1a4aa169d0ee535efbd0b2011f4d 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -28,7 +28,7 @@ user-session=default
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index 0ea3e1efb85e46397096583c7c7681a2fc3c988b..38d31e3fcd3f5d3e4dc3af9d0ad7641cdec8f02f 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -21,7 +21,7 @@ user-session=default
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-guest-session-config.conf b/tests/scripts/autologin-guest-session-config.conf
index 8acc942f7c6b4adeee4a60d862d5e0cae018d593..785abca0f5cc52375b27f61c2e7b55ba990c59d7 100644 (file)
--- a/tests/scripts/autologin-guest-session-config.conf
+++ b/tests/scripts/autologin-guest-session-config.conf
@@ -22,7 +22,7 @@ guest-session=alternative
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf
index 30d3964f22c5d5f0ed044cc4edd6c108d05519a4..058731e682bbb46fd6952c9ac8cb912225d197c6 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -39,7 +39,7 @@ user-session=default
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index ea8cad443853cbf9cfe7b34ebc942438396e613e..500fd66289f11dacb63cbf038c49ca26b81e4495 100644 (file)
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -21,7 +21,7 @@ user-session=default
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf
index f97607d1e971c9c49ff3b3a29741ec24b746728d..4b89171dc54cd3adfb252931f22b7c890091b0af 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -27,7 +27,7 @@ user-session=default
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-invalid-greeter.conf b/tests/scripts/autologin-invalid-greeter.conf
index 40f1266b9614ee2cd6fb7fc3bee2bfb6924ba6b4..bf7a11179733c7f9ec35cf136257f2f0223e030d 100644 (file)
--- a/tests/scripts/autologin-invalid-greeter.conf
+++ b/tests/scripts/autologin-invalid-greeter.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index f58809c99a1cf1fb0fe84bca6226f5ead08965b4..99bdb61f71bf3489886e336263af3e13c127bd4e 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Autologin session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf
index 20e9bf99c941bf201b443e9a0c44ea6866b42526..3a3d616a81b05064fec6c2c58976b2a58e2f5657 100644 (file)
--- a/tests/scripts/autologin-previous-session.conf
+++ b/tests/scripts/autologin-previous-session.conf
@@ -17,7 +17,7 @@ autologin-user=have-session
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=have-session
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf
index d71b2e41c63eb358434c59663d4ea9a2685c37cc..ed687adb1aa1c90735d0d2306daf181e93fbceee 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index c4e96d9a1a3f6edcb4e37304162beff02e82b2af..ea7520361a7f482eb2f28b2070ab9bde5224f18e 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -28,7 +28,7 @@ user-session=default
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf
index 61498fcecf9baa7382b8bbc3409e22a5138148aa..eede796fb8b4125880f9ee843043de137f37bcf5 100644 (file)
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -36,7 +36,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index e33b0132f71b55b9d0c53156680d3d04b0beaf8b..a3d814999ae6ad1422d5b50d0673e0d477ae8ae8 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index 3cde2a5836af5f849a669f2f9e4dc46cff1fb535..2c03f59c4667e621bd8d2459bc66ffbfe83a5f80 100644 (file)
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf
index f13e76b140a08edceaf302a4f486a08e1f2b59fb..ac9ac828b53275e5a63a2fe74f00f610882362f7 100644 (file)
--- a/tests/scripts/console-kit.conf
+++ b/tests/scripts/console-kit.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/corrupt-xauthority.conf b/tests/scripts/corrupt-xauthority.conf
index 081edb2c9606f94f839534cada372b96b2ffee0d..1c184f8c3376ddf7b24a64354201ac48c67a1e72 100644 (file)
--- a/tests/scripts/corrupt-xauthority.conf
+++ b/tests/scripts/corrupt-xauthority.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/corrupt-xauth DESKTOP_SESSION=default USER=corrupt-xauth
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/corrupt-xauth XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=corrupt-xauth
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf
index 0bfc6179941418432b1f8311f6906858befe25d5..a5b64ee209c3643cacfdbb8c5daf3e2e7ea5fec9 100644 (file)
--- a/tests/scripts/dbus.conf
+++ b/tests/scripts/dbus.conf
@@ -38,7 +38,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf
index 80bc8c0a96e999a5ec412e70411d3073c37ce161..f1e2a739d3aab56c37171184e471fb7c36bb62f7 100644 (file)
--- a/tests/scripts/group-membership.conf
+++ b/tests/scripts/group-membership.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/group-member DESKTOP_SESSION=default USER=group-member
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/group-member XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=group-member
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/guest-wrapper.conf b/tests/scripts/guest-wrapper.conf
index 4a9cfdc2c21a58c99bb5542b345720609ba75d46..9a7aa0aaeab671816c1203470264bef33ad090b5 100644 (file)
--- a/tests/scripts/guest-wrapper.conf
+++ b/tests/scripts/guest-wrapper.conf
@@ -25,7 +25,7 @@ guest-wrapper=test-guest-wrapper
 #?GUEST-WRAPPER-X-0 START
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf
index 25bbe299bf70c62afd06d43e2a3f41160a5a7810..62f8296ee619383d85b6ea727782c8da542ed395 100644 (file)
--- a/tests/scripts/home-dir-on-authenticate.conf
+++ b/tests/scripts/home-dir-on-authenticate.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/mount-home-dir DESKTOP_SESSION=default USER=mount-home-dir
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/mount-home-dir XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=mount-home-dir
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf
index 2739d0d3f5ef3b3b5a3e149d42a5e2fdb5fd5b60..dec662b254e61da14af69cd79d5fab9f775f04df 100644 (file)
--- a/tests/scripts/home-dir-on-session.conf
+++ b/tests/scripts/home-dir-on-session.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/make-home-dir DESKTOP_SESSION=default USER=make-home-dir
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/make-home-dir XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=make-home-dir
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/language-env.conf b/tests/scripts/language-env.conf
index fbfb4d4077099c4140ee769ccb2872ad25dceee7..2f18924fcec17ec312cf6ae1a54187b3d8a321b8 100644 (file)
--- a/tests/scripts/language-env.conf
+++ b/tests/scripts/language-env.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-language DESKTOP_SESSION=default USER=have-language
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-language XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-language
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf
index 5ca356da22ffe5e000142001f0381f209bdcdf6b..61bd85408d20f9d3dd11245a02bc54bd7970964a 100644 (file)
--- a/tests/scripts/lock-seat-console-kit.conf
+++ b/tests/scripts/lock-seat-console-kit.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf
index 563532a9f68e2590d31974f42a985b676969ff1c..fbe786ec044e95ae0aca9c6fc83939366d848cf2 100644 (file)
--- a/tests/scripts/lock-seat-return-session-console-kit.conf
+++ b/tests/scripts/lock-seat-return-session-console-kit.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf
index 104ffeb2801806e48a83abb06ea53a427f182af0..3b28e7e7488bab099c36b377c8f65f63e507d600 100644 (file)
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 537040b9b4aef4141a39a8b21ed5dca5c47174d9..e2d1999c4202105dc837493de94bc3babffea6d4 100644 (file)
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf
index 80f64292e9cde172787d3b748b003059e396c7b0..9bfbd2241bee52d39b0105b54cbf9a8ddb8f6fab 100644 (file)
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
index fd45d1544a215c145e081e5566b240631ce0cee1..7c734a6dbf61a2390135ec0380d1562d9d9729c1 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
index db06359ee20e7e0a0250f4e23436342c7f42df6d..b6c1c25b616bb74260d65011a79c15f974c79473 100644 (file)
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index c88f797129d1c74f71072f82c6178d8053abe32e..f31e12780500def40495d9ea2168d4a0c7baeb2c 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -34,7 +34,7 @@ user-session=default
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-guest-pick-session.conf b/tests/scripts/login-guest-pick-session.conf
index 8efe108cc9b4e9bfe86d80fafa5be399eafa538e..72ddd59cd6d4e0e959429668b7e4752a85aeb8fc 100644 (file)
--- a/tests/scripts/login-guest-pick-session.conf
+++ b/tests/scripts/login-guest-pick-session.conf
@@ -34,7 +34,7 @@ user-session=default
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-guest-session-config.conf b/tests/scripts/login-guest-session-config.conf
index 0d568fc491afe78321a4798ee49153b65614a136..9b0ca45c14c0cdc6286b2481940d300dbfb8ba79 100644 (file)
--- a/tests/scripts/login-guest-session-config.conf
+++ b/tests/scripts/login-guest-session-config.conf
@@ -35,7 +35,7 @@ guest-session=alternative
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index 96f50375b86039077ab71b109422ffa0b7f0650f..fc3b7716f389289c8458463c9e1f5a9267b9dfb4 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -34,7 +34,7 @@ user-session=default
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index e28bb5a61355a02df843d508d08b5b1977bb0f64..3c2e8d0a1dc5282f4dfa6875eb6ddf25b39a3488 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -33,7 +33,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
index ee944f2fa4cff1b70128a94f0f313dd6eeb8eca8..38a590e8bd05a4e114019dd01f55cbf3266025c0 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -30,7 +30,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=have-session
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-manual-remember-session.conf b/tests/scripts/login-manual-remember-session.conf
index 88f348a6f432bf758fcff670c84742c244a15a51..8ca9d737b67bb00e761969fb46678e2e7f0d786d 100644 (file)
--- a/tests/scripts/login-manual-remember-session.conf
+++ b/tests/scripts/login-manual-remember-session.conf
@@ -30,7 +30,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -66,7 +66,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index 2f067fe3f3a2bdb3b3157e7222fa3a9c36ebae0c..da9b03ff088e71420039ab86d304441cad5dd2d6 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -35,7 +35,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index aa706202065418298a21338b355eb44b4518d862..d8e5d83f9b131e4ae23e557bc31a4a6719b4c12f 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -33,7 +33,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/new-authtok DESKTOP_SESSION=default USER=new-authtok
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/new-authtok XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=new-authtok
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
index ea0dc0e2e1c7346e62dbffab06138d519e750e16..0ecdf2e528257d82d3267af17955dd6e8f6fd1de 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -31,7 +31,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index 49710effb0c1cbaa47eacde42efe08660c7d6965..e0f7aca53f388cd6af587edbcbc501aafe1524b2 100644 (file)
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -35,7 +35,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=log-pam
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf
index 89bb7a66657820e51c2516d22affbaeb492212c4..dadc00242a268c6a011e3777c00fc279b573615d 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -28,7 +28,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf
index c1836ca6e474df6ae65caa75fa800e973ebb00da..a2e88e94db3b846679e1c4313351657ebfac6c7f 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -28,7 +28,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=have-session
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf
index 9a9a100cca48440f7ac8fd1f2f4ddbd6193cf487..641b2c6aca2a930f18d523c2ffa5718eb73e910d 100644 (file)
--- a/tests/scripts/login-remember-session.conf
+++ b/tests/scripts/login-remember-session.conf
@@ -28,7 +28,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -62,7 +62,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf
index df6f63e907308f187ced6fb0873c98182f59f8a8..d1e248b15ea716a6afb3de09d787073006147a02 100644 (file)
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -37,7 +37,7 @@
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=test-remote USER=guest-.*
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_DESKTOP=test-remote USER=guest-.*
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
index 01d37b706ca584e3b2acd06b03d67702a184b410..edfcc9add882ef5c2cbccc74820ea35030086b68 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -33,7 +33,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index c19927d16c56bca46db2ff43abdf4a435bea1ea5..f57a4c0f07c8b69da5ffe4ef3797074c25b006fd 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -33,7 +33,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index 29d76b913f53e108b2742c64f265749ddcdb7e4d..5e65fb24d740c9d1be816a3886f023c422f77066 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -33,7 +33,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
index 110a01f4e738e56711093bef4bbd68e53ade37b5..449c4fbe0a333cbd19c43352b86da34595015928 100644 (file)
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -14,7 +14,7 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Cleanup

diff --git a/tests/scripts/mir-session-compositor-crash.conf b/tests/scripts/mir-session-compositor-crash.conf
index 40004482cc81fecc52e7a1a1944ac3985df14f18..7f18841997a062b688a990d17134d8ea5046fd96 100644 (file)
--- a/tests/scripts/mir-session-compositor-crash.conf
+++ b/tests/scripts/mir-session-compositor-crash.conf
@@ -14,7 +14,7 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Crash system compositor

diff --git a/tests/scripts/mir-session-crash.conf b/tests/scripts/mir-session-crash.conf
index 867604d447f1ea532b793065efc4a23752860664..a5c974e7c04c99fd82de0e9d1106214302ca6156 100644 (file)
--- a/tests/scripts/mir-session-crash.conf
+++ b/tests/scripts/mir-session-crash.conf
@@ -14,7 +14,7 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Crash session

diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf
index 2391f5a2826a0fbb55568dd45634908d584c97b5..3b7ae8115d9d8153294248d988e9b10eef5df925 100644 (file)
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -41,7 +41,7 @@ user-session=mir
 #?XSERVER-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 
 # Cleanup

diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf
index 4735230e7a581b8bdcaafb00302fe2b44700b342..4a0324f2bdb614d72195075440d1457557ac225c 100644 (file)
--- a/tests/scripts/no-accounts-service.conf
+++ b/tests/scripts/no-accounts-service.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf
index 541d143e86eeab382a8f726e70d26c53da42454c..4449fd5f79164177b22873b4a93635dd625de1f4 100644 (file)
--- a/tests/scripts/no-console-kit-or-login1.conf
+++ b/tests/scripts/no-console-kit-or-login1.conf
@@ -22,7 +22,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
 

diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf
index 63ca37280e5dd6b40a9a5d5f26258e08b4013476..ae08ddcd65eded4710304331fc3768434a89c55b 100644 (file)
--- a/tests/scripts/no-console-kit.conf
+++ b/tests/scripts/no-console-kit.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf
index 533e40f6ba89043d56a6860abf7310e5a83daea4..4a283038391b640ce6389f0c5cd6c98cbc710b51 100644 (file)
--- a/tests/scripts/no-login1.conf
+++ b/tests/scripts/no-login1.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf
index e4a4c5a8aeb0c9328c40c4784fe14e0af517756b..4e8dfd78b76e9a5ed42566a78f7375c5f8d674bd 100644 (file)
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -34,7 +34,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf
index 21cfeebd939d7fe57c6236e4da3b8ea0dd1a8e28..727ef4b187ba3d37cfc9f30af0562471db6e1ab7 100644 (file)
--- a/tests/scripts/pam.conf
+++ b/tests/scripts/pam.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=log-pam
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index 9b1b2af6bcf5af3d0908b889af7a8e2af705d290..89e72f4de98f2c5803526431335ef11fa5437901 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -27,7 +27,7 @@ user-session=default
 #?SCRIPT-HOOK SESSION-SETUP USER=have-password1
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf
index 6100bbd8048eb9ffda14269601ba9d4b77055505..f40e977bc11081bd23648ce0b40cf0357a9a57a2 100644 (file)
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -45,7 +45,7 @@ user-session=default
 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
 #?*GREETER-X-0 START-SESSION
 #?GREETER-X-0 TERMINATE SIGNAL=15
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -76,7 +76,7 @@ user-session=default
 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
 #?*GREETER-X-0 START-SESSION
 #?GREETER-X-0 TERMINATE SIGNAL=15
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c4
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf
index 2eb9af30583245fd91e95af490a181d3ffd54ab0..d0a33ecb23c140e43e64af6f8c37b481dea1c5bc 100644 (file)
--- a/tests/scripts/session-stderr-multi-write.conf
+++ b/tests/scripts/session-stderr-multi-write.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf
index 006c81136c3ade52c1846ba532f2945a777456fb..3f0b098fa167e15c70c457c3ac5b306cdbfcd0ae 100644 (file)
--- a/tests/scripts/session-stderr.conf
+++ b/tests/scripts/session-stderr.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf
index 6367b550acb5ae391f1d7f76d71852e7376ca100..86175f56356bb543f4a3ca754ed8fa98c8e089f3 100644 (file)
--- a/tests/scripts/session-stdout.conf
+++ b/tests/scripts/session-stdout.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/shared-data-greeter-to-session.conf b/tests/scripts/shared-data-greeter-to-session.conf
index 4b60d80dda6cb22f74a86ca1144c8cef72a4dec0..e4fa987c60510bdc9ab60da086b1b4613c96de09 100644 (file)
--- a/tests/scripts/shared-data-greeter-to-session.conf
+++ b/tests/scripts/shared-data-greeter-to-session.conf
@@ -35,7 +35,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/shared-data-session-to-greeter-autologin.conf b/tests/scripts/shared-data-session-to-greeter-autologin.conf
index ca999022e603c2c5463f50fa8919cdbf26733e0d..281418d7ffd8c6ea5a5f7ec0bdf5464d29974364 100644 (file)
--- a/tests/scripts/shared-data-session-to-greeter-autologin.conf
+++ b/tests/scripts/shared-data-session-to-greeter-autologin.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/shared-data-session-to-greeter.conf b/tests/scripts/shared-data-session-to-greeter.conf
index 0c76e2fb055e9e1d2ca4c772865c0c9778f16c50..9cadd93b06b305d1efe8ec1e3934c907982d6632 100644 (file)
--- a/tests/scripts/shared-data-session-to-greeter.conf
+++ b/tests/scripts/shared-data-session-to-greeter.conf
@@ -31,7 +31,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/surfaceflinger-autologin.conf b/tests/scripts/surfaceflinger-autologin.conf
index 9ddb76f61e6eca1394787ea704fe63fc8eaaded2..fad7e3bcaa053bc619355e7706654f2e8b7ad0c5 100644 (file)
--- a/tests/scripts/surfaceflinger-autologin.conf
+++ b/tests/scripts/surfaceflinger-autologin.conf
@@ -11,7 +11,7 @@ user-session=surfaceflinger
 #?RUNNER DAEMON-START
 
 # Session starts (test session doesn't know it's in surfaceflinger)
-#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=surfaceflinger USER=have-password1
+#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_DESKTOP=surfaceflinger USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # Cleanup

diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf
index d43ef18d262db798687afe436e9a1a53ca226e63..9920e4a13e216ca600a84602db90cc03308e8967 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -58,7 +58,7 @@ user-session=default
 #?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER

diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf
index f41941d4a6316699288aab83fa78a6550e866111..be9fd58e1d69f1eb039461300776d04a5ceb84c1 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf
index 9d8ae2ce524a81b71ed2a20e9776ef42995624da..e3d9ea0daaf7ccace13e7cecff3be744fe38945a 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
index 2791aca81f4384fda656f9d17230162069fb324d..dd52b0352f8e2226435ea55d4175c5ef494372e2 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index 58856c827fe62295d52583e146b592475e94e21b..61a2525237959de887933bd17f0f839387aba322 100644 (file)
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Default session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -43,7 +43,7 @@ user-session=default
 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
 
 # Guest session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/scripts/switch-to-user-active.conf b/tests/scripts/switch-to-user-active.conf
index c65233d7f1bd214ee144aa81302331676c041a07..68d0dcdd6443387c684f80fe2263fa41b0609902 100644 (file)
--- a/tests/scripts/switch-to-user-active.conf
+++ b/tests/scripts/switch-to-user-active.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/switch-to-user-existing-no-password.conf b/tests/scripts/switch-to-user-existing-no-password.conf
index 8222d1f2619729540479405a4f424e396c2b2a70..69d9b7ae586defa8d58a0624effa7ae9e0cdc82f 100644 (file)
--- a/tests/scripts/switch-to-user-existing-no-password.conf
+++ b/tests/scripts/switch-to-user-existing-no-password.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -40,7 +40,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # New session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf
index d7a69fcd8b7d8d12f4da150dfe451ff32eed8c21..022807de4675e177934b38cf93d059f7134043cc 100644 (file)
--- a/tests/scripts/switch-to-user-existing.conf
+++ b/tests/scripts/switch-to-user-existing.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -40,7 +40,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # New session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf
index e27af5b5e77403e73e44a2e56a5bac803b472466..4e913e04db10ac781e503de4ef66258f7819b995 100644 (file)
--- a/tests/scripts/switch-to-user-logout-active.conf
+++ b/tests/scripts/switch-to-user-logout-active.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -40,7 +40,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/scripts/switch-to-user-logout-inactive.conf b/tests/scripts/switch-to-user-logout-inactive.conf
index 7f53bab482b69075a08cf35b721e8b8dda1e54a0..bf4597efc247a3b3a2be3c59260591de08978ed7 100644 (file)
--- a/tests/scripts/switch-to-user-logout-inactive.conf
+++ b/tests/scripts/switch-to-user-logout-inactive.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -40,7 +40,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf
index 608b983238fdde82c33db341eb6abadc3186d83b..67f2ec6cd2acd9202793ec0441bcc4813f91aee8 100644 (file)
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -40,7 +40,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # New session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
index 4647076b17d7d67897a636de493c225c50f16b57..7773c3526f0d1af76f105cfe082c1e1331f82329 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf
index 2c50c39676ffdb2d46e081873e291cd4b1d28afc..2e25724a329d4e793dbb3f9532714581404a7834 100644 (file)
--- a/tests/scripts/switch-to-users.conf
+++ b/tests/scripts/switch-to-users.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -40,7 +40,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # New session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 
@@ -64,7 +64,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # New session starts
-#?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
+#?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
 #?XSERVER-2 ACCEPT-CONNECT
 #?SESSION-X-2 CONNECT-XSERVER
 

diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf
index fd16d65bf498b009987eac2542be2019588fa0da..f0212cf1c34a53819d46c79b0bd855df6b621c2f 100644 (file)
--- a/tests/scripts/system-xauthority.conf
+++ b/tests/scripts/system-xauthority.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index b1998993f46ce16f989ecb9d446ae303ac761aa9..918681a9397fe6d02ff0e538953f9ab072de8ea2 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.conf
@@ -23,7 +23,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/unity-compositor-mir-next-session.conf b/tests/scripts/unity-compositor-mir-next-session.conf
index 720f99b3cd236bf52988472bdcdd3f35de880c52..2ff68bd284062a2361ae15bc41fbae318dd61ad0 100644 (file)
--- a/tests/scripts/unity-compositor-mir-next-session.conf
+++ b/tests/scripts/unity-compositor-mir-next-session.conf
@@ -22,7 +22,7 @@ autologin-in-background=true
 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
 
 # Background session
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=mir USER=have-password2
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # System compositor switches to greeter

diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
index 0e82f59435a6f955ac21a26a3cbf8f2065810347..3bf2cd51a8a3e60e76f147f0699c42d8bb308e3d 100644 (file)
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -32,7 +32,7 @@ autologin-in-background=true
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index fb0cc943c4937e6f65a8171787d6ec9ad466bb25..c960cbd1f8320d1eba857df22b9eb9a0faa9ef7b 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -41,7 +41,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/unity-mir-autologin.conf b/tests/scripts/unity-mir-autologin.conf
index d09aec3985910a40e0912de74026a492e865c294..43e714116c5941098830300be799e1c9a4e70b97 100644 (file)
--- a/tests/scripts/unity-mir-autologin.conf
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -15,7 +15,7 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # System compositor switches to session

diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
index 0c8e29ebce4485484fba672d2d9df45d570e766a..a8532228941df8a0ad713bd2d6ff3bb2053e1767 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -28,7 +28,7 @@ user-session=mir
 #?*GREETER-MIR-greeter-0 START-SESSION
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 
 # System compositor switches to session

diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
index 0927a186ab158118452f0c56f943c471e62cbc72..0a1851416fa9a2d72c77b1dff20b7e02003e0811 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -36,7 +36,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/unity-mir-lock-seat.conf b/tests/scripts/unity-mir-lock-seat.conf
index 1593249a0adefa19bac0586fe9c790fe3def1d7a..a803916923a9f58e92a7d2be2a0ff198771ded4a 100644 (file)
--- a/tests/scripts/unity-mir-lock-seat.conf
+++ b/tests/scripts/unity-mir-lock-seat.conf
@@ -15,7 +15,7 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 
 # System compositor switches to session

diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
index c7c0d074830b2c3dcf11ce9063175881de3a5d16..b7f59c42cc024c0f8367124e17950da13f7026b2 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -38,7 +38,7 @@ user-session=mir
 #?*GREETER-X-0 START-SESSION
 
 # Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=no-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 
 # System compositor switches to session

diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf
index fa236a0d82addb3ad3baf45334470220084bd2b4..9d05aae73c95f568253770044d72c0c5bcdd0aab 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -33,7 +33,7 @@ active=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index 72c729428ddca72b6ced46ff991ed4af58d5349a..73b607979caf6f251e68368e101622392c6acb64 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -23,7 +23,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -66,7 +66,7 @@ user-session=default
 #?GREETER-X-1 TERMINATE SIGNAL=15
 
 # New session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c2
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER

diff --git a/tests/scripts/unity-xdg-seat.conf b/tests/scripts/unity-xdg-seat.conf
index 48260d05d7206c7fddf160c39b5090471e303a65..aeb19e604bf26e29baa6d2912c4d363039005689 100644 (file)
--- a/tests/scripts/unity-xdg-seat.conf
+++ b/tests/scripts/unity-xdg-seat.conf
@@ -24,7 +24,7 @@ xdg-seat=seat1
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/upstart-autologin.conf b/tests/scripts/upstart-autologin.conf
index 2dd11558235eb6cef2b735333b4259efec964649..6ca6b407bd8cd6d2e779395352f4efae6bf0f2d4 100644 (file)
--- a/tests/scripts/upstart-autologin.conf
+++ b/tests/scripts/upstart-autologin.conf
@@ -24,7 +24,7 @@ report-events=true
 #?INIT -q emit desktop-session-start DISPLAY_MANAGER=lightdm
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf
index 70d9587e559549ab62d6e84177bf6bb55ffaf874..d6214e95ec1266b442e54bce9b9faecbd39c4cda 100644 (file)
--- a/tests/scripts/upstart-login.conf
+++ b/tests/scripts/upstart-login.conf
@@ -40,7 +40,7 @@ report-events=true
 #?INIT -q emit desktop-session-start DISPLAY_MANAGER=lightdm
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/user-logged-in.conf b/tests/scripts/user-logged-in.conf
index 8f22cdebfa2fcfc8983abc70ec0f93e8f35c0ea4..6182545cb46ce725e7cb9290d9fbdcd1c0a4491b 100644 (file)
--- a/tests/scripts/user-logged-in.conf
+++ b/tests/scripts/user-logged-in.conf
@@ -38,7 +38,7 @@ log-user-changes=true
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=prop-user
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf
index 22eafb4df93a24c95ffabb50c2b8eee92871ef4c..38e329e9ad2301c35418e9c1a57869bfb5a86e7c 100644 (file)
--- a/tests/scripts/user-renamed.conf
+++ b/tests/scripts/user-renamed.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/change-user2 DESKTOP_SESSION=default USER=change-user2
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/change-user2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=change-user2
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/user-session.conf b/tests/scripts/user-session.conf
index 72224276c57c52ffc3392e4a6c9c6405d5700f57..8d04922422910eeba5338d9953820dc7b711f7fd 100644 (file)
--- a/tests/scripts/user-session.conf
+++ b/tests/scripts/user-session.conf
@@ -38,7 +38,7 @@ log-user-changes=true
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts, check it uses the default session
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=prop-user
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
@@ -85,7 +85,7 @@ log-user-changes=true
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts, check it uses the updated session
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=alternative NAME=alternative USER=prop-user
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=prop-user
 #?LOGIN1 ACTIVATE-SESSION SESSION=c3
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/utmp-autologin.conf b/tests/scripts/utmp-autologin.conf
index 71404e761e30f66d851d81ebb277f0a1c4fc99ec..e3ae2591aae5727f5171ac0aa5af256b5db46407 100644 (file)
--- a/tests/scripts/utmp-autologin.conf
+++ b/tests/scripts/utmp-autologin.conf
@@ -25,7 +25,7 @@ user-session=default
 #?WTMP FILE=.*/wtmp TYPE=USER_PROCESS LINE=:0 ID=:0 USER=have-password1 HOST=:0
 
 # Autologin session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/utmp-login.conf b/tests/scripts/utmp-login.conf
index 430fd208ca02578542e94a7b0f575dc68baa3f15..24c03314d63d2b018b3a83b654b010ef08946d5e 100644 (file)
--- a/tests/scripts/utmp-login.conf
+++ b/tests/scripts/utmp-login.conf
@@ -40,7 +40,7 @@ user-session=default
 #?WTMP FILE=.*/wtmp TYPE=USER_PROCESS LINE=:0 ID=:0 USER=have-password1 HOST=:0
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index def7cfe0770e29d0dd5f87b87aadd9f4984cb57e..8f03eb8d6a45559633c8baefbb8238526702679c 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -53,7 +53,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf
index ce54a3935896028e5aad723127547bfdf64cfbce..aeba6f890ae222884f8bfe5657224a1e06aa5188 100644 (file)
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -52,7 +52,7 @@ user-session=default
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf
index 4aeeac22936ff49328c08086b490102ddfb64ef3..3439aa6004911bc652d80ed5174ac19969e28674 100644 (file)
--- a/tests/scripts/xauthority.conf
+++ b/tests/scripts/xauthority.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/xdg-current-desktop.conf b/tests/scripts/xdg-current-desktop.conf
index 9e2a23b9db35832e54253aa3a0644ab60289eee5..a3845043e880c3b1e74ba68683d855c2e6733fbe 100644 (file)
--- a/tests/scripts/xdg-current-desktop.conf
+++ b/tests/scripts/xdg-current-desktop.conf
@@ -18,7 +18,7 @@ user-session=named
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=named USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=named USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/xdg-seat.conf b/tests/scripts/xdg-seat.conf
index c8188546f08d2a59a661dc7baa06b186306998b8..cde481179c74c7aca93cd767301cde96ad788dc1 100644 (file)
--- a/tests/scripts/xdg-seat.conf
+++ b/tests/scripts/xdg-seat.conf
@@ -19,7 +19,7 @@ xdg-seat=seat1
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER

diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf
index 590639ed04e56a30b5963ec882d5ee536d4a41a6..92844a163959150f189298c04ba59c1dcf9d354d 100644 (file)
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -50,7 +50,7 @@ user-session=default
 #?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-98 ACCEPT-CONNECT
 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER

diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf
index aa55db0e814c1f971b4802cffa8c1d1d67b3a500..fee895f09631ae2a3ce97a62a9d7eb49427fda53 100644 (file)
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -50,7 +50,7 @@ user-session=default
 #?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
 #?XSERVER-98 ACCEPT-CONNECT
 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER

diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf
index 41a9f8aea47f8817f9161d6f14d5a4a33f4aa255..922a56f934188d7cfeb5e381e7a40410a078fd1c 100644 (file)
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -41,7 +41,7 @@ xserver-share=false
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
 #?XSERVER-1 ACCEPT-CONNECT
 #?SESSION-X-1 CONNECT-XSERVER
 

diff --git a/tests/src/test-session.c b/tests/src/test-session.c
index 1e39a724b1e78bb54fcf66a79833416190419e46..ef24745c50a8868bfc10ede9335585187b25a2ff 100644 (file)
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -229,7 +229,7 @@ request_cb (const gchar *name, GHashTable *params)
 int
 main (int argc, char **argv)
 {
-    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_greeter_data_dir, *xdg_session_cookie, *xdg_session_class, *desktop_session, *mir_socket, *mir_vt, *mir_id;
+    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_greeter_data_dir, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *xdg_session_desktop, *mir_socket, *mir_vt, *mir_id;
     GString *status_text;
     int fd, open_max;
 
@@ -240,7 +240,8 @@ main (int argc, char **argv)
     xdg_greeter_data_dir = getenv ("XDG_GREETER_DATA_DIR");
     xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
     xdg_session_class = getenv ("XDG_SESSION_CLASS");
-    desktop_session = getenv ("DESKTOP_SESSION");
+    xdg_session_type = getenv ("XDG_SESSION_TYPE");
+    xdg_session_desktop = getenv ("XDG_SESSION_DESKTOP");
     mir_socket = getenv ("MIR_SOCKET");
     mir_vt = getenv ("MIR_SERVER_VT");
     mir_id = getenv ("MIR_SERVER_NAME");
@@ -293,8 +294,10 @@ main (int argc, char **argv)
         g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
     if (xdg_session_class)
         g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
-    if (desktop_session)
-        g_string_append_printf (status_text, " DESKTOP_SESSION=%s", desktop_session);
+    if (xdg_session_type)
+        g_string_append_printf (status_text, " XDG_SESSION_TYPE=%s", xdg_session_type);
+    if (xdg_session_desktop)
+        g_string_append_printf (status_text, " XDG_SESSION_DESKTOP=%s", xdg_session_desktop);
     if (mir_vt > 0)
         g_string_append_printf (status_text, " MIR_SERVER_VT=%s", mir_vt);
     if (argc > 1)