diff options
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/scripts/autologin.script | 1 | ||||
| -rw-r--r-- | tests/scripts/headless.conf | 1 | ||||
| -rw-r--r-- | tests/scripts/headless.script | 3 | ||||
| -rw-r--r-- | tests/scripts/login-gobject-invalid-user.script | 1 | ||||
| -rw-r--r-- | tests/scripts/login-gobject-wrong-password.script | 1 | ||||
| -rw-r--r-- | tests/scripts/login-gobject.script | 1 | ||||
| -rw-r--r-- | tests/src/test-runner.c | 2 | ||||
| -rwxr-xr-x | tests/test-headless | 2 |
9 files changed, 13 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ac537ce6..86b7b44f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = src TESTS = \ + test-headless \ test-autologin \ test-login-gobject \ test-login-gobject-wrong-password \ diff --git a/tests/scripts/autologin.script b/tests/scripts/autologin.script index 789d0936..67ce5663 100644 --- a/tests/scripts/autologin.script +++ b/tests/scripts/autologin.script @@ -1,3 +1,4 @@ +RUNNER DAEMON-START XSERVER :.* START XSERVER :.* ACCEPT-CONNECT SESSION START USER=alice diff --git a/tests/scripts/headless.conf b/tests/scripts/headless.conf new file mode 100644 index 00000000..dedc788b --- /dev/null +++ b/tests/scripts/headless.conf @@ -0,0 +1 @@ +[LightDM] diff --git a/tests/scripts/headless.script b/tests/scripts/headless.script new file mode 100644 index 00000000..722aaa80 --- /dev/null +++ b/tests/scripts/headless.script @@ -0,0 +1,3 @@ +RUNNER DAEMON-START +*STOP-DAEMON +RUNNER DAEMON-TERMINATE SIGNAL=15 diff --git a/tests/scripts/login-gobject-invalid-user.script b/tests/scripts/login-gobject-invalid-user.script index 9717b768..4d1f371a 100644 --- a/tests/scripts/login-gobject-invalid-user.script +++ b/tests/scripts/login-gobject-invalid-user.script @@ -1,3 +1,4 @@ +RUNNER DAEMON-START XSERVER :.* START XSERVER :.* ACCEPT-CONNECT GREETER START diff --git a/tests/scripts/login-gobject-wrong-password.script b/tests/scripts/login-gobject-wrong-password.script index f2af6b15..23fcca49 100644 --- a/tests/scripts/login-gobject-wrong-password.script +++ b/tests/scripts/login-gobject-wrong-password.script @@ -1,3 +1,4 @@ +RUNNER DAEMON-START XSERVER :.* START XSERVER :.* ACCEPT-CONNECT GREETER START diff --git a/tests/scripts/login-gobject.script b/tests/scripts/login-gobject.script index 72d106ea..fae91933 100644 --- a/tests/scripts/login-gobject.script +++ b/tests/scripts/login-gobject.script @@ -1,3 +1,4 @@ +RUNNER DAEMON-START XSERVER :.* START XSERVER :.* ACCEPT-CONNECT GREETER START diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index f37bba2e..91f60474 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -319,6 +319,8 @@ main (int argc, char **argv) } g_clear_error (&error); + check_status ("RUNNER DAEMON-START"); + g_child_watch_add (lightdm_pid, daemon_exit_cb, NULL); g_main_loop_run (loop); diff --git a/tests/test-headless b/tests/test-headless new file mode 100755 index 00000000..3e4a478e --- /dev/null +++ b/tests/test-headless @@ -0,0 +1,2 @@ +#!/bin/sh +PATH=`pwd`/src ./src/test-runner headless |