Regenerate tests/auto/network/ssl

Change-Id: Ib05f4e3c8dea934ce48776fdd50305f7c98c1adb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-11-12 17:59:36 +01:00
parent 164d8c35b3
commit 0d62567f0b
14 changed files with 27 additions and 77 deletions

View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qasn1element
GUI
SOURCES
tst_qasn1element.cpp
LIBRARIES
@ -13,6 +12,3 @@ add_qt_test(tst_qasn1element
PUBLIC_LIBRARIES
Qt::Network
)
#### Keys ignored in scope 1:.:.:qasn1element.pro:<TRUE>:
# CONFIG = "testcase"

View File

@ -8,7 +8,6 @@
list(APPEND test_data "certs")
add_qt_test(tst_qdtls
GUI
SOURCES
tst_qdtls.cpp
LIBRARIES
@ -18,9 +17,6 @@ add_qt_test(tst_qdtls
TESTDATA ${test_data}
)
#### Keys ignored in scope 1:.:.:qdtls.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################

View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qdtlscookie
GUI
SOURCES
tst_qdtlscookie.cpp
LIBRARIES
@ -14,9 +13,6 @@ add_qt_test(tst_qdtlscookie
Qt::Network
)
#### Keys ignored in scope 1:.:.:qdtlscookie.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################

View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qocsp
GUI
SOURCES
tst_qocsp.cpp
LIBRARIES
@ -14,9 +13,6 @@ add_qt_test(tst_qocsp
Qt::Network
)
#### Keys ignored in scope 1:.:.:qocsp.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################

View File

@ -5,12 +5,8 @@
#####################################################################
add_qt_test(tst_qpassworddigestor
GUI
SOURCES
tst_qpassworddigestor.cpp
PUBLIC_LIBRARIES
Qt::Network
)
#### Keys ignored in scope 1:.:.:qpassworddigestor.pro:<TRUE>:
# CONFIG = "testcase"

View File

@ -5,39 +5,27 @@
#####################################################################
# Collect test data
file(GLOB test_data_glob
LIST_DIRECTORIES true
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"certificates/*")
certificates/*)
list(APPEND test_data ${test_data_glob})
file(GLOB test_data_glob
LIST_DIRECTORIES true
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"more-certificates/*")
more-certificates/*)
list(APPEND test_data ${test_data_glob})
file(GLOB test_data_glob
LIST_DIRECTORIES true
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"verify-certs/*")
verify-certs/*)
list(APPEND test_data ${test_data_glob})
file(GLOB test_data_glob
LIST_DIRECTORIES true
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"pkcs12/*")
pkcs12/*)
list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qsslcertificate
GUI
SOURCES
tst_qsslcertificate.cpp
PUBLIC_LIBRARIES
Qt::Network
TESTDATA ${test_data}
)
#### Keys ignored in scope 1:.:.:qsslcertificate.pro:<TRUE>:
# CONFIG = "testcase"

View File

@ -5,16 +5,12 @@
#####################################################################
add_qt_test(tst_qsslcipher
GUI
SOURCES
tst_qsslcipher.cpp
PUBLIC_LIBRARIES
Qt::Network
)
#### Keys ignored in scope 1:.:.:qsslcipher.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################

View File

@ -5,12 +5,8 @@
#####################################################################
add_qt_test(tst_qssldiffiehellmanparameters
GUI
SOURCES
tst_qssldiffiehellmanparameters.cpp
PUBLIC_LIBRARIES
Qt::Network
)
#### Keys ignored in scope 1:.:.:qssldiffiehellmanparameters.pro:<TRUE>:
# CONFIG = "testcase" "parallel_test"

View File

@ -5,12 +5,8 @@
#####################################################################
add_qt_test(tst_qsslellipticcurve
GUI
SOURCES
tst_qsslellipticcurve.cpp
PUBLIC_LIBRARIES
Qt::Network
)
#### Keys ignored in scope 1:.:.:qsslellipticcurve.pro:<TRUE>:
# CONFIG = "testcase"

View File

@ -5,16 +5,12 @@
#####################################################################
add_qt_test(tst_qsslerror
GUI
SOURCES
tst_qsslerror.cpp
PUBLIC_LIBRARIES
Qt::Network
)
#### Keys ignored in scope 1:.:.:qsslerror.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################

View File

@ -5,21 +5,16 @@
#####################################################################
# Collect test data
file(GLOB test_data_glob
LIST_DIRECTORIES true
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"keys/*")
keys/*)
list(APPEND test_data ${test_data_glob})
file(GLOB test_data_glob
LIST_DIRECTORIES true
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"rsa-*.pem")
rsa-*.pem)
list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qsslkey
GUI
SOURCES
tst_qsslkey.cpp
PUBLIC_LIBRARIES
@ -27,9 +22,6 @@ add_qt_test(tst_qsslkey
TESTDATA ${test_data}
)
#### Keys ignored in scope 1:.:.:qsslkey.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################

View File

@ -1,5 +1,9 @@
# Generated from qsslsocket.pro.
if(NOT QT_FEATURE_private_tests)
return()
endif()
#####################################################################
## tst_qsslsocket Test:
#####################################################################
@ -8,7 +12,6 @@
list(APPEND test_data "certs")
add_qt_test(tst_qsslsocket
GUI
SOURCES
tst_qsslsocket.cpp
DEFINES
@ -22,7 +25,7 @@ add_qt_test(tst_qsslsocket
)
#### Keys ignored in scope 1:.:.:qsslsocket.pro:<TRUE>:
# CONFIG = "testcase"
# _REQUIREMENTS = "qtConfig(private_tests)"
## Scopes:
#####################################################################
@ -34,5 +37,4 @@ add_qt_test(tst_qsslsocket
# DESTDIR = "release"
#### Keys ignored in scope 5:.:.:qsslsocket.pro:LINUX:
# CONFIG = "unsupported/testserver"
# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" "echo"

View File

@ -1,11 +1,14 @@
# Generated from qsslsocket_onDemandCertificates_member.pro.
if(NOT QT_FEATURE_private_tests)
return()
endif()
#####################################################################
## tst_qsslsocket_onDemandCertificates_member Test:
#####################################################################
add_qt_test(tst_qsslsocket_onDemandCertificates_member
GUI
SOURCES
tst_qsslsocket_onDemandCertificates_member.cpp
DEFINES
@ -18,7 +21,7 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_member
)
#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_member.pro:<TRUE>:
# CONFIG = "testcase"
# _REQUIREMENTS = "qtConfig(private_tests)"
# testcase.timeout = "300"
## Scopes:
@ -31,5 +34,4 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_member
# DESTDIR = "release"
#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_member.pro:LINUX:
# CONFIG = "unsupported/testserver"
# QT_TEST_SERVER_LIST = "squid" "danted"

View File

@ -1,11 +1,14 @@
# Generated from qsslsocket_onDemandCertificates_static.pro.
if(NOT QT_FEATURE_private_tests)
return()
endif()
#####################################################################
## tst_qsslsocket_onDemandCertificates_static Test:
#####################################################################
add_qt_test(tst_qsslsocket_onDemandCertificates_static
GUI
SOURCES
tst_qsslsocket_onDemandCertificates_static.cpp
DEFINES
@ -18,7 +21,7 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_static
)
#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_static.pro:<TRUE>:
# CONFIG = "testcase"
# _REQUIREMENTS = "qtConfig(private_tests)"
## Scopes:
#####################################################################
@ -30,5 +33,4 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_static
# DESTDIR = "release"
#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_static.pro:LINUX:
# CONFIG = "unsupported/testserver"
# QT_TEST_SERVER_LIST = "squid" "danted"