diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2014-02-05 14:27:20 +0000 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2014-02-05 14:27:20 +0000 |
| commit | 1a3e1251078d46f75bec333c89f65c6d90db476c (patch) | |
| tree | 198f2dfae20ce801f151f039420f0c06d611117e | |
| parent | 311141a7d278af69a83770314207b37cfb9c6688 (diff) | |
| download | lightdm-1a3e1251078d46f75bec333c89f65c6d90db476c.tar.gz | |
Make xdg-seat a core property of a seat and always pass it to X servers
155 files changed, 237 insertions, 265 deletions
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch index cd7e32a2..786e8430 100644 --- a/debian/patches/04_language_handling.patch +++ b/debian/patches/04_language_handling.patch @@ -2,10 +2,10 @@ Description: Adjustments due to handling of languages Forwarded: not-needed Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> -Index: trunk/liblightdm-gobject/language.c +Index: xdg-seat/liblightdm-gobject/language.c =================================================================== ---- trunk.orig/liblightdm-gobject/language.c 2013-12-09 17:13:51.362244753 +1300 -+++ trunk/liblightdm-gobject/language.c 2013-12-09 17:13:51.298244756 +1300 +--- xdg-seat.orig/liblightdm-gobject/language.c 2014-02-05 14:22:08.711739102 +0000 ++++ xdg-seat/liblightdm-gobject/language.c 2014-02-05 14:22:08.707739102 +0000 @@ -40,7 +40,7 @@ static void update_languages (void) @@ -15,10 +15,10 @@ Index: trunk/liblightdm-gobject/language.c gchar *stdout_text = NULL, *stderr_text = NULL; gint exit_status; gboolean result; -Index: trunk/tests/scripts/language-env.conf +Index: xdg-seat/tests/scripts/language-env.conf =================================================================== ---- trunk.orig/tests/scripts/language-env.conf 2013-12-09 17:13:51.362244753 +1300 -+++ trunk/tests/scripts/language-env.conf 2013-12-09 17:13:51.338244754 +1300 +--- xdg-seat.orig/tests/scripts/language-env.conf 2014-02-05 14:22:08.711739102 +0000 ++++ xdg-seat/tests/scripts/language-env.conf 2014-02-05 14:22:08.707739102 +0000 @@ -22,8 +22,8 @@ #?SESSION-X-0 CONNECT-XSERVER @@ -30,11 +30,11 @@ Index: trunk/tests/scripts/language-env.conf #?*SESSION-X-0 READ-ENV NAME=GDM_LANG #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU -Index: trunk/src/seat.c +Index: xdg-seat/src/seat.c =================================================================== ---- trunk.orig/src/seat.c 2013-12-09 17:13:51.362244753 +1300 -+++ trunk/src/seat.c 2013-12-09 17:13:51.358244753 +1300 -@@ -842,7 +842,7 @@ +--- xdg-seat.orig/src/seat.c 2014-02-05 14:22:08.711739102 +0000 ++++ xdg-seat/src/seat.c 2014-02-05 14:22:08.707739102 +0000 +@@ -854,7 +854,7 @@ session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); if (language && language[0] != '\0') { diff --git a/src/seat-surfaceflinger.c b/src/seat-surfaceflinger.c index 226c5113..f1338f5a 100644 --- a/src/seat-surfaceflinger.c +++ b/src/seat-surfaceflinger.c @@ -42,16 +42,12 @@ static Greeter * seat_surfaceflinger_create_greeter_session (Seat *seat) { Greeter *greeter_session; - const gchar *xdg_seat; greeter_session = SEAT_CLASS (seat_surfaceflinger_parent_class)->create_greeter_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat); + session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat)); /* Fake the VT */ - session_set_env (SESSION (greeter_session), "XDG_VTNR", vt_can_multi_seat() ? "1" : "0"); + session_set_env (SESSION (greeter_session), "XDG_VTNR", vt_can_multi_seat () ? "1" : "0"); return greeter_session; } @@ -60,16 +56,12 @@ static Session * seat_surfaceflinger_create_session (Seat *seat) { Session *session; - const gchar *xdg_seat; session = SEAT_CLASS (seat_surfaceflinger_parent_class)->create_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - session_set_env (session, "XDG_SEAT", xdg_seat); + session_set_env (session, "XDG_SEAT", seat_get_name (seat)); /* Fake the VT */ - session_set_env (session, "XDG_VTNR", vt_can_multi_seat() ? "1" : "0"); + session_set_env (session, "XDG_VTNR", vt_can_multi_seat () ? "1" : "0"); return session; } diff --git a/src/seat-unity.c b/src/seat-unity.c index 8933e701..f1ecdbeb 100644 --- a/src/seat-unity.c +++ b/src/seat-unity.c @@ -122,7 +122,7 @@ static DisplayServer * create_x_server (Seat *seat) { XServerLocal *x_server; - const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL, *xdg_seat = NULL; + const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL; gboolean allow_tcp; gint port = 0; gchar *id; @@ -145,9 +145,7 @@ create_x_server (Seat *seat) if (layout) x_server_local_set_layout (x_server, layout); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (xdg_seat) - x_server_local_set_xdg_seat (x_server, xdg_seat); + x_server_local_set_xdg_seat (x_server, seat_get_name (seat)); config_file = seat_get_string_property (seat, "xserver-config"); if (config_file) @@ -232,16 +230,11 @@ static Greeter * seat_unity_create_greeter_session (Seat *seat) { Greeter *greeter_session; - const gchar *xdg_seat; gchar *id; gint vt; greeter_session = SEAT_CLASS (seat_unity_parent_class)->create_greeter_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat); - session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat); + session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat)); id = g_strdup_printf ("greeter-%d", SEAT_UNITY (seat)->priv->next_greeter_id); SEAT_UNITY (seat)->priv->next_greeter_id++; @@ -266,16 +259,11 @@ static Session * seat_unity_create_session (Seat *seat) { Session *session; - const gchar *xdg_seat; gchar *id; gint vt; session = SEAT_CLASS (seat_unity_parent_class)->create_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat); - session_set_env (session, "XDG_SEAT", xdg_seat); + session_set_env (session, "XDG_SEAT", seat_get_name (seat)); id = g_strdup_printf ("session-%d", SEAT_UNITY (seat)->priv->next_session_id); SEAT_UNITY (seat)->priv->next_session_id++; diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c index db2400a5..d46b6232 100644 --- a/src/seat-xlocal.c +++ b/src/seat-xlocal.c @@ -88,7 +88,7 @@ static DisplayServer * create_x_server (Seat *seat) { XServerLocal *x_server; - const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL, *xdg_seat = NULL; + const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL; gboolean allow_tcp; gint vt, port = 0; @@ -114,10 +114,8 @@ create_x_server (Seat *seat) layout = seat_get_string_property (seat, "xserver-layout"); if (layout) x_server_local_set_layout (x_server, layout); - - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (xdg_seat) - x_server_local_set_xdg_seat (x_server, xdg_seat); + + x_server_local_set_xdg_seat (x_server, seat_get_name (seat)); config_file = seat_get_string_property (seat, "xserver-config"); if (config_file) @@ -226,14 +224,9 @@ static Greeter * seat_xlocal_create_greeter_session (Seat *seat) { Greeter *greeter_session; - const gchar *xdg_seat; greeter_session = SEAT_CLASS (seat_xlocal_parent_class)->create_greeter_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat); - session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat); + session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat)); return greeter_session; } @@ -242,14 +235,9 @@ static Session * seat_xlocal_create_session (Seat *seat) { Session *session; - const gchar *xdg_seat; session = SEAT_CLASS (seat_xlocal_parent_class)->create_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat); - session_set_env (SESSION (session), "XDG_SEAT", xdg_seat); + session_set_env (SESSION (session), "XDG_SEAT", seat_get_name (seat)); return session; } diff --git a/src/seat-xremote.c b/src/seat-xremote.c index 32e8726a..63afa1a0 100644 --- a/src/seat-xremote.c +++ b/src/seat-xremote.c @@ -53,14 +53,9 @@ static Greeter * seat_xremote_create_greeter_session (Seat *seat) { Greeter *greeter_session; - const gchar *xdg_seat; greeter_session = SEAT_CLASS (seat_xremote_parent_class)->create_greeter_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat); - session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat); + session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat)); return greeter_session; } @@ -69,14 +64,9 @@ static Session * seat_xremote_create_session (Seat *seat) { Session *session; - const gchar *xdg_seat; session = SEAT_CLASS (seat_xremote_parent_class)->create_session (seat); - xdg_seat = seat_get_string_property (seat, "xdg-seat"); - if (!xdg_seat) - xdg_seat = "seat0"; - l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat); - session_set_env (SESSION (session), "XDG_SEAT", xdg_seat); + session_set_env (SESSION (session), "XDG_SEAT", seat_get_name (seat)); return session; } @@ -157,6 +157,18 @@ seat_get_integer_property (Seat *seat, const gchar *name) return value ? atoi (value) : 0; } +const gchar * +seat_get_name (Seat *seat) +{ + const gchar *name; + + name = seat_get_string_property (seat, "xdg-seat"); + if (name) + return name; + + return "seat0"; +} + void seat_set_can_switch (Seat *seat, gboolean can_switch) { @@ -73,6 +73,8 @@ gboolean seat_get_boolean_property (Seat *seat, const gchar *name); gint seat_get_integer_property (Seat *seat, const gchar *name); +const gchar *seat_get_name (Seat *seat); + void seat_set_can_switch (Seat *seat, gboolean can_switch); void seat_set_share_display_server (Seat *seat, gboolean share_display_server); diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf index cb5751cc..ef8b7e5c 100644 --- a/tests/scripts/additional-config-priority.conf +++ b/tests/scripts/additional-config-priority.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf index bb54dcae..b92520b1 100644 --- a/tests/scripts/additional-config.conf +++ b/tests/scripts/additional-config.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/additional-system-config-priority.conf b/tests/scripts/additional-system-config-priority.conf index 9a4da16b..f8280301 100644 --- a/tests/scripts/additional-system-config-priority.conf +++ b/tests/scripts/additional-system-config-priority.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/additional-system-config.conf b/tests/scripts/additional-system-config.conf index 510bfd9b..942f21d8 100644 --- a/tests/scripts/additional-system-config.conf +++ b/tests/scripts/additional-system-config.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf index 535d65ee..91d5ca6d 100644 --- a/tests/scripts/autologin-guest-fail-setup-script.conf +++ b/tests/scripts/autologin-guest-fail-setup-script.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf index 2cf304a6..ff7740e6 100644 --- a/tests/scripts/autologin-guest-in-background.conf +++ b/tests/scripts/autologin-guest-in-background.conf @@ -10,7 +10,7 @@ user-session=default #?RUNNER DAEMON-START # Greeter starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -21,7 +21,7 @@ user-session=default #?GREETER-X-0 CONNECTED-TO-DAEMON # Guest session starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 #?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index 97db0a99..84efbf84 100644 --- a/tests/scripts/autologin-guest-logout.conf +++ b/tests/scripts/autologin-guest-logout.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -34,7 +34,7 @@ user-session=default #?GUEST-ACCOUNT REMOVE USERNAME=guest-.* # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf index debb176e..4f757de7 100644 --- a/tests/scripts/autologin-guest-timeout.conf +++ b/tests/scripts/autologin-guest-timeout.conf @@ -10,7 +10,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index 77e3bce5..61dd5ff8 100644 --- a/tests/scripts/autologin-guest.conf +++ b/tests/scripts/autologin-guest.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf index ca5b17fa..8829ad98 100644 --- a/tests/scripts/autologin-in-background.conf +++ b/tests/scripts/autologin-in-background.conf @@ -10,7 +10,7 @@ user-session=default #?RUNNER DAEMON-START # Greeter starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -21,7 +21,7 @@ user-session=default #?GREETER-X-0 CONNECTED-TO-DAEMON # Autologin session starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 #?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/scripts/autologin-invalid-greeter.conf b/tests/scripts/autologin-invalid-greeter.conf index 31616422..943dda18 100644 --- a/tests/scripts/autologin-invalid-greeter.conf +++ b/tests/scripts/autologin-invalid-greeter.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf index fc48503c..6092ec79 100644 --- a/tests/scripts/autologin-invalid-session.conf +++ b/tests/scripts/autologin-invalid-session.conf @@ -9,7 +9,7 @@ user-session=invalid #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf index fc40621c..52d539f5 100644 --- a/tests/scripts/autologin-invalid-user.conf +++ b/tests/scripts/autologin-invalid-user.conf @@ -10,7 +10,7 @@ autologin-user=invalid # (fails to start session for invalid user) # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index cfa562ce..21c25f7a 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -28,7 +28,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf index 71627a96..5a5bd797 100644 --- a/tests/scripts/autologin-new-authtok.conf +++ b/tests/scripts/autologin-new-authtok.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf index d00e50d2..5bb2456a 100644 --- a/tests/scripts/autologin-password.conf +++ b/tests/scripts/autologin-password.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf index 7d3f6e99..c4e56709 100644 --- a/tests/scripts/autologin-previous-session.conf +++ b/tests/scripts/autologin-previous-session.conf @@ -8,7 +8,7 @@ autologin-user=have-session #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index 9a3eea24..77b507d7 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -28,7 +28,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf index 18dc9906..728cf24f 100644 --- a/tests/scripts/autologin-session-error.conf +++ b/tests/scripts/autologin-session-error.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -22,7 +22,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf index 5c0dfbf0..6c2eeafe 100644 --- a/tests/scripts/autologin-timeout-in-background.conf +++ b/tests/scripts/autologin-timeout-in-background.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # Greeter starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -22,7 +22,7 @@ user-session=default #?GREETER-X-0 CONNECTED-TO-DAEMON # Autologin session starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 #?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index 774cba42..dbacc5af 100644 --- a/tests/scripts/autologin-timeout.conf +++ b/tests/scripts/autologin-timeout.conf @@ -10,7 +10,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index 5c4d6ef4..be10c03c 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # XServer starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -28,7 +28,7 @@ user-session=default #?SESSION-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index 258d80e9..820fc079 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf index fd93df07..906a92d9 100644 --- a/tests/scripts/cancel-authentication.conf +++ b/tests/scripts/cancel-authentication.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf index 401a1422..362e0637 100644 --- a/tests/scripts/change-authentication.conf +++ b/tests/scripts/change-authentication.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf index 985386cf..51cd1c08 100644 --- a/tests/scripts/console-kit.conf +++ b/tests/scripts/console-kit.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/corrupt-xauthority.conf b/tests/scripts/corrupt-xauthority.conf index 318b872a..4c68f3ad 100644 --- a/tests/scripts/corrupt-xauthority.conf +++ b/tests/scripts/corrupt-xauthority.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf index 922e91d0..ee677cc7 100644 --- a/tests/scripts/crash-authenticate.conf +++ b/tests/scripts/crash-authenticate.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf index 788c3550..ec64b585 100644 --- a/tests/scripts/cred-error.conf +++ b/tests/scripts/cred-error.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -22,7 +22,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf index 2e4279dd..d0f9879f 100644 --- a/tests/scripts/cred-expired.conf +++ b/tests/scripts/cred-expired.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -22,7 +22,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf index 4ff210ad..d38196c3 100644 --- a/tests/scripts/cred-unavail.conf +++ b/tests/scripts/cred-unavail.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -22,7 +22,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf index 82bb5845..9ecbd7a8 100644 --- a/tests/scripts/dbus.conf +++ b/tests/scripts/dbus.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf index cba728c3..865d8deb 100644 --- a/tests/scripts/denied.conf +++ b/tests/scripts/denied.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf index 8a4991f2..be22db03 100644 --- a/tests/scripts/expired.conf +++ b/tests/scripts/expired.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf index 664c89cd..54076699 100644 --- a/tests/scripts/greeter-allow-guest.conf +++ b/tests/scripts/greeter-allow-guest.conf @@ -8,7 +8,7 @@ greeter-allow-guest=false #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-default-session.conf b/tests/scripts/greeter-default-session.conf index 5c99941e..0f27097d 100644 --- a/tests/scripts/greeter-default-session.conf +++ b/tests/scripts/greeter-default-session.conf @@ -8,7 +8,7 @@ user-session=alternative #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf index 5910691f..b60e290c 100644 --- a/tests/scripts/greeter-fail-start.conf +++ b/tests/scripts/greeter-fail-start.conf @@ -8,7 +8,7 @@ return-value=1 #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-hide-users.conf b/tests/scripts/greeter-hide-users.conf index 3db2f081..4d067c99 100644 --- a/tests/scripts/greeter-hide-users.conf +++ b/tests/scripts/greeter-hide-users.conf @@ -8,7 +8,7 @@ greeter-hide-users=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-show-manual-login.conf b/tests/scripts/greeter-show-manual-login.conf index 2d40787d..86ec103f 100644 --- a/tests/scripts/greeter-show-manual-login.conf +++ b/tests/scripts/greeter-show-manual-login.conf @@ -8,7 +8,7 @@ greeter-show-manual-login=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-show-remote-login.conf b/tests/scripts/greeter-show-remote-login.conf index 459c235c..6693a617 100644 --- a/tests/scripts/greeter-show-remote-login.conf +++ b/tests/scripts/greeter-show-remote-login.conf @@ -8,7 +8,7 @@ greeter-show-remote-login=false #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf index 9d6c1869..cf532f2e 100644 --- a/tests/scripts/greeter-wrapper.conf +++ b/tests/scripts/greeter-wrapper.conf @@ -8,7 +8,7 @@ greeter-wrapper=test-greeter-wrapper #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf index 89d04c1a..256d4ba9 100644 --- a/tests/scripts/greeter-xserver-crash.conf +++ b/tests/scripts/greeter-xserver-crash.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf index 5dcbb519..980a12ec 100644 --- a/tests/scripts/group-membership.conf +++ b/tests/scripts/group-membership.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/guest-wrapper.conf b/tests/scripts/guest-wrapper.conf index 193f6b44..0cab424c 100644 --- a/tests/scripts/guest-wrapper.conf +++ b/tests/scripts/guest-wrapper.conf @@ -10,7 +10,7 @@ guest-wrapper=test-guest-wrapper #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index bee18b78..6b47cd25 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf index d93440fd..0d0b81ac 100644 --- a/tests/scripts/home-dir-on-session.conf +++ b/tests/scripts/home-dir-on-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/language-env.conf b/tests/scripts/language-env.conf index e0cf7d1b..ef2d9c3b 100644 --- a/tests/scripts/language-env.conf +++ b/tests/scripts/language-env.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf index 3cb86c2e..ab5efeb1 100644 --- a/tests/scripts/language-no-accounts-service.conf +++ b/tests/scripts/language-no-accounts-service.conf @@ -8,7 +8,7 @@ disable-accounts-service=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf index 8c8aa8ca..46013818 100644 --- a/tests/scripts/language.conf +++ b/tests/scripts/language.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf index 8d9ffc2b..17f7ef37 100644 --- a/tests/scripts/lock-seat-console-kit.conf +++ b/tests/scripts/lock-seat-console-kit.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -29,7 +29,7 @@ user-session=default #?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf index a9c5224d..60647968 100644 --- a/tests/scripts/lock-seat-return-session-console-kit.conf +++ b/tests/scripts/lock-seat-return-session-console-kit.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -29,7 +29,7 @@ user-session=default #?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf index e48d930b..edab90b1 100644 --- a/tests/scripts/lock-seat-return-session.conf +++ b/tests/scripts/lock-seat-return-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index 6adb733a..303554c5 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index 77fe3660..7318a5aa 100644 --- a/tests/scripts/lock-session-no-password.conf +++ b/tests/scripts/lock-session-no-password.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index b902db50..30ede7fd 100644 --- a/tests/scripts/lock-session-return-session.conf +++ b/tests/scripts/lock-session-return-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index 1af93f26..2a136ff5 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf index bb9b73d2..f8c98e7a 100644 --- a/tests/scripts/login-crash-authenticate.conf +++ b/tests/scripts/login-crash-authenticate.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf index 3b3b1d56..bcf44341 100644 --- a/tests/scripts/login-guest-disabled.conf +++ b/tests/scripts/login-guest-disabled.conf @@ -8,7 +8,7 @@ allow-guest=false #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf index 1285822f..4d01c7e7 100644 --- a/tests/scripts/login-guest-fail-setup-script.conf +++ b/tests/scripts/login-guest-fail-setup-script.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf index 7ac3c99a..7d0c50c8 100644 --- a/tests/scripts/login-guest-logout.conf +++ b/tests/scripts/login-guest-logout.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -46,7 +46,7 @@ user-session=default #?GUEST-ACCOUNT REMOVE USERNAME=guest-.* # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf index cbb1f2a5..cf0fe00c 100644 --- a/tests/scripts/login-guest-no-setup-script.conf +++ b/tests/scripts/login-guest-no-setup-script.conf @@ -8,7 +8,7 @@ guest-account-script= #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index d7a0929d..d73ee892 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf index f0172c0f..4b260d33 100644 --- a/tests/scripts/login-info-prompt.conf +++ b/tests/scripts/login-info-prompt.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf index aced2fe2..748c584e 100644 --- a/tests/scripts/login-invalid-session.conf +++ b/tests/scripts/login-invalid-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf index 8589ebdf..0bd9f934 100644 --- a/tests/scripts/login-invalid-user.conf +++ b/tests/scripts/login-invalid-user.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index 0c969c6f..85caac60 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -42,7 +42,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf index 61c54a8f..52582c47 100644 --- a/tests/scripts/login-long-password.conf +++ b/tests/scripts/login-long-password.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf index 4f7a1733..c220ce42 100644 --- a/tests/scripts/login-long-username.conf +++ b/tests/scripts/login-long-username.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf index 639ddd15..67035bad 100644 --- a/tests/scripts/login-manual-previous-session.conf +++ b/tests/scripts/login-manual-previous-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-manual-remember-session.conf b/tests/scripts/login-manual-remember-session.conf index 813e0a1d..c3af838b 100644 --- a/tests/scripts/login-manual-remember-session.conf +++ b/tests/scripts/login-manual-remember-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -39,7 +39,7 @@ #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index 087c4a19..69e7ad3e 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf index b0d3afc3..82bc9c13 100644 --- a/tests/scripts/login-multi-info-prompt.conf +++ b/tests/scripts/login-multi-info-prompt.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf index f3828601..146fd824 100644 --- a/tests/scripts/login-multi-prompt.conf +++ b/tests/scripts/login-multi-prompt.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf index 36843128..7b0ed973 100644 --- a/tests/scripts/login-new-authtok.conf +++ b/tests/scripts/login-new-authtok.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index 19dd3038..485a3e19 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index 9fdf9fff..fac0f2e2 100644 --- a/tests/scripts/login-pam.conf +++ b/tests/scripts/login-pam.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf index 782d79bc..61d7a146 100644 --- a/tests/scripts/login-pick-session.conf +++ b/tests/scripts/login-pick-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf index ff4786bd..fb5d5002 100644 --- a/tests/scripts/login-previous-session.conf +++ b/tests/scripts/login-previous-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf index 5afa9c6d..c65541b0 100644 --- a/tests/scripts/login-remember-session.conf +++ b/tests/scripts/login-remember-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -37,7 +37,7 @@ #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf index 515ca18b..114fa638 100644 --- a/tests/scripts/login-remote-session.conf +++ b/tests/scripts/login-remote-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index 22b41e99..855a6dee 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -42,7 +42,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf index 9400fbca..ee89cbcb 100644 --- a/tests/scripts/login-two-factor.conf +++ b/tests/scripts/login-two-factor.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf index 3fc8e40b..28652944 100644 --- a/tests/scripts/login-wrong-password.conf +++ b/tests/scripts/login-wrong-password.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index d9bddfae..f4bd53c7 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # XServer starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -42,7 +42,7 @@ user-session=default #?SESSION-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index 6bc99004..5e4687a0 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf index 52743bdb..05ec2f20 100644 --- a/tests/scripts/mir-session.conf +++ b/tests/scripts/mir-session.conf @@ -8,7 +8,7 @@ user-session=mir #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index e3b2e454..30a0c6ba 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf index d8d4f167..c310901e 100644 --- a/tests/scripts/no-config.conf +++ b/tests/scripts/no-config.conf @@ -8,7 +8,7 @@ have-config=false #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf index 53173441..b2196d04 100644 --- a/tests/scripts/no-console-kit-or-login1.conf +++ b/tests/scripts/no-console-kit-or-login1.conf @@ -13,7 +13,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index 895b1bd0..4160e1e8 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index de07f940..216ed7c2 100644 --- a/tests/scripts/no-login1.conf +++ b/tests/scripts/no-login1.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf index afc0c00f..b4ff7a89 100644 --- a/tests/scripts/open-file-descriptors.conf +++ b/tests/scripts/open-file-descriptors.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf index cbddad40..a993711d 100644 --- a/tests/scripts/pam.conf +++ b/tests/scripts/pam.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf index e23925d5..9177783f 100644 --- a/tests/scripts/plymouth-active-vt.conf +++ b/tests/scripts/plymouth-active-vt.conf @@ -15,7 +15,7 @@ active=true #?PLYMOUTH DEACTIVATE # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf index 3a09a70f..8df23182 100644 --- a/tests/scripts/plymouth-inactive-vt.conf +++ b/tests/scripts/plymouth-inactive-vt.conf @@ -12,7 +12,7 @@ active=true #?PLYMOUTH PING ACTIVE=TRUE #?PLYMOUTH HAS-ACTIVE-VT=FALSE #?PLYMOUTH QUIT RETAIN-SPLASH=FALSE -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf index bd685c2b..f12a883e 100644 --- a/tests/scripts/power-no-console-kit.conf +++ b/tests/scripts/power-no-console-kit.conf @@ -8,7 +8,7 @@ disable-console-kit=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf index 19e87727..1af76798 100644 --- a/tests/scripts/power-no-login1.conf +++ b/tests/scripts/power-no-login1.conf @@ -8,7 +8,7 @@ disable-login1=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf index e1cf0ebc..0dc8162d 100644 --- a/tests/scripts/power-no-services.conf +++ b/tests/scripts/power-no-services.conf @@ -10,7 +10,7 @@ disable-login1=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf index 9477847f..3160210a 100644 --- a/tests/scripts/power.conf +++ b/tests/scripts/power.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf index a0732ae9..4c6e6edd 100644 --- a/tests/scripts/restart-authentication.conf +++ b/tests/scripts/restart-authentication.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-fail-display-setup.conf index 80c782d3..2999b8f7 100644 --- a/tests/scripts/script-hook-fail-display-setup.conf +++ b/tests/scripts/script-hook-fail-display-setup.conf @@ -8,7 +8,7 @@ display-setup-script=test-script-hook DISPLAY-SETUP 1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-fail-greeter-setup.conf index d72747db..60e26cff 100644 --- a/tests/scripts/script-hook-fail-greeter-setup.conf +++ b/tests/scripts/script-hook-fail-greeter-setup.conf @@ -8,7 +8,7 @@ greeter-setup-script=test-script-hook GREETER-SETUP 1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf index 95275b42..4534b44f 100644 --- a/tests/scripts/script-hook-fail-session-setup.conf +++ b/tests/scripts/script-hook-fail-session-setup.conf @@ -10,7 +10,7 @@ user-session=default #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index 690b98eb..8313fc13 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -14,7 +14,7 @@ user-session=default #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -43,7 +43,7 @@ user-session=default #?SCRIPT-HOOK DISPLAY-STOPPED # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf index 53f5081e..d3f0436e 100644 --- a/tests/scripts/session-stderr-backup.conf +++ b/tests/scripts/session-stderr-backup.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -29,7 +29,7 @@ user-session=default # Restart session #?*SESSION-X-0 LOGOUT #?XSERVER-0 TERMINATE SIGNAL=15 -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -58,7 +58,7 @@ user-session=default # Restart session #?*SESSION-X-0 LOGOUT #?XSERVER-0 TERMINATE SIGNAL=15 -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf index 7b2ac36d..f4931745 100644 --- a/tests/scripts/session-stderr-multi-write.conf +++ b/tests/scripts/session-stderr-multi-write.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index e2c311ef..bbda72eb 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index a03ef958..209c11ec 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index a59bd4e0..565f75f7 100644 --- a/tests/scripts/switch-to-greeter-new-session.conf +++ b/tests/scripts/switch-to-greeter-new-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf index f6b23faa..abdb2cc5 100644 --- a/tests/scripts/switch-to-greeter-return-session-logout.conf +++ b/tests/scripts/switch-to-greeter-return-session-logout.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY @@ -68,7 +68,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf index 366848c7..ac0ccf46 100644 --- a/tests/scripts/switch-to-greeter-return-session.conf +++ b/tests/scripts/switch-to-greeter-return-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index 09ecc947..9b8ab0d4 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index 20856c48..37aad349 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-GUEST # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-user-active.conf b/tests/scripts/switch-to-user-active.conf index 7c677762..4b985eb2 100644 --- a/tests/scripts/switch-to-user-active.conf +++ b/tests/scripts/switch-to-user-active.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/switch-to-user-existing-no-password.conf b/tests/scripts/switch-to-user-existing-no-password.conf index 46bcca4e..60364d58 100644 --- a/tests/scripts/switch-to-user-existing-no-password.conf +++ b/tests/scripts/switch-to-user-existing-no-password.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password2 # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf index ea36a4af..20e2fb55 100644 --- a/tests/scripts/switch-to-user-existing.conf +++ b/tests/scripts/switch-to-user-existing.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY @@ -50,7 +50,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=have-password1 # X server starts -#?XSERVER-2 START VT=9 +#?XSERVER-2 START VT=9 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-2 INDICATE-READY diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf index f070eea6..8792fbcf 100644 --- a/tests/scripts/switch-to-user-logout-active.conf +++ b/tests/scripts/switch-to-user-logout-active.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password2 # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY @@ -50,7 +50,7 @@ user-session=default #?XSERVER-1 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-user-logout-inactive.conf b/tests/scripts/switch-to-user-logout-inactive.conf index 1b9fad01..7b6ded02 100644 --- a/tests/scripts/switch-to-user-logout-inactive.conf +++ b/tests/scripts/switch-to-user-logout-inactive.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password2 # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index 96a9dc19..a075581b 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index e58596e6..128c1968 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=have-password1 # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index a4d47d74..448d9dec 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -27,7 +27,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY @@ -50,7 +50,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password2 # New X server starts -#?XSERVER-2 START VT=9 +#?XSERVER-2 START VT=9 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-2 INDICATE-READY diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index 40e5a3cc..43fe3996 100644 --- a/tests/scripts/system-xauthority.conf +++ b/tests/scripts/system-xauthority.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf index ed5cce56..cdb3fb0b 100644 --- a/tests/scripts/unity-autologin.conf +++ b/tests/scripts/unity-autologin.conf @@ -14,7 +14,7 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf index 30b70a3e..b1f10139 100644 --- a/tests/scripts/unity-compositor-command.conf +++ b/tests/scripts/unity-compositor-command.conf @@ -14,7 +14,7 @@ unity-compositor-command=unity-system-compositor --test #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-compositor-fallback.conf b/tests/scripts/unity-compositor-fallback.conf index 581a0a9e..ed56caf4 100644 --- a/tests/scripts/unity-compositor-fallback.conf +++ b/tests/scripts/unity-compositor-fallback.conf @@ -19,7 +19,7 @@ type=unity;INVALID;unity;xlocal; #?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1 # X server starts in VT mode -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf index 65e06f01..eb9faf7a 100644 --- a/tests/scripts/unity-compositor-next-session.conf +++ b/tests/scripts/unity-compositor-next-session.conf @@ -15,7 +15,7 @@ autologin-in-background=true #?*UNITY-SYSTEM-COMPOSITOR READY # Greeter session -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -26,7 +26,7 @@ autologin-in-background=true #?GREETER-X-0 CONNECTED-TO-DAEMON # Background session -#?XSERVER-1 START MIR-ID=x-1 +#?XSERVER-1 START SEAT=seat0 MIR-ID=x-1 #?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf index f187a2e0..f7ddbaae 100644 --- a/tests/scripts/unity-login.conf +++ b/tests/scripts/unity-login.conf @@ -13,7 +13,7 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf index 7885f1e6..756d8363 100644 --- a/tests/scripts/unity-mir-greeter-x-session.conf +++ b/tests/scripts/unity-mir-greeter-x-session.conf @@ -26,7 +26,7 @@ user-session=default #?*GREETER-MIR-greeter-0 START-SESSION # X server starts -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf index a5e6d983..04b9a0e0 100644 --- a/tests/scripts/unity-mir-session-x-greeter.conf +++ b/tests/scripts/unity-mir-session-x-greeter.conf @@ -13,7 +13,7 @@ user-session=mir #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf index 5a251814..a1d5c76c 100644 --- a/tests/scripts/unity-plymouth.conf +++ b/tests/scripts/unity-plymouth.conf @@ -24,7 +24,7 @@ active=true #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf index 5ddb2b36..62a04283 100644 --- a/tests/scripts/unity-switch.conf +++ b/tests/scripts/unity-switch.conf @@ -14,7 +14,7 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START MIR-ID=x-0 +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -34,7 +34,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START MIR-ID=x-1 +#?XSERVER-1 START SEAT=seat0 MIR-ID=x-1 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY @@ -72,7 +72,7 @@ user-session=default #?XSERVER-1 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-2 START MIR-ID=x-2 +#?XSERVER-2 START SEAT=seat0 MIR-ID=x-2 #?*XSERVER-2 INDICATE-READY #?XSERVER-2 INDICATE-READY #?XSERVER-2 ACCEPT-CONNECT diff --git a/tests/scripts/upstart-autologin.conf b/tests/scripts/upstart-autologin.conf index b396aed8..bb588a5e 100644 --- a/tests/scripts/upstart-autologin.conf +++ b/tests/scripts/upstart-autologin.conf @@ -12,7 +12,7 @@ report-events=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf index 7267ab66..8d9c789c 100644 --- a/tests/scripts/upstart-login.conf +++ b/tests/scripts/upstart-login.conf @@ -11,7 +11,7 @@ report-events=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-background.conf b/tests/scripts/user-background.conf index 6d323eb6..6290aee6 100644 --- a/tests/scripts/user-background.conf +++ b/tests/scripts/user-background.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-has-messages.conf b/tests/scripts/user-has-messages.conf index bded33c9..98013852 100644 --- a/tests/scripts/user-has-messages.conf +++ b/tests/scripts/user-has-messages.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-image.conf b/tests/scripts/user-image.conf index 630b9ecd..d54b5ad9 100644 --- a/tests/scripts/user-image.conf +++ b/tests/scripts/user-image.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-layout.conf b/tests/scripts/user-layout.conf index f8867a46..bef4219a 100644 --- a/tests/scripts/user-layout.conf +++ b/tests/scripts/user-layout.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-logged-in.conf b/tests/scripts/user-logged-in.conf index f9511452..1bc47a9a 100644 --- a/tests/scripts/user-logged-in.conf +++ b/tests/scripts/user-logged-in.conf @@ -11,7 +11,7 @@ log-user-changes=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -45,7 +45,7 @@ log-user-changes=true #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY diff --git a/tests/scripts/user-name.conf b/tests/scripts/user-name.conf index f91c1ee5..bb791597 100644 --- a/tests/scripts/user-name.conf +++ b/tests/scripts/user-name.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf index d1fbcefa..8d464f3c 100644 --- a/tests/scripts/user-renamed-invalid.conf +++ b/tests/scripts/user-renamed-invalid.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf index d9908ee2..9e5460ee 100644 --- a/tests/scripts/user-renamed.conf +++ b/tests/scripts/user-renamed.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/user-session.conf b/tests/scripts/user-session.conf index 963f5cb8..6265cd21 100644 --- a/tests/scripts/user-session.conf +++ b/tests/scripts/user-session.conf @@ -11,7 +11,7 @@ log-user-changes=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -45,7 +45,7 @@ log-user-changes=true #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf index fa6d46f0..c356e3e8 100644 --- a/tests/scripts/users.conf +++ b/tests/scripts/users.conf @@ -11,7 +11,7 @@ log-user-changes=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index da13954a..eb7d20d6 100644 --- a/tests/scripts/xauthority.conf +++ b/tests/scripts/xauthority.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/xdg-current-desktop.conf b/tests/scripts/xdg-current-desktop.conf index 17162ed9..8ddd45c8 100644 --- a/tests/scripts/xdg-current-desktop.conf +++ b/tests/scripts/xdg-current-desktop.conf @@ -9,7 +9,7 @@ user-session=named #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY diff --git a/tests/scripts/xdmcp-client.conf b/tests/scripts/xdmcp-client.conf index 7e3295de..f324ced2 100644 --- a/tests/scripts/xdmcp-client.conf +++ b/tests/scripts/xdmcp-client.conf @@ -9,7 +9,7 @@ xdmcp-port=9999 #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/xserver-fail-start.conf b/tests/scripts/xserver-fail-start.conf index 129fdaad..8fdd18b3 100644 --- a/tests/scripts/xserver-fail-start.conf +++ b/tests/scripts/xserver-fail-start.conf @@ -8,7 +8,7 @@ return-value=1 #?RUNNER DAEMON-START # X server fails to start -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 #?XSERVER-0 EXIT CODE=1 # Daemon stops with error diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf index 6be99036..1d8ad57e 100644 --- a/tests/scripts/xserver-no-share.conf +++ b/tests/scripts/xserver-no-share.conf @@ -9,7 +9,7 @@ xserver-share=false #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START VT=7 +#?XSERVER-0 START VT=7 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-0 INDICATE-READY @@ -31,7 +31,7 @@ xserver-share=false #?*GREETER-X-0 START-SESSION # New X server starts for session -#?XSERVER-1 START VT=8 +#?XSERVER-1 START VT=8 SEAT=seat0 # Daemon connects when X server is ready #?*XSERVER-1 INDICATE-READY |