From f667445006c52f26103540ae18964a0015a297db Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 12 Jun 2023 14:25:27 +0300 Subject: [PATCH] Android: explicitly bundle the OpenSSL libs for tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the new argument to bundle the OpenSSL prebuilt libararies so that ssl operations are actually tested at runtime. Task-number: QTBUG-110025 Pick-to: 6.6 6.5 Change-Id: I0d73fed463a1724a9e0ee84ba603aa2ff1bc649b Reviewed-by: Mårten Nordheim --- tests/auto/network/access/http2/CMakeLists.txt | 1 + tests/auto/network/access/qnetworkreply/test/CMakeLists.txt | 1 + tests/auto/network/ssl/qasn1element/CMakeLists.txt | 1 + tests/auto/network/ssl/qdtls/CMakeLists.txt | 1 + tests/auto/network/ssl/qdtlscookie/CMakeLists.txt | 1 + tests/auto/network/ssl/qocsp/CMakeLists.txt | 1 + tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt | 1 + tests/auto/network/ssl/qsslcertificate/CMakeLists.txt | 1 + tests/auto/network/ssl/qsslcipher/CMakeLists.txt | 1 + .../auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt | 1 + tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt | 1 + tests/auto/network/ssl/qsslerror/CMakeLists.txt | 1 + tests/auto/network/ssl/qsslkey/CMakeLists.txt | 1 + tests/auto/network/ssl/qsslserver/CMakeLists.txt | 1 + tests/auto/network/ssl/qsslsocket/CMakeLists.txt | 1 + .../ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt | 1 + .../ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt | 1 + 17 files changed, 17 insertions(+) diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt index 3ac73b79f6..92acfbe08c 100644 --- a/tests/auto/network/access/http2/CMakeLists.txt +++ b/tests/auto/network/access/http2/CMakeLists.txt @@ -14,4 +14,5 @@ qt_internal_add_test(tst_http2 Qt::Network Qt::NetworkPrivate Qt::TestPrivate + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index 583b250932..fa353b2769 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -29,6 +29,7 @@ qt_internal_add_test(tst_qnetworkreply Qt::NetworkPrivate TESTDATA ${test_data} QT_TEST_SERVER_LIST "vsftpd" "apache2" "ftp-proxy" "danted" "squid" + BUNDLE_ANDROID_OPENSSL_LIBS ) add_dependencies(tst_qnetworkreply echo) diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt index 1175802035..2a5e027b24 100644 --- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt +++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt @@ -11,4 +11,5 @@ qt_internal_add_test(tst_qasn1element LIBRARIES Qt::Network Qt::NetworkPrivate + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt index a3e2237dec..113afdbce7 100644 --- a/tests/auto/network/ssl/qdtls/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt @@ -14,4 +14,5 @@ qt_internal_add_test(tst_qdtls LIBRARIES Qt::NetworkPrivate TESTDATA ${test_data} + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt index 8f55a0de20..b727c1233f 100644 --- a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt @@ -10,4 +10,5 @@ qt_internal_add_test(tst_qdtlscookie tst_qdtlscookie.cpp LIBRARIES Qt::NetworkPrivate + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt index 337da9a88c..2563d0024a 100644 --- a/tests/auto/network/ssl/qocsp/CMakeLists.txt +++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt @@ -11,6 +11,7 @@ qt_internal_add_test(tst_qocsp LIBRARIES Qt::Network Qt::NetworkPrivate + BUNDLE_ANDROID_OPENSSL_LIBS ) qt_internal_extend_target(tst_qocsp CONDITION QT_FEATURE_openssl_linked diff --git a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt index a2a065496f..827eb9dac3 100644 --- a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt +++ b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt @@ -10,4 +10,5 @@ qt_internal_add_test(tst_qpassworddigestor tst_qpassworddigestor.cpp LIBRARIES Qt::Network + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt index 633b7d5e39..4b07a173b5 100644 --- a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt @@ -34,4 +34,5 @@ qt_internal_add_test(tst_qsslcertificate LIBRARIES Qt::Network TESTDATA ${test_data} + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt index b748e5019d..d233cf6512 100644 --- a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt @@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslcipher tst_qsslcipher.cpp LIBRARIES Qt::Network + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt index 74008ce99a..04948def3a 100644 --- a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt +++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt @@ -10,4 +10,5 @@ qt_internal_add_test(tst_qssldiffiehellmanparameters tst_qssldiffiehellmanparameters.cpp LIBRARIES Qt::Network + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt index 1be59f5739..9e5f11e8fb 100644 --- a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt @@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslellipticcurve tst_qsslellipticcurve.cpp LIBRARIES Qt::Network + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslerror/CMakeLists.txt b/tests/auto/network/ssl/qsslerror/CMakeLists.txt index 77fcf6f832..80846d1b53 100644 --- a/tests/auto/network/ssl/qsslerror/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslerror/CMakeLists.txt @@ -10,4 +10,5 @@ qt_internal_add_test(tst_qsslerror tst_qsslerror.cpp LIBRARIES Qt::Network + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt index 60d6adc13c..a2b3489f86 100644 --- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt @@ -21,6 +21,7 @@ qt_internal_add_test(tst_qsslkey LIBRARIES Qt::Network TESTDATA ${test_data} + BUNDLE_ANDROID_OPENSSL_LIBS ) qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked diff --git a/tests/auto/network/ssl/qsslserver/CMakeLists.txt b/tests/auto/network/ssl/qsslserver/CMakeLists.txt index 584a031622..e7ec2abb76 100644 --- a/tests/auto/network/ssl/qsslserver/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslserver/CMakeLists.txt @@ -19,4 +19,5 @@ qt_internal_add_test(tst_qsslserver Qt::CorePrivate Qt::NetworkPrivate TESTDATA ${test_data} + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt index df644e79c4..f0e4761720 100644 --- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt @@ -21,6 +21,7 @@ qt_internal_add_test(tst_qsslsocket Qt::TestPrivate TESTDATA ${test_data} 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 diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt index 2201f38fd7..88d0c16e66 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt @@ -16,4 +16,5 @@ qt_internal_add_test(tst_qsslsocket_onDemandCertificates_member Qt::CorePrivate Qt::NetworkPrivate QT_TEST_SERVER_LIST "squid" "danted" + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt index d338237532..10a7ee6eda 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt @@ -16,4 +16,5 @@ qt_internal_add_test(tst_qsslsocket_onDemandCertificates_static Qt::CorePrivate Qt::NetworkPrivate QT_TEST_SERVER_LIST "squid" "danted" + BUNDLE_ANDROID_OPENSSL_LIBS )