CMake Build: Add qtnetwork docker testserver support
qt_add_test supports now QT_TEST_SERVER_LIST, which will add the test servers as docker test fixtures. The docker server will be started before the test is run, and stopped after the test is run. Running the tests in parallel is not supported. Docker tests are currently only supported on Linux hosts. Task-number: QTBUG-85034 Change-Id: If3cefe05c5dec19c14b05d2fa8b01a0b6d95e259 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Cristian Adam
Alexandru Croitor
parent
7aacc8144e
commit
0aa4b33b92
@ -72,13 +72,80 @@ function(qt_add_manual_test target)
|
||||
|
||||
endfunction()
|
||||
|
||||
# This function will configure the fixture for the network tests that require docker network services
|
||||
# qmake counterpart: qtbase/mkspecs/features/unsupported/testserver.prf
|
||||
function(qt_internal_setup_docker_test_fixture name)
|
||||
# Only Linux is provisioned with docker at this time
|
||||
if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(QT_TEST_SERVER_LIST ${ARGN})
|
||||
set(DNSDOMAIN test-net.qt.local)
|
||||
|
||||
find_program(QT_DOCKER_COMPOSE docker-compose)
|
||||
if (NOT QT_DOCKER_COMPOSE)
|
||||
message(WARNING "docker-compose was not found. Docker network tests will not be run.")
|
||||
return()
|
||||
endif()
|
||||
if (NOT DEFINED QT_DOCKER_COMPOSE_VERSION)
|
||||
execute_process(COMMAND "${QT_DOCKER_COMPOSE}" --version OUTPUT_VARIABLE QT_DOCKER_COMPOSE_VERSION)
|
||||
string(REPLACE "\n" "" QT_DOCKER_COMPOSE_VERSION "${QT_DOCKER_COMPOSE_VERSION}")
|
||||
set(QT_DOCKER_COMPOSE_VERSION "${QT_DOCKER_COMPOSE_VERSION}" CACHE STRING "docker compose version")
|
||||
endif()
|
||||
|
||||
find_program(QT_DOCKER docker)
|
||||
if (NOT QT_DOCKER)
|
||||
message(WARNING "docker was not found. Docker network tests will not be run.")
|
||||
return()
|
||||
endif()
|
||||
if (NOT DEFINED QT_DOCKER_TEST_SERVER)
|
||||
execute_process(COMMAND "${QT_DOCKER}" images -aq "qt-test-server-*" OUTPUT_VARIABLE QT_DOCKER_TEST_SERVER)
|
||||
if (NOT QT_DOCKER_TEST_SERVER)
|
||||
message(WARNING
|
||||
"Docker image qt-test-server-* not found.\n"
|
||||
"Run the provisioning script (coin/provisioning/.../testserver/docker_testserver.sh) in advance\n"
|
||||
"Docker network tests will not be run.")
|
||||
return()
|
||||
endif()
|
||||
set(QT_DOCKER_TEST_SERVER "ON" CACHE BOOL "docker qt-test-server-* present")
|
||||
endif()
|
||||
|
||||
target_compile_definitions("${name}"
|
||||
PRIVATE
|
||||
QT_TEST_SERVER QT_TEST_SERVER_NAME QT_TEST_SERVER_DOMAIN=\"${DNSDOMAIN}\"
|
||||
)
|
||||
|
||||
set(TESTSERVER_COMPOSE_FILE "${QT_SOURCE_TREE}/tests/testserver/docker-compose-bridge-network.yml")
|
||||
|
||||
# Bring up test servers and make sure the services are ready.
|
||||
add_test(NAME ${name}-setup COMMAND
|
||||
"${QT_DOCKER_COMPOSE}" -f ${TESTSERVER_COMPOSE_FILE} up --build -d --force-recreate --timeout 1 ${QT_TEST_SERVER_LIST}
|
||||
)
|
||||
# Stop and remove test servers after testing.
|
||||
add_test(NAME ${name}-cleanup COMMAND
|
||||
"${QT_DOCKER_COMPOSE}" -f ${TESTSERVER_COMPOSE_FILE} down --timeout 1
|
||||
)
|
||||
|
||||
set_tests_properties(${name}-setup PROPERTIES FIXTURES_SETUP ${name}-docker)
|
||||
set_tests_properties(${name}-cleanup PROPERTIES FIXTURES_CLEANUP ${name}-docker)
|
||||
set_tests_properties(${name} PROPERTIES FIXTURES_REQUIRED ${name}-docker)
|
||||
|
||||
foreach(test_name ${name} ${name}-setup ${name}-cleanup)
|
||||
set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT "testserver=${QT_DOCKER_COMPOSE_VERSION}")
|
||||
set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT TEST_DOMAIN=${DNSDOMAIN})
|
||||
set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT "SHARED_DATA=${QT_SOURCE_TREE}/mkspecs/features/data/testserver")
|
||||
set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT SHARED_SERVICE=bridge-network)
|
||||
endforeach()
|
||||
|
||||
endfunction()
|
||||
|
||||
# This function creates a CMake test target with the specified name for use with CTest.
|
||||
function(qt_add_test name)
|
||||
qt_parse_all_arguments(arg "qt_add_test"
|
||||
"RUN_SERIAL;EXCEPTIONS;GUI;QMLTEST;CATCH;LOWDPI"
|
||||
"OUTPUT_DIRECTORY;WORKING_DIRECTORY;TIMEOUT;VERSION"
|
||||
"QML_IMPORTPATH;TESTDATA;${__default_private_args};${__default_public_args}" ${ARGN}
|
||||
"QML_IMPORTPATH;TESTDATA;QT_TEST_SERVER_LIST;${__default_private_args};${__default_public_args}" ${ARGN}
|
||||
)
|
||||
|
||||
if (NOT arg_OUTPUT_DIRECTORY)
|
||||
@ -191,6 +258,10 @@ function(qt_add_test name)
|
||||
endif()
|
||||
|
||||
add_test(NAME "${name}" COMMAND ${test_executable} ${extra_test_args} ${test_outputs} WORKING_DIRECTORY "${test_working_dir}")
|
||||
|
||||
if (arg_QT_TEST_SERVER_LIST)
|
||||
qt_internal_setup_docker_test_fixture(${name} ${arg_QT_TEST_SERVER_LIST})
|
||||
endif()
|
||||
endif()
|
||||
set_tests_properties("${name}" PROPERTIES RUN_SERIAL "${arg_RUN_SERIAL}" LABELS "${label}")
|
||||
if (arg_TIMEOUT)
|
||||
|
||||
@ -16,6 +16,7 @@ qt_add_test(tst_qabstractnetworkcache
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::Network
|
||||
TESTDATA ${test_data}
|
||||
QT_TEST_SERVER_LIST "apache2" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:qabstractnetworkcache.pro:<TRUE>:
|
||||
|
||||
@ -14,6 +14,7 @@ qt_add_test(tst_qhttpnetworkconnection
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
QT_TEST_SERVER_LIST "apache2" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:<TRUE>:
|
||||
|
||||
@ -28,6 +28,7 @@ qt_add_test(tst_qnetworkreply
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
TESTDATA ${test_data}
|
||||
QT_TEST_SERVER_LIST "vsftpd" "apache2" "ftp-proxy" "danted" "squid" # special case
|
||||
)
|
||||
|
||||
# Resources:
|
||||
|
||||
@ -16,6 +16,7 @@ qt_add_test(tst_qhttpsocketengine
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:<TRUE>:
|
||||
|
||||
@ -16,6 +16,7 @@ qt_add_test(tst_qsocks5socketengine
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
QT_TEST_SERVER_LIST "danted" "apache2" "cyrus" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:<TRUE>:
|
||||
|
||||
@ -10,6 +10,7 @@ qt_add_test(tst_qtcpserver
|
||||
../tst_qtcpserver.cpp
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::Network
|
||||
QT_TEST_SERVER_LIST "danted" "cyrus" "squid" "ftp-proxy" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
|
||||
|
||||
@ -11,6 +11,7 @@ qt_add_test(tst_qtcpsocket
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" # special case
|
||||
)
|
||||
|
||||
## Scopes:
|
||||
|
||||
@ -12,6 +12,7 @@ qt_add_test(tst_qudpsocket
|
||||
../../../../../shared
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::Network
|
||||
QT_TEST_SERVER_LIST "danted" "echo" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
|
||||
|
||||
@ -20,6 +20,7 @@ qt_add_test(tst_qsslsocket
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
TESTDATA ${test_data}
|
||||
QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" "echo" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:qsslsocket.pro:<TRUE>:
|
||||
|
||||
@ -16,6 +16,7 @@ qt_add_test(tst_qsslsocket_onDemandCertificates_member
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
QT_TEST_SERVER_LIST "squid" "danted" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_member.pro:<TRUE>:
|
||||
|
||||
@ -16,6 +16,7 @@ qt_add_test(tst_qsslsocket_onDemandCertificates_static
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::NetworkPrivate
|
||||
QT_TEST_SERVER_LIST "squid" "danted" # special case
|
||||
)
|
||||
|
||||
#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_static.pro:<TRUE>:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user