diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2011-10-18 14:16:04 +1100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2011-10-18 14:16:04 +1100 |
| commit | 8f7550920c0af935fb9bdf18c8a356ce4887b06c (patch) | |
| tree | 19fa630a7ec4cc7b6f686407a91d689a48caf697 | |
| parent | c2c5b14d7ecc920a2737de15b2a9062447b8d49e (diff) | |
| download | lightdm-git-8f7550920c0af935fb9bdf18c8a356ce4887b06c.tar.gz | |
Rename test-xserver to X (works because it's in the path before the main X server)
| -rw-r--r-- | tests/src/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/src/X.c (renamed from tests/src/test-xserver.c) | 0 | ||||
| -rw-r--r-- | tests/src/test-runner.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am index d0b92f65..524dcd97 100644 --- 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 plymouth +noinst_PROGRAMS = test-runner X test-gobject-greeter test-guest-account test-session test-script-hook plymouth if COMPILE_LIBLIGHTDM_QT noinst_PROGRAMS += test-qt-greeter @@ -14,14 +14,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 index bfb041fa..bfb041fa 100644 --- a/tests/src/test-xserver.c +++ b/tests/src/X.c diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index a9edb60e..1fbcd139 100644 --- 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) || @@ -595,7 +595,6 @@ main (int argc, char **argv) if (config_path) g_string_append_printf (command_line, " --config %s", config_path); g_string_append (command_line, " --test-mode"); - 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="); |