Improve multiseat support.

Approved by PS Jenkins bot, Robert Ancell.

diff --git a/configure.ac b/configure.ac
index 4c0d0895fa3f370e942639afef94941d4c94bd12..0ee9b54ef3d339b0eeee412f6030d2b6d8e77039 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,10 @@ if test "x$GCC" == xyes; then
                  -Werror=format-security \
                  -Werror=format=2 \
                  -Werror=missing-include-dirs"
+    WARN_CXXFLAGS="-Wall"
 fi
 AC_SUBST(WARN_CFLAGS)
+AC_SUBST(WARN_CXXFLAGS)
 
 GOBJECT_INTROSPECTION_CHECK(0.9.5)
 

diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index cd7e32a2933172430e99d852aaa8571c7a8762dc..786e843002fefd1c2025e282280bca6396b19225 100644 (file)
--- 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/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 11c5b133af8742b4a5c0440cddc0b477e6928329..9031883eb5551fe2edb2783715e300ba012b1f39 100644 (file)
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: lightdm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2007-05-31 08:04+0200\n"
-"PO-Revision-Date: 2011-07-24 19:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-02-07 04:54+0000\n"
+"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-29 05:32+0000\n"
+"X-Launchpad-Export-Date: 2014-02-08 06:58+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
 #. Type: select
 #. Description
 #: ../lightdm.templates:2001
 msgid "Default display manager:"
-msgstr ""
+msgstr "預設顯示管理員："
 
 #. Type: select
 #. Description

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index a333d9b8ee5afdf8db24875a4cdb8253f1e7c0d1..64bee23b1103b4800b826bbb83bc423c6d3ce57c 100644 (file)
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -9,6 +9,7 @@ liblightdm_qt5_3_la_LIBADD = \
        $(common_libadd)
 
 common_cflags = \
+       $(WARN_CXXFLAGS) \
        -I$(top_srcdir)/liblightdm-gobject \
        $(GLIB_CFLAGS) \
        -DQT_NO_KEYWORDS \

diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp
index 8fb287ff8c6b9af80536a895a538c98b22db5c8d..875cac06c738cfa02c34622b0e4442d5e364ebe0 100644 (file)
--- a/liblightdm-qt/greeter.cpp
+++ b/liblightdm-qt/greeter.cpp
@@ -59,9 +59,8 @@ void GreeterPrivate::cb_showPrompt(LightDMGreeter *greeter, const gchar *text, L
     GreeterPrivate *that = static_cast<GreeterPrivate*>(data);
     QString message = QString::fromUtf8(text);
     
-    //FIXME prompt type
-
-    Q_EMIT that->q_func()->showPrompt(message, Greeter::PromptTypeSecret);
+    Q_EMIT that->q_func()->showPrompt(message, type == LIGHTDM_PROMPT_TYPE_QUESTION ?
+                                               Greeter::PromptTypeQuestion : Greeter::PromptTypeSecret);
 }
 
 void GreeterPrivate::cb_showMessage(LightDMGreeter *greeter, const gchar *text, LightDMMessageType type, gpointer data)
@@ -71,9 +70,8 @@ void GreeterPrivate::cb_showMessage(LightDMGreeter *greeter, const gchar *text,
     GreeterPrivate *that = static_cast<GreeterPrivate*>(data);
     QString message = QString::fromUtf8(text);
 
-    //FIXME prompt type
-
-    Q_EMIT that->q_func()->showMessage(message, Greeter::MessageTypeInfo);
+    Q_EMIT that->q_func()->showMessage(message, type == LIGHTDM_MESSAGE_TYPE_INFO ?
+                                                Greeter::MessageTypeInfo : Greeter::MessageTypeError);
 }
 
 void GreeterPrivate::cb_authenticationComplete(LightDMGreeter *greeter, gpointer data)

diff --git a/src/Makefile.am b/src/Makefile.am
index fa3a20f42bbe3f193aa0402d714c5af3bb9a26e0..117eb137e869d9df899cad603494fb95872937fe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,8 +78,8 @@ lightdm_SOURCES = \
        xdmcp-session-private.h
 
 lightdm_CFLAGS = \
-       $(LIGHTDM_CFLAGS) \
        $(WARN_CFLAGS) \
+       $(LIGHTDM_CFLAGS) \
        -DSBIN_DIR=\"$(sbindir)\" \
        -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
        -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \
@@ -99,6 +99,7 @@ dm_tool_SOURCES = \
        dm-tool.c
 
 dm_tool_CFLAGS = \
+       $(WARN_CFLAGS) \
        $(LIGHTDM_CFLAGS) \
        -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
        -DLOCALE_DIR=\"$(datadir)/locale\"
@@ -111,8 +112,8 @@ libexec_PROGRAMS = lightdm-guest-session
 lightdm_guest_session_SOURCES = lightdm-guest-session.c
 
 lightdm_guest_session_CFLAGS = \
-       $(LIGHTDM_CFLAGS) \
-       $(WARN_CFLAGS)
+       $(WARN_CFLAGS) \
+       $(LIGHTDM_CFLAGS)
 
 EXTRA_DIST = \
        display-manager.xml

