summaryrefslogtreecommitdiff
path: root/tests/src/X.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/src/X.c')
-rw-r--r--tests/src/X.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/src/X.c b/tests/src/X.c
index 937d7979..cd4511b8 100644
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -31,6 +31,9 @@ static gboolean listen_tcp = TRUE;
/* TRUE if we allow Unix connections */
static gboolean listen_unix = TRUE;
+/* Configuration to use */
+static gchar *config_file = NULL;
+
/* Configuration layout to use */
static gchar *layout = NULL;
@@ -263,6 +266,11 @@ main (int argc, char **argv)
{
display_number = atoi (arg + 1);
}
+ else if (strcmp (arg, "-config") == 0)
+ {
+ config_file = argv[i+1];
+ i++;
+ }
else if (strcmp (arg, "-layout") == 0)
{
layout = argv[i+1];
@@ -348,6 +356,7 @@ main (int argc, char **argv)
{
g_printerr ("Unrecognized option: %s\n"
"Use: %s [:<display>] [option]\n"
+ "-config file Specify a configuration file\n"
"-layout name Specify the ServerLayout section name\n"
"-auth file Select authorization file\n"
"-nolisten protocol Don't listen on protocol\n"
@@ -377,6 +386,8 @@ main (int argc, char **argv)
status_text = g_string_new ("");
g_string_printf (status_text, "%s START", id);
+ if (config_file)
+ g_string_append_printf (status_text, " CONFIG=%s", config_file);
if (layout)
g_string_append_printf (status_text, " LAYOUT=%s", layout);
if (vt_number >= 0)