# Greeter starts
#?GREETER-MIR START VT=7
-#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-MIR CONNECT-TO-DAEMON
#?GREETER-MIR CONNECTED-TO-DAEMON
#?*GREETER-MIR START-SESSION
# Session starts
-#?SESSION-MIR START VT=8 USER=have-password1
+#?SESSION-MIR START VT=8 USER=no-password1
+
+# Switch to session
+#?VT ACTIVATE VT=8
# Greeter quits once session ready
#?GREETER-MIR TERMINATE SIGNAL=15
# Greeter starts
#?GREETER-MIR START VT=7
-#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-MIR CONNECT-TO-DAEMON
#?GREETER-MIR CONNECTED-TO-DAEMON
#?*GREETER-MIR AUTHENTICATE USERNAME=no-password1
#?GREETER-MIR AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
#?*GREETER-MIR START-SESSION
-#?GREETER-MIR TERMINATE SIGNAL=15
# X server starts for session
#?XSERVER-0 START VT=8
#?XSERVER-0 INDICATE-READY
#?XSERVER-0 ACCEPT-CONNECT
+# Switch to session
+#?VT ACTIVATE VT=8
+
+# Greeter terminates
+#?GREETER-MIR TERMINATE SIGNAL=15
+
# Session starts
-#?SESSION-X-0 START USER=have-password1
+#?SESSION-X-0 START USER=no-password1
#?XSERVER-0 ACCEPT-CONNECT
#?SESSION-X-0 CONNECT-XSERVER
#?*GREETER-X-0 START-SESSION
# Session starts
-#?SESSION-MIR START VT=8 USER=have-password1
+#?SESSION-MIR START VT=8 USER=no-password1
+
+# Switch to session
+#?VT ACTIVATE VT=8
# Greeter quits once session ready
#?GREETER-X-0 TERMINATE SIGNAL=15
[SeatDefaults]
type=unity
-user-session=default
+user-session=mir
#?RUNNER DAEMON-START
#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
# Log into account with a password
-#?*GREETER-MIR-0 AUTHENTICATE USERNAME=have-password1
-#?GREETER-MIR-0 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-MIR-0 RESPOND TEXT="password"
-#?GREETER-MIR-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-MIR-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-MIR-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
#?*GREETER-MIR-0 START-SESSION
# Session starts
-#?SESSION-MIR-1 START USER=have-password1
+#?SESSION-MIR-1 START USER=no-password1
# System compositor switches to session
#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
int
main (int argc, char **argv)
{
- gchar *display, *mir_socket, *mir_id;
+ gchar *display, *mir_socket, *mir_vt, *mir_id;
+ GString *status_text;
#if !defined(GLIB_VERSION_2_36)
g_type_init ();
display = getenv ("DISPLAY");
mir_socket = getenv ("MIR_SERVER_FILE");
+ mir_vt = getenv ("MIR_SERVER_VT");
mir_id = getenv ("MIR_ID");
if (display)
{
}
else if (mir_id)
greeter_id = g_strdup_printf ("GREETER-MIR-%s", mir_id);
- else if (mir_socket)
+ else if (mir_socket || mir_vt)
greeter_id = g_strdup ("GREETER-MIR");
else
greeter_id = g_strdup ("GREETER-?");
status_connect (request_cb);
- status_notify ("%s START", greeter_id);
+ status_text = g_string_new ("");
+ g_string_printf (status_text, "%s START", greeter_id);
+ if (mir_vt > 0)
+ g_string_append_printf (status_text, " VT=%s", mir_vt);
+ status_notify (status_text->str);
+ g_string_free (status_text, TRUE);
config = g_key_file_new ();
g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL);
int
main (int argc, char **argv)
{
- gchar *display, *mir_socket, *mir_id;
+ gchar *display, *mir_socket, *mir_vt, *mir_id;
+ GString *status_text;
int fd, open_max;
display = getenv ("DISPLAY");
mir_socket = getenv ("MIR_SERVER_FILE");
+ mir_vt = getenv ("MIR_SERVER_VT");
mir_id = getenv ("MIR_ID");
if (display)
{
}
else if (mir_id)
session_id = g_strdup_printf ("SESSION-MIR-%s", mir_id);
- else if (mir_socket)
+ else if (mir_socket || mir_vt)
session_id = g_strdup ("SESSION-MIR");
else
session_id = g_strdup ("SESSION-?");
status_connect (request_cb);
+ status_text = g_string_new ("");
+ g_string_printf (status_text, "%s START", session_id);
+ if (mir_vt > 0)
+ g_string_append_printf (status_text, " VT=%s", mir_vt);
if (argc > 1)
- status_notify ("%s START NAME=%s USER=%s", session_id, argv[1], getenv ("USER"));
- else
- status_notify ("%s START USER=%s", session_id, getenv ("USER"));
+ g_string_append_printf (status_text, " NAME=%s", argv[1]);
+ g_string_append_printf (status_text, " USER=%s", getenv ("USER"));
+ status_notify (status_text->str);
+ g_string_free (status_text, TRUE);
config = g_key_file_new ();
g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL);
#!/bin/sh
-./src/dbus-env ./src/test-runner mir-session-x-greeter test-mir-greeter
+./src/dbus-env ./src/test-runner mir-session-x-greeter test-gobject-greeter