diff --git a/src/dm-tool.c b/src/dm-tool.c
index be9c93e94410c20a5bf75fa9d25b9ab7fa6d4079..ae16e7b4c36b2dde52080bbfa1e3df6e4386be66 100644 (file)
--- a/src/dm-tool.c
+++ b/src/dm-tool.c
@@ -23,7 +23,7 @@ static gint xephyr_display_number;
 static GPid xephyr_pid;
 
 static void
-usage ()
+usage (void)
 {
     g_printerr (/* Text printed out when an unknown command-line argument provided */
                 _("Run 'dm-tool --help' to see a full list of available command line options."));
@@ -69,7 +69,7 @@ xephyr_signal_cb (int signum)
     exit (EXIT_SUCCESS);
 }
 
-GDBusProxy *
+static GDBusProxy *
 get_seat_proxy (void)
 {
     GError *error = NULL;
@@ -285,7 +285,7 @@ main (int argc, char **argv)
     }
     else if (strcmp (command, "list-seats") == 0)
     {
-        GVariant *seats, *sessions;
+        GVariant *seats;
         GVariantIter *seat_iter;
         gchar *seat_path;
 

diff --git a/src/seat-surfaceflinger.c b/src/seat-surfaceflinger.c
index 226c51136a84c689427f489ff1b946db2923b562..f1338f5a5bf089b5037a5c7dd38bd3af641811b0 100644 (file)
--- 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 8933e701edfded2900ce807d57799da8b33c3f4e..fb2aafef7e130528b974e46e166870a8670bbe23 100644 (file)
--- 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++;
@@ -252,12 +245,9 @@ seat_unity_create_greeter_session (Seat *seat)
     if (vt >= 0)
     {
         gchar *value = g_strdup_printf ("%d", vt);
-        l_debug (seat, "Setting XDG_VTNR=%s", value);
         session_set_env (SESSION (greeter_session), "XDG_VTNR", value);
         g_free (value);
     }
-    else
-        l_debug (seat, "Not setting XDG_VTNR");
 
     return greeter_session;
 }
@@ -266,16 +256,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++;
@@ -286,12 +271,9 @@ seat_unity_create_session (Seat *seat)
     if (vt >= 0)
     {
         gchar *value = g_strdup_printf ("%d", vt);
-        l_debug (seat, "Setting XDG_VTNR=%s", value);
         session_set_env (SESSION (session), "XDG_VTNR", value);
         g_free (value);
     }
-    else
-        l_debug (seat, "Not setting XDG_VTNR");
 
     return session;
 }

diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index b36f1d6f951fe8cab19d3db70c987ea5b6ff87a4..ee0edf4ddaad54dc13c1f0e1774f7c406a1e3362 100644 (file)
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -91,7 +91,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;
 
@@ -117,10 +117,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)
@@ -229,14 +227,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;
 }
@@ -245,14 +238,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 32e8726aab3ef625bb1e97f79b24c26e6ace73b7..63afa1a028a25570a5ebefc96887a5a14c3c0c62 100644 (file)
--- 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;
 }

diff --git a/src/seat.c b/src/seat.c
index e2b9c2c55c6fa6d750c141b2c165957f45fe4dfb..7347d1ce87b00b268374cb5e0cd04e6879a0717b 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -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)
 {

diff --git a/src/seat.h b/src/seat.h
index f6502ea7d5dfc09ce52365d25c72a7d419f3c973..0a470bc44e875537d1174c91607961b534063ae8 100644 (file)
--- a/src/seat.h
+++ b/src/seat.h
@@ -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/src/session-child.c b/src/session-child.c
index 01eb1c37adc97fec1e482a9ff16d8bf3d4789ca3..84f9b3b046e8c5206d3d77ce61e51bf0c615e03c 100644 (file)
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -334,7 +334,7 @@ session_child_run (int argc, char **argv)
         if (authentication_result == PAM_SUCCESS)
             authentication_result = pam_acct_mgmt (pam_handle, 0);
         if (authentication_result == PAM_NEW_AUTHTOK_REQD)
-            authentication_result = pam_chauthtok (pam_handle, 0);
+            authentication_result = pam_chauthtok (pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
     }
     else
         authentication_result = PAM_SUCCESS;

diff --git a/src/x-server.c b/src/x-server.c
index ab75e186c4ebb305554aa1447e32ab5b56790c70..eab026cfea0580c03c4b96dd1a885485e90669d3 100644 (file)
--- a/src/x-server.c
+++ b/src/x-server.c
@@ -161,7 +161,6 @@ x_server_connect_session (DisplayServer *display_server, Session *session)
         g_free (t);
 
         t = g_strdup_printf ("%d", vt);
-        l_debug (session, "Setting XDG_VTNR=%s", t);
         session_set_env (session, "XDG_VTNR", t);
         g_free (t);
     }

