diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-16 14:53:38 +0100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-16 14:53:38 +0100 |
| commit | 0c56ac59b67c01f80e51baaeb83a76d21b1dc01d (patch) | |
| tree | d708c9d9ae8dc0ef54ca9fa723dc97d6ecef22f0 | |
| parent | 2a0d58aaba0438ae457d9c289765e57009810789 (diff) | |
| download | lightdm-0c56ac59b67c01f80e51baaeb83a76d21b1dc01d.tar.gz | |
Text XDMCP clients in both X.Org 1.16 and X.Org 1.17
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/scripts/xdmcp-client-xorg-1.16.conf (renamed from tests/scripts/xdmcp-client.conf) | 5 | ||||
| -rw-r--r-- | tests/scripts/xdmcp-client-xorg-1.17.conf | 30 | ||||
| -rwxr-xr-x | tests/test-xdmcp-client | 2 | ||||
| -rwxr-xr-x | tests/test-xdmcp-client-xorg-1.16 | 2 | ||||
| -rwxr-xr-x | tests/test-xdmcp-client-xorg-1.17 | 2 |
6 files changed, 42 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a96c77f1..27b6b538 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -173,7 +173,8 @@ TESTS = \ test-vnc-guest \ test-xremote-autologin \ test-xremote-login \ - test-xdmcp-client \ + test-xdmcp-client-xorg-1.16 \ + test-xdmcp-client-xorg-1.17 \ test-xdmcp-server-autologin \ test-xdmcp-server-login \ test-xdmcp-server-double-login \ @@ -591,7 +592,8 @@ EXTRA_DIST = \ scripts/xauthority.conf \ scripts/xdg-current-desktop.conf \ scripts/xdg-current-desktop-legacy.conf \ - scripts/xdmcp-client.conf \ + scripts/xdmcp-client-xorg-1.16.conf \ + scripts/xdmcp-client-xorg-1.17.conf \ scripts/xdmcp-server-autologin.conf \ scripts/xdmcp-server-double-login.conf \ scripts/xdmcp-server-guest.conf \ diff --git a/tests/scripts/xdmcp-client.conf b/tests/scripts/xdmcp-client-xorg-1.16.conf index f29bb41c..c41cb13e 100644 --- a/tests/scripts/xdmcp-client.conf +++ b/tests/scripts/xdmcp-client-xorg-1.16.conf @@ -1,7 +1,10 @@ # -# Check can run a local XDMCP client +# Check can run a local XDMCP client in X.Org < 1.17 (default is listening enabled) # +[test-xserver-config] +version=1.16.0 + [Seat:*] xdmcp-manager=127.0.0.1 diff --git a/tests/scripts/xdmcp-client-xorg-1.17.conf b/tests/scripts/xdmcp-client-xorg-1.17.conf new file mode 100644 index 00000000..584004e6 --- /dev/null +++ b/tests/scripts/xdmcp-client-xorg-1.17.conf @@ -0,0 +1,30 @@ +# +# Check can run a local XDMCP client in X.Org >= 1.17 (default is listening disabled) +# + +[test-xserver-config] +version=1.17.0 + +[Seat:*] +xdmcp-manager=127.0.0.1 + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 LISTEN-TCP SEAT=seat0 +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Starts sending XDMCP queries +#?*XSERVER-0 START-XDMCP +#?XSERVER-0 SEND-QUERY + +# Wait to check a greeter is not started +#?*WAIT + +# Cleanup +#?*STOP-DAEMON +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/test-xdmcp-client b/tests/test-xdmcp-client deleted file mode 100755 index fe34787e..00000000 --- a/tests/test-xdmcp-client +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner xdmcp-client test-gobject-greeter diff --git a/tests/test-xdmcp-client-xorg-1.16 b/tests/test-xdmcp-client-xorg-1.16 new file mode 100755 index 00000000..d6e2f56e --- /dev/null +++ b/tests/test-xdmcp-client-xorg-1.16 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner xdmcp-client-xorg-1.16 test-gobject-greeter diff --git a/tests/test-xdmcp-client-xorg-1.17 b/tests/test-xdmcp-client-xorg-1.17 new file mode 100755 index 00000000..b3d41fc7 --- /dev/null +++ b/tests/test-xdmcp-client-xorg-1.17 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner xdmcp-client-xorg-1.17 test-gobject-greeter |