summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2020-09-16 14:50:18 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-09-17 00:11:04 +0000
commit0aa4b33b92da6a95d29caee62e4ac5e4c53a84ff (patch)
tree3a822608b4e76718657439fafb0784f230e1167a /tests/auto/network/ssl
parent7aacc8144e7da6b1ec48ab7c1e5c431d78c99c5f (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/ssl')
-rw-r--r--tests/auto/network/ssl/qsslsocket/CMakeLists.txt1
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt1
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt1
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
index 59ab6ff93a..d0307042f4 100644
--- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
@@ -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>:
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
index 9a1beaeb76..0d6b8a4c4a 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
@@ -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>:
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
index f8d6735c20..b17da05d86 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
@@ -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>: