diff options
| -rw-r--r-- | tests/src/test-runner.c | 2 | ||||
| -rw-r--r-- | tests/src/test-xserver.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index 74b447b0..0ceff11c 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -128,8 +128,6 @@ open_unix_socket (const gchar *name) return s; } -// FIXME: Add timeout - static void run_commands () { diff --git a/tests/src/test-xserver.c b/tests/src/test-xserver.c index c3f067c3..48d3896c 100644 --- a/tests/src/test-xserver.c +++ b/tests/src/test-xserver.c @@ -986,16 +986,17 @@ main (int argc, char **argv) g_warning ("Error creating XDMCP socket: %s", error->message); quit (EXIT_FAILURE); } - - xdmcp_query_timer = g_timeout_add (2000, xdmcp_query_cb, NULL); } /* Indicate ready if parent process has requested it */ indicate_ready (); /* Send first query */ - if (xdmcp_query_timer) + if (do_xdmcp) + { + xdmcp_query_timer = g_timeout_add (2000, xdmcp_query_cb, NULL); xdmcp_query_cb (NULL); + } g_main_loop_run (loop); |