Make tests use Xorg 1.17 by default

10 files changed, 13 insertions, 19 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 27b6b538..6262a78e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -35,8 +35,8 @@ TESTS = \
 	test-autologin-timeout-gobject \
 	test-autologin-guest-timeout-gobject \
 	test-xserver-config \
+	test-allow-tcp \
 	test-allow-tcp-xorg-1.16 \
-	test-allow-tcp-xorg-1.17 \    
 	test-change-authentication \
 	test-restart-authentication \
 	test-cancel-authentication-gobject \
@@ -173,8 +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 \
@@ -375,8 +375,8 @@ EXTRA_DIST = \
 	scripts/additional-config-priority.conf \
 	scripts/additional-system-config.conf \
 	scripts/additional-system-config-priority.conf \
+	scripts/allow-tcp.conf \
 	scripts/allow-tcp-xorg-1.16.conf \
-	scripts/allow-tcp-xorg-1.17.conf \    
 	scripts/audit-autologin.conf \
 	scripts/autologin.conf \
 	scripts/autologin-guest.conf \
@@ -592,8 +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/allow-tcp-xorg-1.17.conf b/tests/scripts/allow-tcp.conf
index 14b59151..c304d315 100644
--- a/tests/scripts/allow-tcp-xorg-1.17.conf
+++ b/tests/scripts/allow-tcp.conf
@@ -1,10 +1,7 @@
 #
-# Check can enable TCP listening in X.Org >= 1.17 (default is listening disabled)
+# Check can enable TCP listening
 #
 
-[test-xserver-config]
-version=1.17.0
-
 [Seat:*]
 autologin-user=have-password1
 user-session=default
diff --git a/tests/scripts/xdmcp-client-xorg-1.17.conf b/tests/scripts/xdmcp-client.conf
index 584004e6..f29bb41c 100644
--- a/tests/scripts/xdmcp-client-xorg-1.17.conf
+++ b/tests/scripts/xdmcp-client.conf
@@ -1,10 +1,7 @@
 #
-# Check can run a local XDMCP client in X.Org >= 1.17 (default is listening disabled)
+# Check can run a local XDMCP client
 #
 
-[test-xserver-config]
-version=1.17.0
-
 [Seat:*]
 xdmcp-manager=127.0.0.1
 
diff --git a/tests/scripts/xremote-autologin.conf b/tests/scripts/xremote-autologin.conf
index 251a418c..45ebaea9 100644
--- a/tests/scripts/xremote-autologin.conf
+++ b/tests/scripts/xremote-autologin.conf
@@ -9,7 +9,7 @@ user-session=default
 xserver-display-number=98
 
 # Start a remote X server to use
-#?*START-XSERVER ARGS=":98"
+#?*START-XSERVER ARGS=":98 -listen tcp"
 #?XSERVER-98 START LISTEN-TCP
 
 #?*START-DAEMON
diff --git a/tests/scripts/xremote-login.conf b/tests/scripts/xremote-login.conf
index bdc81a91..e8af8311 100644
--- a/tests/scripts/xremote-login.conf
+++ b/tests/scripts/xremote-login.conf
@@ -8,7 +8,7 @@ user-session=default
 xserver-display-number=98
 
 # Start a remote X server to use
-#?*START-XSERVER ARGS=":98"
+#?*START-XSERVER ARGS=":98 -listen tcp"
 #?XSERVER-98 START LISTEN-TCP
 
 #?*START-DAEMON
diff --git a/tests/src/X.c b/tests/src/X.c
index cd4511b8..5621e3b7 100644
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -249,7 +249,7 @@ main (int argc, char **argv)
 
     xorg_version = g_key_file_get_string (config, "test-xserver-config", "version", NULL);
     if (!xorg_version)
-        xorg_version = g_strdup ("1.16.0");
+        xorg_version = g_strdup ("1.17.0");
     tokens = g_strsplit (xorg_version, ".", -1);
     xorg_version_major = g_strv_length (tokens) > 0 ? atoi (tokens[0]) : 0;
     xorg_version_minor = g_strv_length (tokens) > 1 ? atoi (tokens[1]) : 0;
diff --git a/tests/test-allow-tcp b/tests/test-allow-tcp
new file mode 100755
index 00000000..d314e7d0
--- /dev/null
+++ b/tests/test-allow-tcp
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner allow-tcp test-gobject-greeter
diff --git a/tests/test-allow-tcp-xorg-1.17 b/tests/test-allow-tcp-xorg-1.17
deleted file mode 100755
index db2a80b1..00000000
--- a/tests/test-allow-tcp-xorg-1.17
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner allow-tcp-xorg-1.17 test-gobject-greeter
diff --git a/tests/test-xdmcp-client b/tests/test-xdmcp-client
new file mode 100755
index 00000000..fe34787e
--- /dev/null
+++ b/tests/test-xdmcp-client
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner xdmcp-client test-gobject-greeter
diff --git a/tests/test-xdmcp-client-xorg-1.17 b/tests/test-xdmcp-client-xorg-1.17
deleted file mode 100755
index b3d41fc7..00000000
--- a/tests/test-xdmcp-client-xorg-1.17
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner xdmcp-client-xorg-1.17 test-gobject-greeter