diff --git a/tests/scripts/additional-config-priority.conf b/tests/scripts/additional-config-priority.conf
index cb5751cc337daa7588cb63292f5a2f014f6cf26d..ef8b7e5c89a983c6a68ee66a8049f20432c22078 100644 (file)
--- 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 bb54dcae08bf44af57bdaff300a0bbb75dcc11c8..b92520b1bf96a7c422f217d7b4adc093312ec3e7 100644 (file)
--- 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 9a4da16bdb39fab4c7f4fb860aae561c7466323e..f8280301f3ec587bd5ef46d156851cc763fe4b80 100644 (file)
--- 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 510bfd9b0dcfdf3b9127e766113c97df11bbb833..942f21d884dd2959e1b3825ec01529e570b0333b 100644 (file)
--- 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 535d65ee41789287d23743c722bdc7c38ab13756..91d5ca6de9d7881e604ea5c785dad0eebd65c451 100644 (file)
--- 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 2cf304a67f7df50983f8ca2004740f1c57b0ff62..ff7740e6d75c4aa5a4d3c5167a5fa1c1ac943017 100644 (file)
--- 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 97db0a99206a2da693e2a4d069a8842ce2613edf..84efbf84c8d9f7b56d355fcc090c8d02953aa1a9 100644 (file)
--- 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 debb176eab3490bd5a88a09b2820d14af0ac8c78..4f757de7ddd9281263e6250563fe8182877119ae 100644 (file)
--- 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 77e3bce51d91e5da8ee8c3ed27a7ab3a8afc1510..61dd5ff8b62aae18466912225ca5dd93e4f97dc0 100644 (file)
--- 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 ca5b17fa1920b3f2ca9c85d0c5af65b870ef8c21..8829ad9831786010e9c954f66b99f9f401bf54e8 100644 (file)
--- 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 31616422571e671207d567b170dcb26e6b6febe4..943dda187058ab8b5c5bcccd140c5b09135c3986 100644 (file)
--- 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 fc48503ce6a30c5fc3423fef3712964126312547..6092ec79913854dc8aa7475ef9d6f7c246a3b1f6 100644 (file)
--- 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 fc40621c25ff54fab9953fb7d9859aa778e0397e..52d539f583c9d3ec4d8ffee255d6f9cd80f1ba1a 100644 (file)
--- 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 cfa562ce81eb606aebc62c03202c3254447d602b..21c25f7adbf69a99ea4e2af92b501629f7620dbf 100644 (file)
--- 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 71627a96bb43538d8bfc3e9f7c7896bb086857d6..5a5bd7979fc1f3089330c65fbe816ce1eaa9ad67 100644 (file)
--- 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 d00e50d2457767b5d40e2b69a27b8bfb9dd017ae..5bb2456ad6bda0674df32cde96d145dc12dec758 100644 (file)
--- 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 7d3f6e99c5579881bcd86f9a03f7d1a948d55ab1..c4e5670903e5c9bd4a6f586809b9bab504171e83 100644 (file)
--- 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 9a3eea24cf18e557b47529075e321c479a9d237b..77b507d73763c26331f55acc3312e25911ef28f9 100644 (file)
--- 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 18dc9906d347aa980840588860144b874f78d34b..728cf24f4578ebc8bbf40f20a8e149cb9bc6a179 100644 (file)
--- 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 5c0dfbf0a03224d6aac83648441eb5d1e473621d..6c2eeafe8937e2d98895e0de44c5266bb61a7705 100644 (file)
--- 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 774cba426911bd449c0ce2d9faaa0f7237d0fb64..dbacc5af0cdb43f9bf69a850bd1d048df2b82185 100644 (file)
--- 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 5c4d6ef410b66a543a9a28a7dbe02d1de5be7f22..be10c03c6e3d5626bbda7bdbeb51e97d83848d09 100644 (file)
--- 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 258d80e99880ab33de6b6f385eea2a3bfde3466f..820fc0797603e2a8140d41c93e53f1307ae215bd 100644 (file)
--- 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 fd93df070a22285386aafa5ea4dbc6d5a3494e5c..906a92d933aa6753e547215da4efc586b1654940 100644 (file)
--- 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 401a14227cf5bcaab91568ae8e4071e55d3a44dd..362e06377d0ede70049ba444bab431bb21a8520e 100644 (file)
--- 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 985386cf695adcf13062c5686c7206a079dca150..51cd1c08646e06853c48f10cf862bb7bb2b62eed 100644 (file)
--- 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 318b872a6f3494a4a37bf5514936da2821bcbdc0..4c68f3adb9654d42830989513b30b696cf70a226 100644 (file)
--- 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 922e91d02042a64788faa383517a7a71af66c952..ee677cc779edac84353318722e151d316a5e3ad1 100644 (file)
--- 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 788c3550bdffb49fd7caec085f154bfe791ff828..ec64b58542980ff6a3e51e475333abf0100fde0b 100644 (file)
--- 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 2e4279dd7778029e303a3577c139e9eb4e79850d..d0f9879f4795edf767d0926e5f88b990ec2c6eef 100644 (file)
--- 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 4ff210ad1b0f17d1cf88cbd15e160c505071e0da..d38196c381cc8f47ad919d6987b296bf03beb6fd 100644 (file)
--- 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 82bb5845c4a98200e3a2274bf8690bdce0fa3725..9ecbd7a899fd59301d84dd130ca3ad54207d2107 100644 (file)
--- 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 cba728c35e95282f6fe7db8d7ddf1f481deadae5..865d8deb4e0b9a05f44f94f37ad6fa1059ea4279 100644 (file)
--- 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 8a4991f22a9c654f12ba7df7ce7fb7b0ecb5d0f7..be22db03ece7d0d4f898861eb5b778c1b9351689 100644 (file)
--- 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 664c89cd7aea4e5802a82dd779f242c0e3f54479..54076699cfd1e59b6d8466580e80083e65fef282 100644 (file)
--- 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 5c99941e9c956980bccda15608ae0f0ffa75aba8..0f27097d29969179487aa3ae41deb5e5c7b0e3e4 100644 (file)
--- 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 5910691f3040c480a75b6f9e900cd98e35e597f1..b60e290c37a4543d28530caa7f78f6cc8d841e8c 100644 (file)
--- 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 3db2f081ef5c4ab463b494151f09b1242cb6bbac..4d067c99ddc0e8a53c854acfea1d2d3e30b6499d 100644 (file)
--- 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 2d40787d906cceca8e745f2d4e2aa9c268aecc4d..86ec103ffd51b61b8de4ecb7ac3fe23bc4eae212 100644 (file)
--- 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 459c235c7ed5993919d5b3edde3fbf2afee6d518..6693a617dcb4640d4c5a0777007e1bd3ac9d301d 100644 (file)
--- 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 9d6c186950fcddcc739a9e70d718e09221ff6f7d..cf532f2e5794d4498c5eb3ff112898dd754fbf5e 100644 (file)
--- 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 89d04c1ab321fbf722a78ae73ba555908051475f..256d4ba9360d8ec2fa857628482e12c573d52686 100644 (file)
--- 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 5dcbb519fa3ab20008a7b1783821e0b03f5c64a8..980a12ec47ecf96fbd041df8434fd2057130e089 100644 (file)
--- 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 193f6b44229ac55d9c997e0109593e3c8e2780ad..0cab424c4352c0af3f9adc8e0595c1c06e785c4d 100644 (file)
--- 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 bee18b78fd39f741e581b899a3bb35dc373d38cc..6b47cd25d5b7c4982cb0d6b409947c9d4c6d5c7b 100644 (file)
--- 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 d93440fd85a025c1c942cb10ecff3dca8adc8d4e..0d0b81aca62e0d393abe309451fc56b978321cae 100644 (file)
--- 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 e0cf7d1b44c1e519a287cb3efaa1323e005fb134..ef2d9c3bc8abd5c2eb597b90b5e509d11a87e498 100644 (file)
--- 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 3cb86c2e950a8050d006bc88dfe9990ffceb380d..ab5efeb1422efc6524937dbb6e84a55046be4f13 100644 (file)
--- 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 8c8aa8cadd507d3a0fae2e12ce1959e00c3a811e..4601381827f6aa9a50f70796d99a793dd04cee1d 100644 (file)
--- 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 8d9ffc2b6b76e3a5d26cb09794103d1370d86b01..17f7ef37eadda6574c2214ff69b5f7236767fa0a 100644 (file)
--- 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 a9c5224dd77d4d37e88293025b59a410a89411a2..60647968e62ff5eaf6dfaa774e608d912543bf95 100644 (file)
--- 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 e48d930b7b65abde488ae9336639c60ee8b2dec5..edab90b10c1638445a5f74e2bdfc0c0d6cc4dc67 100644 (file)
--- 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 6adb733a1a29b08f9f3aa2fe55cbb197bfb3fb2d..303554c530faeb4aa48061ae0cead3cfbe879962 100644 (file)
--- 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 77fe3660da37f6cdff4febef8daa88f2a1d26d64..7318a5aa014c9298e20401d877e56fc487006ffb 100644 (file)
--- 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 b902db50e0be58bb50666754ef3d94194d717e1c..30ede7fd1e9159dc13cc09cb63ba162fc9e82d15 100644 (file)
--- 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 1af93f262b21faf7c8a82a16fbe47e9055dcc7d4..2a136ff574040032cf052563013d20473a9d97be 100644 (file)
--- 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 bb9b73d2794768b19dc8726f58b6dfbcfb518a00..f8c98e7ab4d2b17f803e42d6f4d3598e9cca9fd4 100644 (file)
--- 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 3b3b1d5687edce31d01770e735ed2624cb8403dc..bcf44341007f1d485dbbfd215123735efda38eef 100644 (file)
--- 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 1285822f8362af173131b188077a87cc6d7b1dbc..4d01c7e7b0ca890c8fd92df3140e53f711176ee3 100644 (file)
--- 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 7ac3c99a5c0abe2d7b86db2ff8c381412b38d47e..7d0c50c82b65150707a99c5644d94d2a16bcb6ea 100644 (file)
--- 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 cbb1f2a54577cf75a18b023c7eeb175a5bdc93be..cf0fe00ca7c8347ede02edd4f8773e8665d81e5e 100644 (file)
--- 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 d7a0929d63a321907f7ba9ee9d5424754c42dbbc..d73ee8929a3957884967a5508559dca5d65dbaa9 100644 (file)
--- 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 f0172c0f40785ce6cbb04eee512d8b18c1583aff..4b260d33c0c72b58e8218d85eee43808333523f5 100644 (file)
--- 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 aced2fe2326dfb03eae955bb4418f88b6b831c7d..748c584ed8233de8e24bb297aa38d5fe3d8f7d42 100644 (file)
--- 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 8589ebdf7b81ff449fd2faa4bab7d2dff710698e..0bd9f9349e920ff86a8f850b6d382b4d9d831104 100644 (file)
--- 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 0c969c6f5b3a2efb9f9ed58448e84189459fe802..85caac60c8a11eb8e9c92131dc898a3f02b5c9c9 100644 (file)
--- 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 61c54a8fe2a4986dffaacb0a1db7ac442af5516e..52582c4797d938d33bd7a5019017c6c0e074e39c 100644 (file)
--- 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 4f7a173327d8f497c5ae1ac3d0afc5511d72a11d..c220ce42d6dc695a8f04505f9a122cf828990efc 100644 (file)
--- 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 639ddd150b6d6ba81bf6590002678c91ece42da4..67035badfb4f84b8ee11b3a66ae94696fa694278 100644 (file)
--- 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 813e0a1d924c3cd68d31dad0d14ab36860c71b42..c3af838b69ecf1f8fb7675bde6a95798c3214aa5 100644 (file)
--- 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 087c4a190567dafdfda588343ef022b9f5b0cb80..69e7ad3ed1e399eb8bd8aec1b65f1f90052290dd 100644 (file)
--- 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 b0d3afc353be72d53f8ba6c97434dce8b3fff301..82bc9c13b18c57c749754251c8888d71818bb595 100644 (file)
--- 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 f3828601ccd8edaad9b548189615c5e2425b2b88..146fd8245777296cc338237e89e6faea7db4ace7 100644 (file)
--- 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 36843128a4f179d6f0ceff23d7ec7a08a12c7135..3be4af7fe9e7ee94309a6f43462d4f7a9c0ee0ad 100644 (file)
--- 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
@@ -24,7 +24,7 @@ user-session=default
 
 # Log into account that requires as password change
 #?*GREETER-X-0 AUTHENTICATE USERNAME=new-authtok
