diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2014-03-17 16:37:55 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2014-03-17 16:37:55 +1300 |
| commit | 142fc8ebea036e1f678f35b593c31e2400595c65 (patch) | |
| tree | 4444cf9795fa6ce7658f798613b25b216667e288 | |
| parent | 90de1bcdac97e600bb901304da333a1cc78b76f8 (diff) | |
| download | lightdm-142fc8ebea036e1f678f35b593c31e2400595c65.tar.gz | |
Add a basic test to confirm multi-seat works
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/scripts/multi-seat.conf | 42 | ||||
| -rwxr-xr-x | tests/test-multi-seat | 2 |
3 files changed, 46 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 327b05c8..86d58fe3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -164,6 +164,7 @@ TESTS = \ test-gobject-power-no-services \ test-open-file-descriptors \ test-xdmcp-server-open-file-descriptors \ + test-multi-seat \ test-mir-autologin \ test-mir-greeter \ test-mir-session \ @@ -418,6 +419,7 @@ EXTRA_DIST = \ scripts/mir-session.conf \ scripts/mir-session-compositor-crash.conf \ scripts/mir-session-crash.conf \ + scripts/multi-seat.conf \ scripts/no-accounts-service.conf \ scripts/no-config.conf \ scripts/no-console-kit.conf \ diff --git a/tests/scripts/multi-seat.conf b/tests/scripts/multi-seat.conf new file mode 100644 index 00000000..f674cc0d --- /dev/null +++ b/tests/scripts/multi-seat.conf @@ -0,0 +1,42 @@ +# +# Check can run two seats at once +# + +[Seat:0] +xdg-seat=seat0 + +[Seat:1] +xdg-seat=seat1 + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# Seat0 starts +#?XSERVER-0 START VT=7 SEAT=seat0 +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON + +# Seat1 starts (can't use VTs) +#?XSERVER-1 START SEAT=seat1 +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 START XDG_SEAT=seat1 XDG_SESSION_CLASS=greeter +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON + +# Cleanup +#?*STOP-DAEMON +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/test-multi-seat b/tests/test-multi-seat new file mode 100755 index 00000000..46bcb60c --- /dev/null +++ b/tests/test-multi-seat @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner multi-seat test-gobject-greeter |