Merge with trunk

[sojka/lightdm.git] / tests / src / X.c

diff --git a/tests/src/X.c b/tests/src/X.c
index dfc41d3648d8e2273518e49e8c56b7d2f2acdd58..1240f7b0abaa69329a75440e9ecf514a6531c84e 100644 (file)
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -195,6 +195,7 @@ main (int argc, char **argv)
     gboolean do_xdmcp = FALSE;
     guint xdmcp_port = 0;
     gchar *xdmcp_host = NULL;
+    gchar *mir_id = NULL;
     gchar *lock_filename;
     int lock_file;
 
@@ -259,10 +260,20 @@ main (int argc, char **argv)
         {
             /* Ignore VT args */
         }
-        else if (g_str_has_prefix (arg, "-novtswitch"))
+        else if (strcmp (arg, "-novtswitch") == 0)
         {
             /* Ignore VT args */
         }
+        else if (strcmp (arg, "-mir") == 0)
+        {
+            mir_id = argv[i+1];
+            i++;
+        }
+        else if (strcmp (arg, "-mirSocket") == 0)
+        {
+            /* FIXME */
+            i++;
+        }
         else
         {
             g_printerr ("Unrecognized option: %s\n"
@@ -274,6 +285,8 @@ main (int argc, char **argv)
                         "-query host-name       Contact named host for XDMCP\n"
                         "-broadcast             Broadcast for XDMCP\n"
                         "-port port-num         UDP port number to send messages to\n"
+                        "-mir id                Mir ID to use\n"
+                        "-mirSocket name        Mir socket to use\n"
                         "vtxx                   Use virtual terminal xx instead of the next available\n",
                         arg, argv[0]);
             return EXIT_FAILURE;
@@ -284,7 +297,10 @@ main (int argc, char **argv)
     g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL);
     g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL);
 
-    status_notify ("XSERVER-%d START", display_number);
+    if (mir_id != NULL)
+        status_notify ("XSERVER-%d START MIR-ID=%s", display_number, mir_id);
+    else
+        status_notify ("XSERVER-%d START", display_number);
 
     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);