Correctly set $XDG_SESSION_CLASS for greeters. This was regressed in 1.7.5 for Consol...

author Robert Ancell <robert.ancell@canonical.com>

Mon, 21 Oct 2013 22:43:11 +0000 (11:43 +1300)

committer Robert Ancell <robert.ancell@canonical.com>

Mon, 21 Oct 2013 22:43:11 +0000 (11:43 +1300)
author Robert Ancell <robert.ancell@canonical.com>
Mon, 21 Oct 2013 22:43:11 +0000 (11:43 +1300)
committer Robert Ancell <robert.ancell@canonical.com>
Mon, 21 Oct 2013 22:43:11 +0000 (11:43 +1300)
diff --git a/src/seat.c b/src/seat.c

index cdd6efa14943a2370d0563d8f35f4564697bc701..6dd32237cf683e04931e681c504f506b072c2f7a 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -1075,6 +1075,7 @@ create_greeter_session (Seat *seat)
      g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat);
    
      set_session_env (SESSION (greeter_session));
+    session_set_env (SESSION (greeter_session), "XDG_SESSION_CLASS", XDG_SESSION_CLASS_GREETER);
  
      session_set_pam_service (SESSION (greeter_session), GREETER_SERVICE);
      if (getuid () == 0)
diff --git a/src/session-child.c b/src/session-child.c

index 138f3188d2dffc09e2dad99360d6150ed6023347..2b999b4cdfe44327a885ba2965214a402cf3303a 100644 (file)
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -213,7 +213,6 @@ session_child_run (int argc, char **argv)
      gchar *authentication_result_string;
      gchar *service;
      gchar *username;
-    gchar *class;
      gchar *tty;
      gchar *remote_host_name;
      gchar *xdisplay;
@@ -284,7 +283,7 @@ session_child_run (int argc, char **argv)
      username = read_string ();
      read_data (&do_authenticate, sizeof (do_authenticate));
      read_data (&is_interactive, sizeof (is_interactive));
-    class = read_string ();
+    read_string (); /* Used to be class, now we just use the environment variable */
      tty = read_string ();
      remote_host_name = read_string ();
      xdisplay = read_string ();
@@ -480,7 +479,7 @@ session_child_run (int argc, char **argv)
          g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
          g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
          g_variant_builder_add (&ck_parameters, "(sv)", "unix-user", g_variant_new_int32 (user_get_uid (user)));
-        if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) == 0)
+        if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), XDG_SESSION_CLASS_GREETER) == 0)
              g_variant_builder_add (&ck_parameters, "(sv)", "session-type", g_variant_new_string ("LoginWindow"));
          if (xdisplay)
          {
@@ -601,7 +600,7 @@ session_child_run (int argc, char **argv)
      if (child_pid > 0)
      {
          /* Log to utmp */
-        if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
+        if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), XDG_SESSION_CLASS_GREETER) != 0)
          {
              struct utmpx ut;
              struct timeval tv;
@@ -632,7 +631,7 @@ session_child_run (int argc, char **argv)
          child_pid = 0;
  
          /* Log to utmp */
-        if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
+        if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), XDG_SESSION_CLASS_GREETER) != 0)
          {
              struct utmpx ut;
              struct timeval tv;
diff --git a/src/session.c b/src/session.c

index 888432d2873efe3e2c03284db27c74b335a28c0d..9b985b72d5296a9fda646e68c86f2cc89e75c48f 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -84,9 +84,6 @@ struct SessionPrivate
      /* File to log to */
      gchar *log_filename;
  
-    /* Seat class */
-    gchar *class;
-
      /* tty this session is running on */
      gchar *tty;
  
@@ -199,14 +196,6 @@ session_set_log_file (Session *session, const gchar *filename)
      session->priv->log_filename = g_strdup (filename);
  }
  
