Expose docker test server as an internal config to all modules

Before testserver becomes a stable feature, let's keep testserver.prf in
"mkspecs/features/unsupported". The test server's shared files will be
stored in "mkspecs/features/data/testserver".

Because the path of testserver has been changed, all the tests relying
on the docker servers should be updated as well.

Change-Id: Id2494d2b58ee2a9522d99ae61c6236021506b876
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

11 files changed, 11 insertions, 12 deletions

diff --git a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
index bdd9d4eb7e..c722100ead 100644
--- a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
+++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
@@ -5,5 +5,5 @@ SOURCES  += tst_qabstractnetworkcache.cpp
 
 TESTDATA += tests/*
 
+CONFIG += unsupported/testserver
 QT_TEST_SERVER_LIST = apache2
-include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
diff --git a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 69a4a50144..84e6f857a1 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -5,6 +5,5 @@ requires(qtConfig(private_tests))
 
 QT = core-private network-private testlib
 
+CONFIG += unsupported/testserver
 QT_TEST_SERVER_LIST = apache2
-include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
-
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index 9d36352abc..4cc1f6431e 100644
--- a/tests/auto/network/access/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
@@ -15,5 +15,5 @@ TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \
 
 !android:!winrt: TEST_HELPER_INSTALLS = ../echo/echo
 
+CONFIG += unsupported/testserver
 QT_TEST_SERVER_LIST = vsftpd apache2 ftp-proxy danted squid
-include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
index 492bb6aa8d..63f41f4eb7 100644
--- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
+++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
@@ -12,6 +12,6 @@ QT = core-private network-private testlib
 
 # TODO: For now linux-only, because cyrus is linux-only atm ...
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = squid danted cyrus apache2
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }
diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
index ca9e44873c..243eab9480 100644
--- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
@@ -14,6 +14,6 @@ requires(qtConfig(private_tests))
 
 # Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = danted apache2 cyrus
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }
diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
index ac4ed9a989..de02fb032d 100644
--- a/tests/auto/network/socket/qtcpserver/test/test.pro
+++ b/tests/auto/network/socket/qtcpserver/test/test.pro
@@ -19,6 +19,6 @@ MOC_DIR=tmp
 
 # Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = danted cyrus squid ftp-proxy
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }
diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro
index 29d9414b03..05699bbe4e 100644
--- a/tests/auto/network/socket/qtcpsocket/test/test.pro
+++ b/tests/auto/network/socket/qtcpsocket/test/test.pro
@@ -18,6 +18,6 @@ win32 {
 
 # Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = danted squid apache2 ftp-proxy vsftpd iptables cyrus
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }
diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro
index 0fdb97ba27..969e4d72cf 100644
--- a/tests/auto/network/socket/qudpsocket/test/test.pro
+++ b/tests/auto/network/socket/qudpsocket/test/test.pro
@@ -20,6 +20,6 @@ TARGET = tst_qudpsocket
 
 # Only on Linux until 'echo' has been added to docker-compose-for-{windows,macOS}.yml and tested
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = danted echo
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }
diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
index 03fbe89002..51fcff9a8d 100644
--- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
+++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
@@ -22,6 +22,6 @@ requires(qtConfig(private_tests))
 # DOCKERTODO: it's 'linux' because it requires cyrus, which
 # is linux-only for now ...
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = squid danted cyrus apache2 echo
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 3e3ebeb358..8585a3c861 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -20,6 +20,6 @@ requires(qtConfig(private_tests))
 
 # DOCKERTODO: linux, docker is disabled on macOS/Windows.
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = squid danted
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 1ad42b309e..158ecbee37 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -19,6 +19,6 @@ requires(qtConfig(private_tests))
 
 #DOCKERTODO Linux, docker is disabled on macOS and Windows.
 linux {
+    CONFIG += unsupported/testserver
     QT_TEST_SERVER_LIST = squid danted
-    include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri)
 }