diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-09-19 13:35:26 -0400 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-09-19 13:35:26 -0400 |
| commit | 5a5bf1928c56886260c7a1ffd969187d8674bd8e (patch) | |
| tree | 7b0f5a1dfbf4d2fd52348323b7618cada8d4a088 | |
| parent | 1fe5a20902ed2f3ed36fa344f9c1da67ea3ab2ac (diff) | |
| download | lightdm-5a5bf1928c56886260c7a1ffd969187d8674bd8e.tar.gz | |
Add regression test for surfaceflinger
| -rw-r--r-- | tests/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/data/sessions/surfaceflinger.desktop | 5 | ||||
| -rw-r--r-- | tests/scripts/surfaceflinger-autologin.conf | 18 | ||||
| -rw-r--r-- | tests/src/test-session.c | 2 | ||||
| -rwxr-xr-x | tests/test-surfaceflinger-autologin | 2 |
5 files changed, 30 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index e7d1e3e7..99c97b05 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -158,7 +158,8 @@ TESTS = \ test-unity-mir-greeter-x-session \ test-unity-mir-greeter-mir-session \ test-unity-mir-session-x-greeter \ - test-unity-xdg-seat + test-unity-xdg-seat \ + test-surfaceflinger-autologin # test-session-exit-error # test-greeter-no-exit @@ -283,6 +284,7 @@ EXTRA_DIST = \ data/sessions/default.desktop \ data/sessions/mir.desktop \ data/sessions/named.desktop \ + data/sessions/surfaceflinger.desktop \ scripts/0-additional.conf \ scripts/1-additional.conf \ scripts/additional-config.conf \ @@ -398,6 +400,7 @@ EXTRA_DIST = \ scripts/session-stderr.conf \ scripts/session-stderr-multi-write.conf \ scripts/session-stderr-backup.conf \ + scripts/surfaceflinger-autologin.conf \ scripts/switch-to-greeter.conf \ scripts/switch-to-greeter-new-session.conf \ scripts/switch-to-greeter-return-session.conf \ diff --git a/tests/data/sessions/surfaceflinger.desktop b/tests/data/sessions/surfaceflinger.desktop new file mode 100644 index 00000000..f9984ce1 --- /dev/null +++ b/tests/data/sessions/surfaceflinger.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Test Session +Comment=LightDM test Surfaceflinger session +Exec=test-session +X-LightDM-Session-Type=surfaceflinger diff --git a/tests/scripts/surfaceflinger-autologin.conf b/tests/scripts/surfaceflinger-autologin.conf new file mode 100644 index 00000000..487742a7 --- /dev/null +++ b/tests/scripts/surfaceflinger-autologin.conf @@ -0,0 +1,18 @@ +# +# Check can automatically log into a Surfaceflinger session +# + +[SeatDefaults] +type=surfaceflinger +autologin-user=have-password1 +user-session=surfaceflinger + +#?RUNNER DAEMON-START + +# Session starts (test session doesn't know it's in surfaceflinger) +#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 USER=have-password1 + +# Cleanup +#?*STOP-DAEMON +#?SESSION-UNKNOWN TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/src/test-session.c b/tests/src/test-session.c index 989f359e..e9733a83 100644 --- a/tests/src/test-session.c +++ b/tests/src/test-session.c @@ -226,7 +226,7 @@ main (int argc, char **argv) else if (mir_socket || mir_vt) session_id = g_strdup ("SESSION-MIR"); else - session_id = g_strdup ("SESSION-?"); + session_id = g_strdup ("SESSION-UNKNOWN"); open_fds = g_string_new (""); open_max = sysconf (_SC_OPEN_MAX); diff --git a/tests/test-surfaceflinger-autologin b/tests/test-surfaceflinger-autologin new file mode 100755 index 00000000..d668d022 --- /dev/null +++ b/tests/test-surfaceflinger-autologin @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner surfaceflinger-autologin test-gobject-greeter |