diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-09-16 14:50:18 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-17 00:11:04 +0000 |
| commit | 0aa4b33b92da6a95d29caee62e4ac5e4c53a84ff (patch) | |
| tree | 3a822608b4e76718657439fafb0784f230e1167a /tests/auto/network/socket | |
| parent | 7aacc8144e7da6b1ec48ab7c1e5c431d78c99c5f (diff) | |
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>
Diffstat (limited to 'tests/auto/network/socket')
5 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 8afcdc3376..5b4a9d0195 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -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>: diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index 0b2430c81a..e46257c123 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -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>: diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt index ae345b99f4..4d328ebddb 100644 --- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt @@ -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>: diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index a1a6dc172a..3b4bd856a3 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -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: diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt index a2fa36b078..3da08a0e72 100644 --- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt @@ -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>: |