-#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password:"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password \(expired\):"
 #?*GREETER-X-0 RESPOND TEXT="New password"
 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
 #?*GREETER-X-0 START-SESSION

diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
index 19dd3038818e19e8f8ad7534685a716f3c9e4c25..485a3e192a0ef79655144aa4f574c6476a22b692 100644 (file)
--- 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 9fdf9fff90b32c881b8b325b59648a899283f368..fac0f2e2c3ab8b892e08577b2ec0456d16ad435e 100644 (file)
--- 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 782d79bcd21238e0ac17823101b2dccbb6e56aa2..61d7a1463756a977fc2d481971f39c9e5ba28a43 100644 (file)
--- 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 ff4786bdb1ab143aff7a23be7e08ad35285f9815..fb5d50021a4fe154de3d1cd5f5e85f2ea6a23e56 100644 (file)
--- 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 5afa9c6d68f22e39bf13d4ac4be2c52e10e42f36..c65541b0e9dc2c4c3f735a9de0dc1d1910fc889e 100644 (file)
--- 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 515ca18b4dc58f67b30f9e8d8f03b56e287be1b7..114fa638b143377554cf59544a237903c8602ac5 100644 (file)
--- 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 22b41e99b8031f6e5db9528270f695d495a3ea2c..855a6deecb2b29f128cb4e8b73e493752b18deda 100644 (file)
--- 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 9400fbcaf549cbbb99c89f1a83e6711bdc6a1976..ee89cbcbac06dad162d9d73b4ce65ef4c7b6078f 100644 (file)
--- 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 3fc8e40bf512c9754524fbb78143e4f42a9c7721..28652944dadf1d325a1a2e6d5cbdb1020d269e33 100644 (file)
--- 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 d9bddfae1497545e2b664c4dad2d4b9faa34173e..f4bd53c75e7200dda16299ed5b6a2724ad740e54 100644 (file)
--- 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 6bc99004a4f0a0085bd6485cfbb90f7679915e5c..5e4687a0b216ff331ab732de203262709e98f0db 100644 (file)
--- 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 52743bdb2b6cfce28b501c272a42d376f2c065a9..05ec2f204e9a6310cfa49ccdd23de0154f9d896a 100644 (file)
--- 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 e3b2e454781a6a65730cf64f19163d1861187204..30a0c6babeedf9cef50ec1438e5bb578878597dd 100644 (file)
--- 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 d8d4f167a87c82240b03382b46709ee7e9ac575a..c310901e04d0d983050fea03151330e28b0a4ae7 100644 (file)
--- 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 531734415e76520b4f5fd246d37cafecc2468058..b2196d04ed67750e9f786395de88e80f9f36ec79 100644 (file)
--- 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 895b1bd0467189de6e5664079a7c3a1522600990..4160e1e85f4e60d8155d5ddf295989719c107644 100644 (file)
--- 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 de07f94040c9094dc7281cb6a7545307ab56de7a..216ed7c298b8d2d39a368825b24f1afb08bf2e8e 100644 (file)
--- 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 afc0c00fd3b7b556583e377957d166395d80b13f..b4ff7a89cfd5301caf3049341ac14f35ba528e58 100644 (file)
--- 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 cbddad408f499dd629160f919a59ea2235b1d18a..a993711d8e3e323a885c176e624a28e6df36940d 100644 (file)
--- 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 e23925d5c1196074f3d86c94017dc66b5c408191..9177783ffba34c4ee275affd0a76b47f48da4963 100644 (file)
--- 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 3a09a70fd000dd3d6581b459d02a5d59c473a3ed..8df2318242ba0a84762b98e5ac4e38da73f7038d 100644 (file)
--- 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 bd685c2b4d21676a5ccaae4d3f518db50fecebf2..f12a883e1d7e69f6f97f1d6d23f25c369ce8172f 100644 (file)
--- 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 19e8772741d9b4d00df4240e491286927661beca..1af76798cc6d9fe373129f5feb4edaf1cb9cf32c 100644 (file)
--- 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 e1cf0ebccb6b2fb1840ecb55030400e3d584b5bb..0dc8162d0b6c17b9bea427b6a178e9e9d1c79c5d 100644 (file)
--- 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 9477847f5efa19b4659400e540ca4f792a1ddf9c..3160210adee9a5999334527bfc69f7546738c4a3 100644 (file)
--- 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 a0732ae9bdf56671f6aa58a6732601f25e80bd2d..4c6e6eddc0997c2f80c8dcd72f28ef6ff3a32138 100644 (file)
--- 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 80c782d3b27c7f27b51d7bdff65fded415f3c711..2999b8f71f49cb1ae0e3e94a98bad8ed621888db 100644 (file)
--- 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 d72747db6cb617abaaa9c5632a2da6c21b183e92..60e26cff7824cb707177875a8587b0947db055e3 100644 (file)
--- 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 95275b42b0f0dfdf796f64d8b88135d00cd33d6a..4534b44f2dc31593c87dea26450b642fbc97c723 100644 (file)
--- 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 690b98ebc8d99c46a563a60e0d7c72f54333c482..8313fc135630645e9707f2aa05dede95df2f9064 100644 (file)
--- 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 53f5081ef4e808bd822c8406ffb01d7058a500cf..d3f0436e723038f1d4a4be1e310dcf472d41a7ba 100644 (file)
--- 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 7b2ac36dd33ce89322f76b49a9ecb8203f7f5630..f49317453dccd84c45ac7d838cd1cd3d2d3d2274 100644 (file)
--- 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 e2c311efc16b82c7112395adf4ba03e9a1bae026..bbda72eb8947307b1ea90a0b8be33444f65e2623 100644 (file)
--- 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 a03ef958ab60c98efc929850ec27135b590f0129..209c11ec108a2adada519f2c90e36e43f0c64f1d 100644 (file)
--- 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 a59bd4e0d02f4362182190a7c8a36e6cfc97afd0..565f75f72d7f57fc913018a7eda8fe03d0306fac 100644 (file)
--- 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 f6b23faa3bdc07e5b30e72e09eb9b6bf8d84e515..abdb2cc59cd5fb1f51e6ac36a134e2df2910223d 100644 (file)
--- 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 366848c7b40a0546ea37235e6b083a4f8c56d005..ac0ccf46d9a01fcd3d0800891476576dad3e0976 100644 (file)
--- 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 09ecc94761201786433e3fade9700981162c7001..9b8ab0d46a1b1c0f078a11d7cbca86dd9bfe874c 100644 (file)
--- 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 20856c485ec9f2a8679a03d9cee02c2d0279c5a1..37aad34986907dfbc910752fab9d00bd5faf68be 100644 (file)
--- 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 7c677762749df48c486140d06ac7c9e2fd174074..4b985eb28fa67ad10f9e6cfbbae6d308e3560492 100644 (file)
--- 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 46bcca4e01d8682c5178c6413c8479d5588fbc71..60364d5817fb0ec4507690849f8b5b064e1dccef 100644 (file)
--- 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 ea36a4afc1e0e121f16edf1e51dd7064190fbcf9..20e2fb55b52dde5d44d9106b91982f437e46aa54 100644 (file)
--- 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 f070eea6969a304d081c470e8b51f5d8f6d8fc8b..8792fbcf7154e067539851ddbf66c4a441b6a09a 100644 (file)
--- 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 1b9fad01fc55cdaf7bd645da76029babd833f90d..7b6ded02a663cc0453cfb8e766f7d0b2ec7d6ad5 100644 (file)
--- 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 96a9dc1921b604342c26ab4732667c4af4f5b812..a075581b85dc7dca5d5616dbc39486914b3ae157 100644 (file)
--- 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 e58596e6f07229ab5df255541399543829106364..128c1968f9379d501695f9758052a0636243a2be 100644 (file)
--- 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 a4d47d741cc88e698ab3c37245ad72aab98d2ddb..448d9dec42a26046fcf413068a2b5afa326a30b1 100644 (file)
--- 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 40e5a3ccc6d33a986f3e6d79a388a4af817f5919..43fe399659d6d825d158246303f852d0aab92ac4 100644 (file)
--- 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 ed5cce56d6a498bd92cb77512838f9940c9e623e..cdb3fb0ba4b1ca9a289f0da342c7cb78da63f504 100644 (file)
--- 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 30b70a3e3c1d29f385b2be4585079e01c87aebf0..b1f101390c8ef1f47cfbd58714043b359b6078f0 100644 (file)
--- 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 581a0a9e94671848c4b2e4955583a6c57a8aeb01..ed56caf4b129ebef13be6927000dadc446d83715 100644 (file)
--- 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 65e06f01f2af6bf6e37bd845a40f6075ba8f1cf4..eb9faf7a2d6ad5e872a6ac8dba2875e3ba65943d 100644 (file)
--- 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 f187a2e0c3e364593a3389be266f4d335b1a9881..f7ddbaaecff3796c6e76511c9584ebbb9bfbba4f 100644 (file)
--- 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 7885f1e6661f8e6df272fffac797245f0a99cdfd..756d8363b777099f88b9b911d3907ad4524372a6 100644 (file)
--- 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 a5e6d98337b0991b822f8c8fd21cea483de7674e..04b9a0e0491f31ebc8d5d42fc19344b9a313eb9b 100644 (file)
--- 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 5a2518142d608febee2f2cd95c6ee67489102bad..a1d5c76cd83e9a52058d611ed5d67fea5e40a6c6 100644 (file)
--- 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 5ddb2b363df1d19ef468e2b8bf2f8ea796b36659..62a04283f4ec66a609da197c620e236297af98f5 100644 (file)
--- 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 b396aed8a4052440b868927240c5360c1203a21c..bb588a5e0c1f1cf69f5e4e7c64439f953c809066 100644 (file)
--- 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 7267ab666447734f99866e5ea96041c72dcab8e5..8d9c789c7663403660410a290ef8f4ad56b9898b 100644 (file)
--- 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 6d323eb6c1ffb02a4d8e494e853ed5ffc8f68ecc..6290aee6c27d0289ddad8e4ee30a80a34f2dcdda 100644 (file)
--- 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 bded33c9a40322a5749804e53334b4c7c2382e5c..980138521ecce066a2dcc060aa5e90b2453a84fe 100644 (file)
--- 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 630b9ecd2107870230ce657a8ddd7dfb3dc5e5f8..d54b5ad9bf0ab1317861b0841e2d275e33e7cfe0 100644 (file)
--- 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 f8867a46b018a4d31a6786d36ddbc37d25bb762a..bef4219a9bd5dba456f146eaee8a7b6455ff67ae 100644 (file)
--- 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 f9511452fb2438cd18d34121d9c12b17e1a95da6..1bc47a9a781ca9fefc012649988b91f8ec4bd911 100644 (file)
--- 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 f91c1ee53444d23982009d679586283c9dc1f28f..bb79159716cce45a24c41336af5d9645bc9f9751 100644 (file)
--- 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 d1fbcefac39bd15b5d86c42009b1acb906be9357..8d464f3c2124e622042bcfa044dc0b8f8e57b39b 100644 (file)
--- 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 d9908ee2bd0f5595d97f16a86d0008a8d1a34f24..9e5460ee540f4d4acfded3e341f0d2223c7fe21f 100644 (file)
--- 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 963f5cb8ede0b0f80499ec18a119132ef8da5812..6265cd2161f4febca84fe4b01af1356fe4dde64e 100644 (file)
--- 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 fa6d46f000d8cf37d3a2596ec9d43d1adf32cfdb..c356e3e86859e62e1da587ffcb8ce2d18f72d283 100644 (file)
--- 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 da13954a8f18d66ef7f095a7ac585b8493a55581..eb7d20d6ecdf6830e646d663267fc8bcd2634af7 100644 (file)
--- 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 17162ed98b1126faea6407eeeb0b5d2375424bb1..8ddd45c879d2babe680aeab96cea8f280f98d80d 100644 (file)
--- 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 7e3295de017e7990f663c89b925c240946fa6852..f324ced2701b6fb77531161a0ea2fbdc6fc4cc70 100644 (file)
--- 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 129fdaadfa77612c858349ab300ea4fbac011483..8fdd18b32e8530347e5bdbed0c8b848a506c1e48 100644 (file)
--- 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 6be9903685d7e43606f93b3fcbf57f3247bc7c6c..1d8ad57ead4844d1d147d9616a2ed4d075b54dbd 100644 (file)
--- 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

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 0f5073990e355f99e40b45dce5c295607efc3f79..d650ba4320199aa996b64cb7f4da1d6ff57315a0 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -19,6 +19,7 @@ noinst_LTLIBRARIES = libsystem.la
 
 libsystem_la_SOURCES = libsystem.c status.c status.h
 libsystem_la_CFLAGS = \
