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>
Ryan Chu
parent
713f77176e
commit
658f12d735
|
|
@ -102,7 +102,7 @@ isEmpty(TESTSERVER_VERSION) {
|
|||
# The environment variables passed to the docker-compose file
|
||||
TEST_ENV = 'MACHINE_IP=$(shell docker-machine ip qt-test-server)'
|
||||
TEST_ENV += 'TEST_DOMAIN=$$DNSDOMAIN'
|
||||
TEST_ENV += 'SHARED_DATA=$$PWD'
|
||||
TEST_ENV += 'SHARED_DATA=$$PWD/../data/testserver'
|
||||
TEST_CMD = env
|
||||
} else:equals(QMAKE_HOST.os, Windows) {
|
||||
# There is no docker bridge on Windows. It is impossible to ping a container.
|
||||
|
|
@ -116,7 +116,7 @@ isEmpty(TESTSERVER_VERSION) {
|
|||
# The environment variables passed to the docker-compose file
|
||||
TEST_ENV = '\$\$env:MACHINE_IP = docker-machine ip qt-test-server;'
|
||||
TEST_ENV += '\$\$env:TEST_DOMAIN = $$shell_quote(\"$$DNSDOMAIN\");'
|
||||
TEST_ENV += '\$\$env:SHARED_DATA = $$shell_quote(\"$$PWD\");'
|
||||
TEST_ENV += '\$\$env:SHARED_DATA = $$shell_quote(\"$$PWD/../data/testserver\");'
|
||||
|
||||
# Docker-compose CLI environment variables:
|
||||
# Enable path conversion from Windows-style to Unix-style in volume definitions.
|
||||
|
|
@ -129,7 +129,7 @@ isEmpty(TESTSERVER_VERSION) {
|
|||
$$dirname(_QMAKE_CONF_)/tests/testserver/docker-compose.yml
|
||||
# The environment variables passed to the docker-compose file
|
||||
TEST_ENV = 'TEST_DOMAIN=$$DNSDOMAIN'
|
||||
TEST_ENV += 'SHARED_DATA=$$PWD'
|
||||
TEST_ENV += 'SHARED_DATA=$$PWD/../data/testserver'
|
||||
TEST_CMD = env
|
||||
}
|
||||
!exists($$TESTSERVER_COMPOSE_FILE): error("Invalid TESTSERVER_COMPOSE_FILE specified")
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue