1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: explicitly bundle the OpenSSL libs for tests

Browse Source 
Use the new argument to bundle the OpenSSL prebuilt libararies so that
ssl operations are actually tested at runtime.

Task-number: QTBUG-110025
Change-Id: I0d73fed463a1724a9e0ee84ba603aa2ff1bc649b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit f667445006c52f26103540ae18964a0015a297db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2023-06-12 14:25:27 +03:00 committed by Qt Cherry-pick Bot
parent 72821e7ebd
commit 75abc39672
17 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/network/access/http2/CMakeLists.txt
View File

@ -14,4 +14,5 @@ qt_internal_add_test(tst_http2
Qt::Network Qt::Network
Qt::NetworkPrivate Qt::NetworkPrivate
Qt::TestPrivate Qt::TestPrivate
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
View File

@ -29,6 +29,7 @@ qt_internal_add_test(tst_qnetworkreply
Qt::NetworkPrivate Qt::NetworkPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
QT_TEST_SERVER_LIST "vsftpd" "apache2" "ftp-proxy" "danted" "squid" QT_TEST_SERVER_LIST "vsftpd" "apache2" "ftp-proxy" "danted" "squid"
BUNDLE_ANDROID_OPENSSL_LIBS
) )
add_dependencies(tst_qnetworkreply echo) add_dependencies(tst_qnetworkreply echo)

1
tests/auto/network/ssl/qasn1element/CMakeLists.txt
View File

@ -11,4 +11,5 @@ qt_internal_add_test(tst_qasn1element
LIBRARIES LIBRARIES
Qt::Network Qt::Network
Qt::NetworkPrivate Qt::NetworkPrivate
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qdtls/CMakeLists.txt
View File

@ -14,4 +14,5 @@ qt_internal_add_test(tst_qdtls
LIBRARIES LIBRARIES
Qt::NetworkPrivate Qt::NetworkPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qdtlscookie
tst_qdtlscookie.cpp tst_qdtlscookie.cpp
LIBRARIES LIBRARIES
Qt::NetworkPrivate Qt::NetworkPrivate
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qocsp/CMakeLists.txt
View File

@ -11,6 +11,7 @@ qt_internal_add_test(tst_qocsp
LIBRARIES LIBRARIES
Qt::Network Qt::Network
Qt::NetworkPrivate Qt::NetworkPrivate
BUNDLE_ANDROID_OPENSSL_LIBS
) )
qt_internal_extend_target(tst_qocsp CONDITION QT_FEATURE_openssl_linked qt_internal_extend_target(tst_qocsp CONDITION QT_FEATURE_openssl_linked

1
tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qpassworddigestor
tst_qpassworddigestor.cpp tst_qpassworddigestor.cpp
LIBRARIES LIBRARIES
Qt::Network Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
View File

@ -34,4 +34,5 @@ qt_internal_add_test(tst_qsslcertificate
LIBRARIES LIBRARIES
Qt::Network Qt::Network
TESTDATA ${test_data} TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qsslcipher/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslcipher
tst_qsslcipher.cpp tst_qsslcipher.cpp
LIBRARIES LIBRARIES
Qt::Network Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qssldiffiehellmanparameters
tst_qssldiffiehellmanparameters.cpp tst_qssldiffiehellmanparameters.cpp
LIBRARIES LIBRARIES
Qt::Network Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslellipticcurve
tst_qsslellipticcurve.cpp tst_qsslellipticcurve.cpp
LIBRARIES LIBRARIES
Qt::Network Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qsslerror/CMakeLists.txt
View File

@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslerror
tst_qsslerror.cpp tst_qsslerror.cpp
LIBRARIES LIBRARIES
Qt::Network Qt::Network
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qsslkey/CMakeLists.txt
View File

@ -21,6 +21,7 @@ qt_internal_add_test(tst_qsslkey
LIBRARIES LIBRARIES
Qt::Network Qt::Network
TESTDATA ${test_data} TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
) )
qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked

1
tests/auto/network/ssl/qsslserver/CMakeLists.txt
View File

@ -19,4 +19,5 @@ qt_internal_add_test(tst_qsslserver
Qt::CorePrivate Qt::CorePrivate
Qt::NetworkPrivate Qt::NetworkPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qsslsocket/CMakeLists.txt
View File

@ -21,6 +21,7 @@ qt_internal_add_test(tst_qsslsocket
Qt::TestPrivate Qt::TestPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" "echo" QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" "echo"
BUNDLE_ANDROID_OPENSSL_LIBS
) )
qt_internal_extend_target(tst_qsslsocket CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked qt_internal_extend_target(tst_qsslsocket CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked

1
tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
View File

@ -16,4 +16,5 @@ qt_internal_add_test(tst_qsslsocket_onDemandCertificates_member
Qt::CorePrivate Qt::CorePrivate
Qt::NetworkPrivate Qt::NetworkPrivate
QT_TEST_SERVER_LIST "squid" "danted" QT_TEST_SERVER_LIST "squid" "danted"
BUNDLE_ANDROID_OPENSSL_LIBS
) )

1
tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
View File

@ -16,4 +16,5 @@ qt_internal_add_test(tst_qsslsocket_onDemandCertificates_static
Qt::CorePrivate Qt::CorePrivate
Qt::NetworkPrivate Qt::NetworkPrivate
QT_TEST_SERVER_LIST "squid" "danted" QT_TEST_SERVER_LIST "squid" "danted"
BUNDLE_ANDROID_OPENSSL_LIBS
) )