Regenerate tests/auto/network/ssl

Change-Id: Ib05f4e3c8dea934ce48776fdd50305f7c98c1adb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

14 files changed, 27 insertions, 77 deletions

diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
index 0db03204e0..70738d6525 100644
--- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt
+++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt
index 2618a95cc7..ce0f029f05 100644
--- a/tests/auto/network/ssl/qdtls/CMakeLists.txt
+++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt
@@ -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:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
index ee4a7c7676..1df4de743d 100644
--- a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
+++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
@@ -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:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt
index 598317fdce..4bace58e44 100644
--- a/tests/auto/network/ssl/qocsp/CMakeLists.txt
+++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt
@@ -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:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
index 92cacf385c..e0997fc26e 100644
--- a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
+++ b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
index b0a7996c45..1509c2e809 100644
--- a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
index f41dd8ee1c..44e0e78220 100644
--- a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
@@ -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:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
index f4a7184559..f6785a6736 100644
--- a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
+++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
index 0196eed00e..4df88ff305 100644
--- a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/network/ssl/qsslerror/CMakeLists.txt b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
index ab3e836f26..e8b07ab049 100644
--- a/tests/auto/network/ssl/qsslerror/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
@@ -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:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
index 316fa5565d..8b16325559 100644
--- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
@@ -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:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
index 050abfd5a3..601165d55d 100644
--- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
index 7a8053cca2..b3d8626da9 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
index 9aa741ac68..b71d0a4f8b 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
@@ -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"