Rename test-xserver to X and remove --xserver-command option

diff --git a/.bzrignore b/.bzrignore
index b989b59732cf440b66c3fa8c7755ca22113b226b..4a16a5565d5d7cbcb88ca8f626334b8c40e301c6 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -65,6 +65,6 @@ tests/src/test-qt-greeter
 tests/src/test-runner
 tests/src/test-script-hook
 tests/src/test-session
-tests/src/test-xserver
+tests/src/X
 utils/lightdm-set-defaults
 utils/dm-tool

diff --git a/NEWS b/NEWS
index 4a90f6e02f57a5d85c9aace054c226eac679423f..c60228916b3f41b2af21faa74d0f4e98e5902873 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Overview of changes in lightdm 1.1.0
     * Switching to a user without a password bypasses the greeter
     * Use LD_PRELOAD to intercept system calls for testing
     * Removed the --passwd-file option as not required for testing anymore
+    * Rename test-xserver to X and remove --xserver-command option
 
 Overview of changes in lightdm 1.0.0
 

diff --git a/src/lightdm.c b/src/lightdm.c
index 9edd1d0dcb04dcafff34f3bceb45e5c0ade6afb0..63c98291a969d74d11ab6253bacfc0fdf900c945 100644 (file)
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -747,7 +747,6 @@ main (int argc, char **argv)
     gboolean explicit_config = FALSE;
     gboolean test_mode = FALSE;
     gchar *pid_path = "/var/run/lightdm.pid";
-    gchar *xserver_command = NULL;
     gchar *xsessions_dir = NULL;
     gchar *xgreeters_dir = NULL;
     gchar *greeter_session = NULL;
@@ -777,9 +776,6 @@ main (int argc, char **argv)
         { "pid-file", 0, 0, G_OPTION_ARG_STRING, &pid_path,
           /* Help string for command line --pid-file flag */
           N_("File to write PID into"), "FILE" },
-        { "xserver-command", 0, 0, G_OPTION_ARG_STRING, &xserver_command,
-          /* Help string for command line --xserver-command flag */
-          N_("Command to run X servers"), "COMMAND" },
         { "greeter-session", 0, 0, G_OPTION_ARG_STRING, &greeter_session,
           /* Help string for command line --greeter-session flag */
           N_("Greeter session"), "SESSION" },
@@ -989,9 +985,6 @@ main (int argc, char **argv)
     if (xgreeters_dir)
         config_set_string (config_get_instance (), "LightDM", "xgreeters-directory", xgreeters_dir);
     g_free (xgreeters_dir);
-    if (xserver_command)
-        config_set_string (config_get_instance (), "SeatDefaults", "xserver-command", xserver_command);
-    g_free (xserver_command);
     if (greeter_session)
         config_set_string (config_get_instance (), "SeatDefaults", "greeter-session", greeter_session);
     g_free (greeter_session);

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 814810cbe344e0b1f81752f47aa3c56b0395cdf2..23832c5aa6c05ab8c8c38f7151f0b18932e3cd2e 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = test-runner test-xserver test-gobject-greeter test-guest-account test-session test-script-hook initctl plymouth
+noinst_PROGRAMS = test-runner X test-gobject-greeter test-guest-account test-session test-script-hook initctl plymouth
 lib_LTLIBRARIES = libsystem.la
 
 libsystem_la_SOURCES = libsystem.c
@@ -19,14 +19,14 @@ test_runner_LDADD = \
        $(GLIB_LIBS) \
        $(GIO_LIBS)
 
-test_xserver_SOURCES = test-xserver.c status.c status.h
-test_xserver_CFLAGS = \
+X_SOURCES = X.c status.c status.h
+X_CFLAGS = \
        $(WARN_CFLAGS) \
        $(GOBJECT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GIO_UNIX_CFLAGS)
-test_xserver_LDADD = \
+X_LDADD = \
        $(GOBJECT_LIBS) \
        $(GLIB_LIBS) \
        $(GIO_LIBS) \

diff --git a/tests/src/test-xserver.c b/tests/src/X.c
similarity index 100%
rename from tests/src/test-xserver.c
rename to tests/src/X.c

diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index 2f61fe5ab2c979ca24860477a0cd6d902f324755..512929bd8f05580f2819434a577f44fcf71ce467 100644 (file)
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -287,7 +287,7 @@ run_commands ()
             xserver_args = g_hash_table_lookup (params, "ARGS");
             if (!xserver_args)
                 xserver_args = "";
-            command_line = g_strdup_printf ("%s/tests/src/test-xserver %s", BUILDDIR, xserver_args);
+            command_line = g_strdup_printf ("%s/tests/src/X %s", BUILDDIR, xserver_args);
 
             g_debug ("Run %s", command_line);
             if (!g_shell_parse_argv (command_line, NULL, &argv, &error) ||
@@ -606,7 +606,6 @@ main (int argc, char **argv)
         g_string_append (command_line, " --debug");
     if (config_path)
         g_string_append_printf (command_line, " --config %s", config_path);
-    g_string_append(command_line, " --xserver-command=test-xserver");
     if (greeter)
         g_string_append_printf (command_line, " --greeter-session=%s", greeter);
     g_string_append (command_line, " --session-wrapper=");