-void
-session_set_class (Session *session, const gchar *class)
-{
-    g_return_if_fail (session != NULL);
-    g_free (session->priv->class);
-    session->priv->class = g_strdup (class);
-}
-
  void
  session_set_display_server (Session *session, DisplayServer *display_server)
  {
@@ -615,7 +604,7 @@ session_real_start (Session *session)
      write_string (session, session->priv->username);
      write_data (session, &session->priv->do_authenticate, sizeof (session->priv->do_authenticate));
      write_data (session, &session->priv->is_interactive, sizeof (session->priv->is_interactive));
-    write_string (session, session->priv->class);
+    write_string (session, NULL); /* Used to be class, now we just use the environment variable */
      write_string (session, session->priv->tty);
      write_string (session, session->priv->remote_host_name);
      write_string (session, session->priv->xdisplay);
@@ -874,7 +863,6 @@ session_finalize (GObject *object)
      g_free (self->priv->messages);
      g_free (self->priv->authentication_result_string);
      g_free (self->priv->log_filename);
-    g_free (self->priv->class);
      g_free (self->priv->tty);
      g_free (self->priv->xdisplay);
      if (self->priv->x_authority)
diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf

index f35e9ef3c1a0169384b86fc8f5b7f630ebd2ac5c..535d65ee41789287d23743c722bdc7c38ab13756 100644 (file)
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -22,7 +22,7 @@ user-session=default
  # (guest account attempts to start and fails)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf

index 5ab0dec5049be71482c3bc94fd82f7af0e2eaa80..2f8ed88837628ca592b775357fa817391276eecc 100644 (file)
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -17,7 +17,7 @@ user-session=default
  #?*XSERVER-0 INDICATE-READY
  #?XSERVER-0 INDICATE-READY
  #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf

index 6db130817b360b4649c0a32e3f044f9af191269c..4cb045c4b030c8362788f845c81d62ae97fd6272 100644 (file)
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -45,7 +45,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf

index b840419d1edf7fa8abd45a44feef5387c2fcff22..63c359e159101c1b75ed163edfa20f3c724bb993 100644 (file)
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -21,7 +21,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf

index 59beb6d4cb6a2dea34aa6d01ed9ff634dd68bc3f..ca5b17fa1920b3f2ca9c85d0c5af65b870ef8c21 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -14,7 +14,7 @@ user-session=default
  #?*XSERVER-0 INDICATE-READY
  #?XSERVER-0 INDICATE-READY
  #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf

index 01600a6378fab294cba055a79b491a399f7a3263..fc48503ce6a30c5fc3423fef3712964126312547 100644 (file)
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -19,7 +19,7 @@ user-session=invalid
  # (session fails to start)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf

index 73681fd5ac264b41c137b955340a154d198d992d..fc40621c25ff54fab9953fb7d9859aa778e0397e 100644 (file)
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -18,7 +18,7 @@ autologin-user=invalid
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf

index 38c9e460d5d291ccaa53fb8d08f9c02dbd6f20d5..cfa562ce81eb606aebc62c03202c3254447d602b 100644 (file)
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -36,7 +36,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf

index 293b35992794deeb379f10aba4f39d64d6a10b3d..71627a96bb43538d8bfc3e9f7c7896bb086857d6 100644 (file)
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -19,7 +19,7 @@ user-session=default
  # (Session fails)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf

index 1d7bb03fcee0eb036fe74c1efa811c7743c2940a..d00e50d2457767b5d40e2b69a27b8bfb9dd017ae 100644 (file)
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -19,7 +19,7 @@ user-session=default
  # (Session fails)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf

index 8cb38ac48cf6bc62256b6793f4403af00b14a1f1..9a3eea24cf18e557b47529075e321c479a9d237b 100644 (file)
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -36,7 +36,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf

index f9499b665d1a995aa6035634db88eb168079e666..18dc9906d347aa980840588860144b874f78d34b 100644 (file)
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -30,7 +30,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf

index 145a6bd841685d5b1ca00bffa2a721743f96db88..5c0dfbf0a03224d6aac83648441eb5d1e473621d 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -15,7 +15,7 @@ user-session=default
  #?*XSERVER-0 INDICATE-READY
  #?XSERVER-0 INDICATE-READY
  #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf

index b233a4906dca63b16deb3a03591dc01466e6b7b6..774cba426911bd449c0ce2d9faaa0f7237d0fb64 100644 (file)
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -18,7 +18,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf

index c536731613607ab3e0f4c55afdf0f2c28269b4b1..5c4d6ef410b66a543a9a28a7dbe02d1de5be7f22 100644 (file)
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -34,7 +34,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf

index 8c907ea18259ef1375ee1a82cd65dad06ed325a7..fd93df070a22285386aafa5ea4dbc6d5a3494e5c 100644 (file)
--- a/tests/scripts/cancel-authentication.conf
+++ b/tests/scripts/cancel-authentication.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf

index 1151ed80042a0bb69f40075210b38e339aadcba8..401a14227cf5bcaab91568ae8e4071e55d3a44dd 100644 (file)
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf

index 73a513d4eb31fe8d673259abe30da2441f5ccd8e..922e91d02042a64788faa383517a7a71af66c952 100644 (file)
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -19,7 +19,7 @@ user-session=default
  # (authentication crashes)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf

index 367db5c1e91a8f62fc0cdb7f4b450dafe2ecc56c..788c3550bdffb49fd7caec085f154bfe791ff828 100644 (file)
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -30,7 +30,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf

index 53eecd935d9c92af2f7d4c2256fe81f777e91491..2e4279dd7778029e303a3577c139e9eb4e79850d 100644 (file)
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -30,7 +30,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf

index 6878c1d49ba34c18129ad95beeb8e6d5b5c121ea..4ff210ad1b0f17d1cf88cbd15e160c505071e0da 100644 (file)
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -30,7 +30,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf

index bc33db7674c26ffeedd718cf08300f469d5da932..82bb5845c4a98200e3a2274bf8690bdce0fa3725 100644 (file)
--- a/tests/scripts/dbus.conf
+++ b/tests/scripts/dbus.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf

index 47a3bc8e3aec01107d6793673e97e10a12b3adeb..cba728c35e95282f6fe7db8d7ddf1f481deadae5 100644 (file)
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -19,7 +19,7 @@ user-session=default
  # (Session fails)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf

index 8125b8c4fa0c8dcad16c1a0f4a47a7933d846f42..8a4991f22a9c654f12ba7df7ce7fb7b0ecb5d0f7 100644 (file)
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -19,7 +19,7 @@ user-session=default
  # (Session fails)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf

index baf8903eeaac7d3c577ae9938d635d5a5667d133..664c89cd7aea4e5802a82dd779f242c0e3f54479 100644 (file)
--- a/tests/scripts/greeter-allow-guest.conf
+++ b/tests/scripts/greeter-allow-guest.conf
@@ -16,7 +16,7 @@ greeter-allow-guest=false
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-default-session.conf b/tests/scripts/greeter-default-session.conf

index 0b78a47cc599d795b26b81b8ae25d945e1084c6e..5c99941e9c956980bccda15608ae0f0ffa75aba8 100644 (file)
--- a/tests/scripts/greeter-default-session.conf
+++ b/tests/scripts/greeter-default-session.conf
@@ -16,7 +16,7 @@ user-session=alternative
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf

index df035e1f7f07bab99e414edcb6819b04b8e01468..5910691f3040c480a75b6f9e900cd98e35e597f1 100644 (file)
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -16,7 +16,7 @@ return-value=1
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter fails to start
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?GREETER-X-0 EXIT CODE=1
  
  # X server stopped
diff --git a/tests/scripts/greeter-hide-users.conf b/tests/scripts/greeter-hide-users.conf

index 22b129d90011c7f94f07fe6819c04db2d1747fe4..3db2f081ef5c4ab463b494151f09b1242cb6bbac 100644 (file)
--- a/tests/scripts/greeter-hide-users.conf
+++ b/tests/scripts/greeter-hide-users.conf
@@ -16,7 +16,7 @@ greeter-hide-users=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-show-manual-login.conf b/tests/scripts/greeter-show-manual-login.conf

index 38e2c1e022e4e2b27d0e6d5135aa4d29ed8a6c5c..2d40787d906cceca8e745f2d4e2aa9c268aecc4d 100644 (file)
--- a/tests/scripts/greeter-show-manual-login.conf
+++ b/tests/scripts/greeter-show-manual-login.conf
@@ -16,7 +16,7 @@ greeter-show-manual-login=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-show-remote-login.conf b/tests/scripts/greeter-show-remote-login.conf

index 1fe462dd4667cef9991b2bbfa24834de1a76b877..459c235c7ed5993919d5b3edde3fbf2afee6d518 100644 (file)
--- a/tests/scripts/greeter-show-remote-login.conf
+++ b/tests/scripts/greeter-show-remote-login.conf
@@ -16,7 +16,7 @@ greeter-show-remote-login=false
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf

index 111a6e99128dc1c7b555a92fcb791eed4142d0b4..9d6c186950fcddcc739a9e70d718e09221ff6f7d 100644 (file)
--- a/tests/scripts/greeter-wrapper.conf
+++ b/tests/scripts/greeter-wrapper.conf
@@ -19,7 +19,7 @@ greeter-wrapper=test-greeter-wrapper
  #?GREETER-WRAPPER-X-0 START
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf

index 0b0e24e64316a4c351a744bef4d0303ace865928..89d04c1ab321fbf722a78ae73ba555908051475f 100644 (file)
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf

index 76d623955aa54164fd0e915ff2c22761214b0108..b2db4c23a3151a26388f0fa1d33af0d118272043 100644 (file)
--- a/tests/scripts/keyboard-layout.conf
+++ b/tests/scripts/keyboard-layout.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf

index 544a053354f12325c07ec061452a89f683177ed1..9cc0b3fdf3e089cab38f267551a21ca3f44c61cb 100644 (file)
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -16,7 +16,7 @@ disable-accounts-service=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf

index 04abe16c4d2a5020428c7fef5ca9fb44ed5ec093..e4e4a6a6f6b07d2dabd793fc0a85bd202251cf9b 100644 (file)
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf

index 08b4af6c96b30a3e90147fd87cc84f59b3b045e2..8d9ffc2b6b76e3a5d26cb09794103d1370d86b01 100644 (file)
--- a/tests/scripts/lock-seat-console-kit.conf
+++ b/tests/scripts/lock-seat-console-kit.conf
@@ -40,7 +40,7 @@ user-session=default
  #?CONSOLE-KIT LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf

index 58cba9182f2441909421265da2805ea451db89b4..a9c5224dd77d4d37e88293025b59a410a89411a2 100644 (file)
--- a/tests/scripts/lock-seat-return-session-console-kit.conf
+++ b/tests/scripts/lock-seat-return-session-console-kit.conf
@@ -40,7 +40,7 @@ user-session=default
  #?CONSOLE-KIT LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf

index 94b3429346b7fa7bea168c1c7a913c6bf0a03ae5..e48d930b7b65abde488ae9336639c60ee8b2dec5 100644 (file)
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf

index 88f7a72745f8add20035cf0653a6608c1984bfe5..6adb733a1a29b08f9f3aa2fe55cbb197bfb3fb2d 100644 (file)
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf

index 7b4c70fb404a6196e936c512d98c1dfdc3c1ec94..77fe3660da37f6cdff4febef8daa88f2a1d26d64 100644 (file)
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf

index 68e79c4919c03f438501005aa41b96dc7c5ceebc..b902db50e0be58bb50666754ef3d94194d717e1c 100644 (file)
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -34,7 +34,7 @@ user-session=default
  #?XSERVER-1 ACCEPT-CONNECT
  
  # Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf

index 2a8d15588d6936d2b95b01871451b80fc8ef8fe7..1af93f262b21faf7c8a82a16fbe47e9055dcc7d4 100644 (file)
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf

index 3017e7206d66a1aad88e7f73b803702f4d93fbe0..bb9b73d2794768b19dc8726f58b6dfbcfb518a00 100644 (file)
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf

index fcab467295f22482419efbfdf216907a390ef792..3b3b1d5687edce31d01770e735ed2624cb8403dc 100644 (file)
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -16,7 +16,7 @@ allow-guest=false
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf

index b6f2b077d73b0b7c0480b66289a4aa20b5979aff..1285822f8362af173131b188077a87cc6d7b1dbc 100644 (file)
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -19,7 +19,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
  # (guest account attempts to start and fails)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf

index 1b1a2697b5dca9d0851f148f52e022c49c99843e..949d6c9cde1e34c3054b7f26ff51b2ec80ab4c6d 100644 (file)
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -19,7 +19,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -57,7 +57,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf

index 431df5790cb62be963a90143179bd0105bfa6b75..cbb1f2a54577cf75a18b023c7eeb175a5bdc93be 100644 (file)
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -16,7 +16,7 @@ guest-account-script=
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf

index 112ad10369b88c11c7952b2ee90f4db66b381e22..1b1c09a0e597d22b0c2c7d7a86d58c3cafa778dc 100644 (file)
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -19,7 +19,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf

index ff5b7cbb540ee72c385ba067281030e58afc5a12..f0172c0f40785ce6cbb04eee512d8b18c1583aff 100644 (file)
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf

index f562ae553995e22b7ee66d6ff3c52eaa3a612a78..aced2fe2326dfb03eae955bb4418f88b6b831c7d 100644 (file)
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf

index bc72f461b3b18d208174a80d9ab77d49ae974f11..8589ebdf7b81ff449fd2faa4bab7d2dff710698e 100644 (file)
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf

index 94c90dd2674cf958d3bfda521d22924ea0514815..0c969c6f5b3a2efb9f9ed58448e84189459fe802 100644 (file)
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -50,7 +50,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf

index 8f9dcbc335e1aabdde5204a78b1156b0c81aad22..61c54a8fe2a4986dffaacb0a1db7ac442af5516e 100644 (file)
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf

index 7b2efc16d307403f6e248009d85aa4f44c2d5fc9..4f7a173327d8f497c5ae1ac3d0afc5511d72a11d 100644 (file)
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf

index b4c1fc24914e74a362fb68be1950ceb2286a8ab5..639ddd150b6d6ba81bf6590002678c91ece42da4 100644 (file)
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual-remember-session.conf b/tests/scripts/login-manual-remember-session.conf

index 4efaa7f04b640eee8c13e28c3027e84582dc21ee..813e0a1d924c3cd68d31dad0d14ab36860c71b42 100644 (file)
--- a/tests/scripts/login-manual-remember-session.conf
+++ b/tests/scripts/login-manual-remember-session.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -47,7 +47,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf

index abd6738b23314bd3ddebf3d371af5a40c323ef67..087c4a190567dafdfda588343ef022b9f5b0cb80 100644 (file)
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf

index f42ba2b95c335508940e833a78f5a2be48518748..b0d3afc353be72d53f8ba6c97434dce8b3fff301 100644 (file)
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf

index 9b765960570797ec7d19dbf5342cfc01e77de073..f3828601ccd8edaad9b548189615c5e2425b2b88 100644 (file)
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf

index 24936df56b76a31deeef88bfea36a2dfcfeebab0..36843128a4f179d6f0ceff23d7ec7a08a12c7135 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf

index ab90dd28103e409bded03f623ea5dc950c86f084..19dd3038818e19e8f8ad7534685a716f3c9e4c25 100644 (file)
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf

index 2b627f4caad66ebea1b451a21d6b72588191d30b..9fdf9fff90b32c881b8b325b59648a899283f368 100644 (file)
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf

index ca20ed56a3e841d5dae94ac424ca4eedc1678945..782d79bcd21238e0ac17823101b2dccbb6e56aa2 100644 (file)
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf

index f5eef9f932dd87fbfa924390ca6744a75559c849..ff4786bdb1ab143aff7a23be7e08ad35285f9815 100644 (file)
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf

index 2152c586976998f6c0a45b36e78e498a0b36d2ec..5afa9c6d68f22e39bf13d4ac4be2c52e10e42f36 100644 (file)
--- a/tests/scripts/login-remember-session.conf
+++ b/tests/scripts/login-remember-session.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -45,7 +45,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf

index 40ca7dcb215e4303e42eeda1bd5001b62fd45d74..515ca18b4dc58f67b30f9e8d8f03b56e287be1b7 100644 (file)
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf

index b0e5386d41ee6f0a6a066b41ef2034267fae339d..22b41e99b8031f6e5db9528270f695d495a3ea2c 100644 (file)
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -50,7 +50,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf

index edc669a1904006d4152d8d81118ae10b7a70f782..9400fbcaf549cbbb99c89f1a83e6711bdc6a1976 100644 (file)
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf

index 937776026a2ea64b08848199bfa6269e63cf8442..3fc8e40bf512c9754524fbb78143e4f42a9c7721 100644 (file)
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf

index 37d5b40925beeff722ad57e1e3c892aa46cb0209..d9bddfae1497545e2b664c4dad2d4b9faa34173e 100644 (file)
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -48,7 +48,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf

index 1df167854d5e179eab0f701e735f597c61f11719..6bc99004a4f0a0085bd6485cfbb90f7679915e5c 100644 (file)
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -16,7 +16,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf

index 9d59e043e2525d5b9436a9d394ba26b796e12e4b..373ec805417d6e580ae9cd9276d7a63bc357c6d1 100644 (file)
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -19,7 +19,7 @@ user-session=mir
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf

index cc1e9f7b992ef064fab62d334b3eda980738fb60..02df79c23cf46e494a8464e744ba787e0e9b980a 100644 (file)
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -16,7 +16,7 @@ user-session=mir
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf

index da7c744491b71edefb14cba5fa4c75076497197e..d8d4f167a87c82240b03382b46709ee7e9ac575a 100644 (file)
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -16,7 +16,7 @@ have-config=false
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf

index 62ac596cc0341806565fa1af8f09395b255f9cba..9b066c1f898b7faed3017f372cf8d409941bb7ea 100644 (file)
--- a/tests/scripts/no-keyboard-layout.conf
+++ b/tests/scripts/no-keyboard-layout.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf

index 8d299eb47c1e204d4b023597878bb3e6db498009..89bc5a424cc2e9d498429784b333a94ede8eabf1 100644 (file)
--- a/tests/scripts/no-language.conf
+++ b/tests/scripts/no-language.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf

index 065f46416e209e239b6cd4d9457275943e254274..afc0c00fd3b7b556583e377957d166395d80b13f 100644 (file)
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -17,7 +17,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf

index 06e9b3a3f39d0fe57c19f761c47e133dd35a68bf..e23925d5c1196074f3d86c94017dc66b5c408191 100644 (file)
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -26,7 +26,7 @@ active=true
  #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf

index 99549baecc03cfe920cafb8d96d0542a8f1ce3a3..3a09a70fd000dd3d6581b459d02a5d59c473a3ed 100644 (file)
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -20,7 +20,7 @@ active=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf

index fba753b9d77c40f8238d4ade4d29875808b0adf0..bd685c2b4d21676a5ccaae4d3f518db50fecebf2 100644 (file)
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -16,7 +16,7 @@ disable-console-kit=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf

index 5115b3585821bd62f94186efe9cf820129ae1786..19e8772741d9b4d00df4240e491286927661beca 100644 (file)
--- a/tests/scripts/power-no-login1.conf
+++ b/tests/scripts/power-no-login1.conf
@@ -16,7 +16,7 @@ disable-login1=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf

index 71a71288ea7b4c534793b16be6bc71fa9e3881f4..e1cf0ebccb6b2fb1840ecb55030400e3d584b5bb 100644 (file)
--- a/tests/scripts/power-no-services.conf
+++ b/tests/scripts/power-no-services.conf
@@ -18,7 +18,7 @@ disable-login1=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf

index 27f6ca769e696dbad70e3acaa0096f08fbd64818..9477847f5efa19b4659400e540ca4f792a1ddf9c 100644 (file)
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf

index 0bcbda8679cd116d5b2593b656760f099a331adb..a0732ae9bdf56671f6aa58a6732601f25e80bd2d 100644 (file)
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -13,7 +13,7 @@
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf

index 50db06497ff5eaa5819bd6ffb52e455cda3dacb0..0c79af28ab0eebede5ecaa8f616043826daa0e36 100644 (file)
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -21,7 +21,7 @@ user-session=default
  #?SCRIPT-HOOK SESSION-SETUP
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf

index 0a3069e5069e1def6b2429ba2ce8a89be428038a..dc573bab1d880b6ea4e87ff8ed7d398261a2c552 100644 (file)
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -51,7 +51,7 @@ user-session=default
  #?SCRIPT-HOOK GREETER-SETUP
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf

index 557337cf5590151fcee10b57444fb928aee24fa1..53f5081ef4e808bd822c8406ffb01d7058a500cf 100644 (file)
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -33,7 +33,7 @@ user-session=default
  #?*XSERVER-0 INDICATE-READY
  #?XSERVER-0 INDICATE-READY
  #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -62,7 +62,7 @@ user-session=default
  #?*XSERVER-0 INDICATE-READY
  #?XSERVER-0 INDICATE-READY
  #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf

index 9f3a9d630ab83c201ce7a4a6139d6575d1d2d04d..a59bd4e0d02f4362182190a7c8a36e6cfc97afd0 100644 (file)
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf

index 304ba15e1387c4ad69e35985a820046bf12b0140..f6b23faa3bdc07e5b30e72e09eb9b6bf8d84e515 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
@@ -74,7 +74,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf

index 52df42486af148a45d5a4613b7a1bc3bb9b5f17a..366848c7b40a0546ea37235e6b083a4f8c56d005 100644 (file)
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf

index e84a51291f836b08242b342be827abd45dc4a42e..09ecc94761201786433e3fade9700981162c7001 100644 (file)
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -37,7 +37,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf

index 74dbc147a35210c5467ca52ef8d229363bd243fb..ea36a4afc1e0e121f16edf1e51dd7064190fbcf9 100644 (file)
--- a/tests/scripts/switch-to-user-existing.conf
+++ b/tests/scripts/switch-to-user-existing.conf
@@ -58,7 +58,7 @@ user-session=default
  #?XSERVER-2 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_SESSION_CLASS=greeter
  #?XSERVER-2 ACCEPT-CONNECT
  #?GREETER-X-2 CONNECT-XSERVER
  #?GREETER-X-2 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf

index 825d316c3467dc5e6134f0f80e260d63672b4208..f070eea6969a304d081c470e8b51f5d8f6d8fc8b 100644 (file)
--- a/tests/scripts/switch-to-user-logout-active.conf
+++ b/tests/scripts/switch-to-user-logout-active.conf
@@ -58,7 +58,7 @@ user-session=default
  #?XSERVER-1 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf

index a2d3c4e41a88fc33d8b6ef24b74c79af0c6974b8..e58596e6f07229ab5df255541399543829106364 100644 (file)
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -38,7 +38,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf

index 01a2b01e67338e77cf850b5cd90a006c2a253bd8..f831cde978864fbba99187bfa564eed60c5b0f9e 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -22,7 +22,7 @@ unity-compositor-command=unity-system-compositor --test
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf

index 4b847e9a45b79dde776063c0dfee523e32cc0c8e..d197d9fc11c7a1b49b67c02ff6ed56111f1fd93f 100644 (file)
--- a/tests/scripts/unity-compositor-fail-ready.conf
+++ b/tests/scripts/unity-compositor-fail-ready.conf
@@ -23,7 +23,7 @@ unity-compositor-timeout=1
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf

index 2edcdf520c9c9b32b11a49438fe3b5c22c0a6c03..25e6e45a6acc8b983cf43dba5587d6d619035370 100644 (file)
--- a/tests/scripts/unity-compositor-fail-start.conf
+++ b/tests/scripts/unity-compositor-fail-start.conf
@@ -23,7 +23,7 @@ type=unity
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf

index d1f3f9148d1b67d380f184c3e3cca3ff21d8f420..bf22505e4a3eca1588ae5948de0a77f773ac0fdf 100644 (file)
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -19,7 +19,7 @@ autologin-in-background=true
  #?*XSERVER-0 INDICATE-READY
  #?XSERVER-0 INDICATE-READY
  #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf

index 1e2b14d6331ffa643f93504455d237f3cb0af01e..7c1a28c62162172c80828d87ee8344e606288a2b 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -21,7 +21,7 @@ user-session=default
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf

index 608ca078afe0e3a85da245203a1af8003396958b..d3d462ba8826629b78500c5042c0ae2a264b6de5 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -13,7 +13,7 @@ user-session=mir
  #?*UNITY-SYSTEM-COMPOSITOR READY
  
  # Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?GREETER-MIR-0 CONNECT-TO-DAEMON
  #?GREETER-MIR-0 CONNECTED-TO-DAEMON
  
diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf

index 2edb71356bbfc14d3ef3fcf6454eca52dd00d7a8..a577faf01f0b65c73cca9462d30610772fc56533 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -13,7 +13,7 @@ user-session=default
  #?*UNITY-SYSTEM-COMPOSITOR READY
  
  # Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?GREETER-MIR-0 CONNECT-TO-DAEMON
  #?GREETER-MIR-0 CONNECTED-TO-DAEMON
  
diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf

index 3fe743ae8765fe686e054c3384ab47a3ae3e44dc..335214bff9112b7a50761412f9bb093c938e2a4d 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -21,7 +21,7 @@ user-session=mir
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf

index 7bd8981d3f4641fa530ab20cd466e372208de146..e78994d974eb75dfed0919491c8dc649f46f29ef 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -45,7 +45,7 @@ user-session=default
  #?LOGIN1 LOCK-SESSION
  
  # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-1 ACCEPT-CONNECT
  #?GREETER-X-1 CONNECT-XSERVER
  #?GREETER-X-1 CONNECT-TO-DAEMON
@@ -78,7 +78,7 @@ user-session=default
  #?XSERVER-2 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-2 ACCEPT-CONNECT
  #?GREETER-X-2 CONNECT-XSERVER
  #?GREETER-X-2 CONNECT-TO-DAEMON
diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf

index bffc1f060b8a0df7a0b4321b7b38365fe0d5df7e..7267ab666447734f99866e5ea96041c72dcab8e5 100644 (file)
--- a/tests/scripts/upstart-login.conf
+++ b/tests/scripts/upstart-login.conf
@@ -21,7 +21,7 @@ report-events=true
  #?INIT -q emit login-session-start DISPLAY_MANAGER=lightdm
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf

index 5c87285a279ef7416804b0358827a168a2a92a84..d1fbcefac39bd15b5d86c42009b1acb906be9357 100644 (file)
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -19,7 +19,7 @@ user-session=default
  # (fails to start session for invalid user)
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf

index 71d84757c93318e9a7eb0181e9c736dcd5b13c2e..ea9c90db85fde65baf205ede0915b475caf8cf1a 100644 (file)
--- a/tests/scripts/users.conf
+++ b/tests/scripts/users.conf
@@ -19,7 +19,7 @@ log-user-changes=true
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf

index 3c4ad3926a478311e223351f45efb3c441152c70..351437e0b00d290bd20cc665b732018cef87a36e 100644 (file)
--- a/tests/scripts/vnc-command.conf
+++ b/tests/scripts/vnc-command.conf
@@ -32,7 +32,7 @@ command=Xvnc -option
  #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
  
  # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf

index 4fdfeed8e1eea22a955e376301c9bdaadbee876d..0a418e933c1b77af49ea1058c897471f3a09d986 100644 (file)
--- a/tests/scripts/vnc-dimensions.conf
+++ b/tests/scripts/vnc-dimensions.conf
@@ -34,7 +34,7 @@ depth=16
  #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
  
  # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf

index d3b0ee139c7777238c2715d050b507ec90f2da23..2c28afabec43982bdca98b15afd2edb0c3dbc900 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -36,7 +36,7 @@ user-session=default
  #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
  
  # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf

index 937ba913f6ae071cba6ec0283aaee64923a434dc..f7ce29f26313c6541632f06cfc025c5ad3235bd5 100644 (file)
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -35,7 +35,7 @@ user-session=default
  #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
  
  # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf

index c2e38df555381d365c287b08299013a5d4b0ad13..bd3fe14fefb93af06ae20e885854c9a793f9c396 100644 (file)
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -33,7 +33,7 @@ user-session=default
  #?XSERVER-98 ACCEPT-CONNECT
  
  # Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START
+#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
  #?XSERVER-98 ACCEPT-CONNECT
  #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
  #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf

index 9dac617f46f89c8e35fab23fd99707f6715e974c..2a75def125ae63d8c51842457dbd9297f783bbf7 100644 (file)
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -33,7 +33,7 @@ user-session=default
  #?XSERVER-98 ACCEPT-CONNECT
  
  # Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START
+#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
  #?XSERVER-98 ACCEPT-CONNECT
  #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
  #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf

index e18e1dcdb5294b4cebe18293716e0f8b7db9dcc1..6be9903685d7e43606f93b3fcbf57f3247bc7c6c 100644 (file)
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -17,7 +17,7 @@ xserver-share=false
  #?XSERVER-0 ACCEPT-CONNECT
  
  # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
  #?XSERVER-0 ACCEPT-CONNECT
  #?GREETER-X-0 CONNECT-XSERVER
  #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c

index d970abb61f04fcfbf00bf3c1499632bfc16d920f..332ded960de63ba6d85ed5239df807ef05e4730d 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -299,7 +299,7 @@ user_removed_cb (LightDMUserList *user_list, LightDMUser *user)
  int
  main (int argc, char **argv)
  {
-    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *mir_socket, *mir_vt, *mir_id;
+    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class, *mir_socket, *mir_vt, *mir_id;
      GString *status_text;
  
  #if !defined(GLIB_VERSION_2_36)
@@ -310,6 +310,7 @@ main (int argc, char **argv)
      xdg_seat = getenv ("XDG_SEAT");
      xdg_vtnr = getenv ("XDG_VTNR");
      xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+    xdg_session_class = getenv ("XDG_SESSION_CLASS");
      mir_socket = getenv ("MIR_SOCKET");
      mir_vt = getenv ("MIR_SERVER_VT");
      mir_id = getenv ("MIR_ID");
@@ -342,6 +343,8 @@ main (int argc, char **argv)
          g_string_append_printf (status_text, " XDG_VTNR=%s", xdg_vtnr);
      if (xdg_session_cookie)
          g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+    if (xdg_session_class)
+        g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
      if (mir_vt > 0)
          g_string_append_printf (status_text, " MIR_SERVER_VT=%s", mir_vt);
      status_notify (status_text->str);
diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter

index eee8575a46120a05e3c2da139ef859fec240aa26..f8e5c3738836e5701ae6e70426387d15a4bcaaad 100755 (executable)
--- a/tests/src/test-python-greeter
+++ b/tests/src/test-python-greeter
@@ -13,6 +13,7 @@ display = os.getenv ('DISPLAY');
  xdg_seat = os.getenv ('XDG_SEAT');
  xdg_vtnr = os.getenv ('XDG_VTNR');
  xdg_session_cookie = os.getenv ('XDG_SESSION_COOKIE');
+xdg_session_class = os.getenv ('XDG_SESSION_CLASS');
  if display is not None:
      if display.startswith (':'):
          greeter_id = 'GREETER-X-%s' % display[1:]
@@ -196,6 +197,8 @@ if xdg_vtnr is not None:
      status_text += ' XDG_VTNR=%s' % xdg_vtnr
  if xdg_session_cookie is not None:
      status_text += ' XDG_SESSION_COOKIE=%s' % xdg_session_cookie
+if xdg_session_class is not None:
+    status_text += ' XDG_SESSION_CLASS=%s' % xdg_session_class
  status_notify (status_text)
  
  config = GLib.KeyFile ()
diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp

index 99e2ef7b182373acefeeaf43ad6ee91adbcf228a..3d24e13fde7a161c9490a787d5d009c27ccf447c 100644 (file)
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -243,7 +243,7 @@ request_cb (const gchar *request)
  int
  main(int argc, char *argv[])
  {
-    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie;
+    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class;
      GString *status_text;   
  
  #if !defined(GLIB_VERSION_2_36)
@@ -254,6 +254,7 @@ main(int argc, char *argv[])
      xdg_seat = getenv ("XDG_SEAT");
      xdg_vtnr = getenv ("XDG_VTNR");
      xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+    xdg_session_class = getenv ("XDG_SESSION_CLASS");
      if (display)
      {
          if (display[0] == ':')
@@ -279,6 +280,8 @@ main(int argc, char *argv[])
          g_string_append_printf (status_text, " XDG_VTNR=%s", xdg_vtnr);
      if (xdg_session_cookie)
          g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+    if (xdg_session_class)
+        g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
      status_notify (status_text->str);
      g_string_free (status_text, TRUE);
  
diff --git a/tests/src/test-session.c b/tests/src/test-session.c

index 14ce0146a7bb7d2df47a2f3bf1d547e216a89c3b..fd0741dc9b3a969155343b27d9be6bb52ed04f46 100644 (file)
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -202,7 +202,7 @@ request_cb (const gchar *request)
  int
  main (int argc, char **argv)
  {
-    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *desktop_session, *mir_socket, *mir_vt, *mir_id;
+    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *xdg_session_class, *desktop_session, *mir_socket, *mir_vt, *mir_id;
      GString *status_text;
      int fd, open_max;
  
@@ -211,6 +211,7 @@ main (int argc, char **argv)
      xdg_vtnr = getenv ("XDG_VTNR");
      xdg_current_desktop = getenv ("XDG_CURRENT_DESKTOP");
      xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+    xdg_session_class = getenv ("XDG_SESSION_CLASS");
      desktop_session = getenv ("DESKTOP_SESSION");
      mir_socket = getenv ("MIR_SOCKET");
      mir_vt = getenv ("MIR_SERVER_VT");
@@ -260,6 +261,8 @@ main (int argc, char **argv)
          g_string_append_printf (status_text, " XDG_CURRENT_DESKTOP=%s", xdg_current_desktop);
      if (xdg_session_cookie)
          g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+    if (xdg_session_class)
+        g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
      if (desktop_session)
          g_string_append_printf (status_text, " DESKTOP_SESSION=%s", desktop_session);
      if (mir_vt > 0)
author	Robert Ancell <robert.ancell@canonical.com>
	Mon, 21 Oct 2013 22:43:11 +0000 (11:43 +1300)
committer	Robert Ancell <robert.ancell@canonical.com>
	Mon, 21 Oct 2013 22:43:11 +0000 (11:43 +1300)
src/seat.c		patch \| blob \| history
src/session-child.c		patch \| blob \| history
src/session.c		patch \| blob \| history
tests/scripts/autologin-guest-fail-setup-script.conf		patch \| blob \| history
tests/scripts/autologin-guest-in-background.conf		patch \| blob \| history
tests/scripts/autologin-guest-logout.conf		patch \| blob \| history
tests/scripts/autologin-guest-timeout.conf		patch \| blob \| history
tests/scripts/autologin-in-background.conf		patch \| blob \| history
tests/scripts/autologin-invalid-session.conf		patch \| blob \| history
tests/scripts/autologin-invalid-user.conf		patch \| blob \| history
tests/scripts/autologin-logout.conf		patch \| blob \| history
tests/scripts/autologin-new-authtok.conf		patch \| blob \| history
tests/scripts/autologin-password.conf		patch \| blob \| history
tests/scripts/autologin-session-crash.conf		patch \| blob \| history
tests/scripts/autologin-session-error.conf		patch \| blob \| history
tests/scripts/autologin-timeout-in-background.conf		patch \| blob \| history
tests/scripts/autologin-timeout.conf		patch \| blob \| history
tests/scripts/autologin-xserver-crash.conf		patch \| blob \| history
tests/scripts/cancel-authentication.conf		patch \| blob \| history
tests/scripts/change-authentication.conf		patch \| blob \| history
tests/scripts/crash-authenticate.conf		patch \| blob \| history
tests/scripts/cred-error.conf		patch \| blob \| history
tests/scripts/cred-expired.conf		patch \| blob \| history
tests/scripts/cred-unavail.conf		patch \| blob \| history
tests/scripts/dbus.conf		patch \| blob \| history
tests/scripts/denied.conf		patch \| blob \| history
tests/scripts/expired.conf		patch \| blob \| history
tests/scripts/greeter-allow-guest.conf		patch \| blob \| history
tests/scripts/greeter-default-session.conf		patch \| blob \| history
tests/scripts/greeter-fail-start.conf		patch \| blob \| history
tests/scripts/greeter-hide-users.conf		patch \| blob \| history
tests/scripts/greeter-show-manual-login.conf		patch \| blob \| history
tests/scripts/greeter-show-remote-login.conf		patch \| blob \| history
tests/scripts/greeter-wrapper.conf		patch \| blob \| history
tests/scripts/greeter-xserver-crash.conf		patch \| blob \| history
tests/scripts/keyboard-layout.conf		patch \| blob \| history
tests/scripts/language-no-accounts-service.conf		patch \| blob \| history
tests/scripts/language.conf		patch \| blob \| history
tests/scripts/lock-seat-console-kit.conf		patch \| blob \| history
tests/scripts/lock-seat-return-session-console-kit.conf		patch \| blob \| history
tests/scripts/lock-seat-return-session.conf		patch \| blob \| history
tests/scripts/lock-seat.conf		patch \| blob \| history
tests/scripts/lock-session-no-password.conf		patch \| blob \| history
tests/scripts/lock-session-return-session.conf		patch \| blob \| history
tests/scripts/lock-session.conf		patch \| blob \| history
tests/scripts/login-crash-authenticate.conf		patch \| blob \| history
tests/scripts/login-guest-disabled.conf		patch \| blob \| history
tests/scripts/login-guest-fail-setup-script.conf		patch \| blob \| history
tests/scripts/login-guest-logout.conf		patch \| blob \| history
tests/scripts/login-guest-no-setup-script.conf		patch \| blob \| history
tests/scripts/login-guest.conf		patch \| blob \| history
tests/scripts/login-info-prompt.conf		patch \| blob \| history
tests/scripts/login-invalid-session.conf		patch \| blob \| history
tests/scripts/login-invalid-user.conf		patch \| blob \| history
tests/scripts/login-logout.conf		patch \| blob \| history
tests/scripts/login-long-password.conf		patch \| blob \| history
tests/scripts/login-long-username.conf		patch \| blob \| history
tests/scripts/login-manual-previous-session.conf		patch \| blob \| history
tests/scripts/login-manual-remember-session.conf		patch \| blob \| history
tests/scripts/login-manual.conf		patch \| blob \| history
tests/scripts/login-multi-info-prompt.conf		patch \| blob \| history
tests/scripts/login-multi-prompt.conf		patch \| blob \| history
tests/scripts/login-new-authtok.conf		patch \| blob \| history
tests/scripts/login-no-password.conf		patch \| blob \| history
tests/scripts/login-pam.conf		patch \| blob \| history
tests/scripts/login-pick-session.conf		patch \| blob \| history
tests/scripts/login-previous-session.conf		patch \| blob \| history
tests/scripts/login-remember-session.conf		patch \| blob \| history
tests/scripts/login-remote-session.conf		patch \| blob \| history
tests/scripts/login-session-crash.conf		patch \| blob \| history
tests/scripts/login-two-factor.conf		patch \| blob \| history
tests/scripts/login-wrong-password.conf		patch \| blob \| history
tests/scripts/login-xserver-crash.conf		patch \| blob \| history
tests/scripts/login.conf		patch \| blob \| history
tests/scripts/mir-autologin.conf		patch \| blob \| history
tests/scripts/mir-session.conf		patch \| blob \| history
tests/scripts/no-config.conf		patch \| blob \| history
tests/scripts/no-keyboard-layout.conf		patch \| blob \| history
tests/scripts/no-language.conf		patch \| blob \| history
tests/scripts/open-file-descriptors.conf		patch \| blob \| history
tests/scripts/plymouth-active-vt.conf		patch \| blob \| history
tests/scripts/plymouth-inactive-vt.conf		patch \| blob \| history
tests/scripts/power-no-console-kit.conf		patch \| blob \| history
tests/scripts/power-no-login1.conf		patch \| blob \| history
tests/scripts/power-no-services.conf		patch \| blob \| history
tests/scripts/power.conf		patch \| blob \| history
tests/scripts/restart-authentication.conf		patch \| blob \| history
tests/scripts/script-hook-fail-session-setup.conf		patch \| blob \| history
tests/scripts/script-hooks.conf		patch \| blob \| history
tests/scripts/session-stderr-backup.conf		patch \| blob \| history
tests/scripts/switch-to-greeter-new-session.conf		patch \| blob \| history
tests/scripts/switch-to-greeter-return-session-logout.conf		patch \| blob \| history
tests/scripts/switch-to-greeter-return-session.conf		patch \| blob \| history
tests/scripts/switch-to-greeter.conf		patch \| blob \| history
tests/scripts/switch-to-user-existing.conf		patch \| blob \| history
tests/scripts/switch-to-user-logout-active.conf		patch \| blob \| history
tests/scripts/switch-to-user.conf		patch \| blob \| history
tests/scripts/unity-compositor-command.conf		patch \| blob \| history
tests/scripts/unity-compositor-fail-ready.conf		patch \| blob \| history
tests/scripts/unity-compositor-fail-start.conf		patch \| blob \| history
tests/scripts/unity-compositor-next-session.conf		patch \| blob \| history
tests/scripts/unity-login.conf		patch \| blob \| history
tests/scripts/unity-mir-greeter-mir-session.conf		patch \| blob \| history
tests/scripts/unity-mir-greeter-x-session.conf		patch \| blob \| history
tests/scripts/unity-mir-session-x-greeter.conf		patch \| blob \| history
tests/scripts/unity-switch.conf		patch \| blob \| history
tests/scripts/upstart-login.conf		patch \| blob \| history
tests/scripts/user-renamed-invalid.conf		patch \| blob \| history
tests/scripts/users.conf		patch \| blob \| history
tests/scripts/vnc-command.conf		patch \| blob \| history
tests/scripts/vnc-dimensions.conf		patch \| blob \| history
tests/scripts/vnc-login.conf		patch \| blob \| history
tests/scripts/vnc-open-file-descriptors.conf		patch \| blob \| history
tests/scripts/xdmcp-server-login.conf		patch \| blob \| history
tests/scripts/xdmcp-server-open-file-descriptors.conf		patch \| blob \| history
tests/scripts/xserver-no-share.conf		patch \| blob \| history
tests/src/test-gobject-greeter.c		patch \| blob \| history
tests/src/test-python-greeter		patch \| blob \| history
tests/src/test-qt-greeter.cpp		patch \| blob \| history
tests/src/test-session.c		patch \| blob \| history