+       $(WARN_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
        -DSRCDIR=\"$(abs_top_srcdir)\" \
@@ -160,6 +161,7 @@ test_qt5_greeter_SOURCES = $(common_qt_sources)
 nodist_test_qt4_greeter_SOURCES = test-qt4-greeter_moc4.cpp
 nodist_test_qt5_greeter_SOURCES = test-qt5-greeter_moc5.cpp
 common_qt_cflags = \
+       $(WARN_CXXFLAGS) \
        $(GLIB_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
        $(XCB_CFLAGS)

diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
index 7a15dbad74612675066dd7e4e4109ceeb047eeae..157bb993efe08e67606e2442a8d85a0c3454863c 100644 (file)
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -1,16 +1,21 @@
+#define _GNU_SOURCE
+#define __USE_GNU
+
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <grp.h>
 #include <security/pam_appl.h>
 #include <fcntl.h>
-#define __USE_GNU
 #include <dlfcn.h>
+#include <utmpx.h>
 #ifdef __linux__
 #include <linux/vt.h>
 #endif
@@ -18,6 +23,8 @@
 #include <xcb/xcb.h>
 #include <gio/gunixsocketaddress.h>
 
+#include "status.h"
+
 #define LOGIN_PROMPT "login:"
 
 static int console_fd = -1;
@@ -154,9 +161,6 @@ setresuid (uid_t ruid, uid_t uuid, uid_t suid)
 static gchar *
 redirect_path (const gchar *path)
 {
-    size_t offset;
-    gboolean matches;
-
     // Don't redirect if inside the running directory
     if (g_str_has_prefix (path, g_getenv ("LIGHTDM_TEST_ROOT")))
         return g_strdup (path);
@@ -320,13 +324,13 @@ stat (const char *path, struct stat *buf)
 }
 
 int
-stat64 (const char *path, struct stat *buf)
+stat64 (const char *path, struct stat64 *buf)
 {
-    int (*_stat64) (const char *path, struct stat *buf);
+    int (*_stat64) (const char *path, struct stat64 *buf);
     gchar *new_path = NULL;
     int ret;
 
-    _stat64 = (int (*)(const char *path, struct stat *buf)) dlsym (RTLD_NEXT, "stat64");
+    _stat64 = (int (*)(const char *path, struct stat64 *buf)) dlsym (RTLD_NEXT, "stat64");
 
     new_path = redirect_path (path);
     ret = _stat64 (new_path, buf);
@@ -352,13 +356,13 @@ __xstat (int version, const char *path, struct stat *buf)
 }
 
 int
-__xstat64 (int version, const char *path, struct stat *buf)
+__xstat64 (int version, const char *path, struct stat64 *buf)
 {
-    int (*___xstat64) (int version, const char *path, struct stat *buf);
+    int (*___xstat64) (int version, const char *path, struct stat64 *buf);
     gchar *new_path = NULL;
     int ret;
   
-    ___xstat64 = (int (*)(int version, const char *path, struct stat *buf)) dlsym (RTLD_NEXT, "__xstat64");
+    ___xstat64 = (int (*)(int version, const char *path, struct stat64 *buf)) dlsym (RTLD_NEXT, "__xstat64");
 
     new_path = redirect_path (path);
     ret = ___xstat64 (version, new_path, buf);
@@ -432,25 +436,29 @@ chmod (const char *path, mode_t mode)
 }
 
 int
-ioctl (int d, int request, void *data)
+ioctl (int d, unsigned long request, ...)
 {
-    int (*_ioctl) (int d, int request, void *data);
+    int (*_ioctl) (int d, int request, ...);
 
-    _ioctl = (int (*)(int d, int request, void *data)) dlsym (RTLD_NEXT, "ioctl");
+    _ioctl = (int (*)(int d, int request, ...)) dlsym (RTLD_NEXT, "ioctl");
     if (d > 0 && d == console_fd)
     {
         struct vt_stat *console_state;
-        int *n;
         int vt;
+        va_list ap;
 
         switch (request)
         {
         case VT_GETSTATE:
-            console_state = data;
+            va_start (ap, request);
+            console_state = va_arg (ap, struct vt_stat *);
+            va_end (ap);
             console_state->v_active = active_vt;
             break;
         case VT_ACTIVATE:
-            vt = GPOINTER_TO_INT (data);
+            va_start (ap, request);
+            vt = va_arg (ap, int);
+            va_end (ap);
             if (vt != active_vt)
             {
                 active_vt = vt;
@@ -465,7 +473,15 @@ ioctl (int d, int request, void *data)
         return 0;
     }
     else
+    {
+        va_list ap;
+        void *data;
+
+        va_start (ap, request);
+        data = va_arg (ap, void *);
+        va_end (ap);
         return _ioctl (d, request, data);
+    }
 }
 
 int
@@ -495,7 +511,7 @@ free_user (gpointer data)
 }
 
 static void
-load_passwd_file ()
+load_passwd_file (void)
 {
     gchar *path, *data = NULL, **lines;
     gint i;
@@ -627,7 +643,7 @@ free_group (gpointer data)
 }
 
 static void
-load_group_file ()
+load_group_file (void)
 {
     gchar *path, *data = NULL, **lines;
     gint i;
@@ -1194,7 +1210,10 @@ pam_chauthtok (pam_handle_t *pamh, int flags)
     msg = malloc (sizeof (struct pam_message *) * 1);
     msg[0] = malloc (sizeof (struct pam_message));
     msg[0]->msg_style = PAM_PROMPT_ECHO_OFF;
-    msg[0]->msg = "Enter new password:";
+    if ((flags & PAM_CHANGE_EXPIRED_AUTHTOK) != 0)
+        msg[0]->msg = "Enter new password (expired):";
+    else
+        msg[0]->msg = "Enter new password:";
     result = pamh->conversation.conv (1, (const struct pam_message **) msg, &resp, pamh->conversation.appdata_ptr);
     free (msg[0]);
     free (msg);
@@ -1373,10 +1392,10 @@ setutxent (void)
 {
 }
   
-struct utmp *
-pututxline (struct utmp *ut)
+struct utmpx *
+pututxline (const struct utmpx *ut)
 {
-    return ut;
+    return (struct utmpx *)ut;
 }
 
 void