summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2013-09-05 20:30:57 +1200
committerRobert Ancell <robert.ancell@canonical.com>2013-09-05 20:30:57 +1200
commite96d6dfb0e93b12b202065db1fac45131e49048c (patch)
tree4bf401c1ce764268e043ea32fa671318c567ba92 /tests
parentb7ad3adb1d3f0d0875ad9b54e43e858f309ebe45 (diff)
downloadlightdm-e96d6dfb0e93b12b202065db1fac45131e49048c.tar.gz
Quit test X server before starting main loop correctly
Diffstat (limited to 'tests')
-rw-r--r--tests/src/X.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/src/X.c b/tests/src/X.c
index fc886a54..aae852a7 100644
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -387,18 +387,18 @@ main (int argc, char **argv)
" and start again.\n", display_number, lock_path);
g_free (lock_path);
lock_path = NULL;
- quit (EXIT_FAILURE);
+ return EXIT_FAILURE;
}
pid_string = g_strdup_printf ("%10ld", (long) getpid ());
if (write (lock_file, pid_string, strlen (pid_string)) < 0)
{
g_warning ("Error writing PID file: %s", strerror (errno));
- quit (EXIT_FAILURE);
+ return EXIT_FAILURE;
}
g_free (pid_string);
if (!x_server_start (xserver))
- quit (EXIT_FAILURE);
+ return EXIT_FAILURE;
/* Enable XDMCP */
if (do_xdmcp)