whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try fixing auto-tests that need resolving openssl symbols 

For the case of static builds. Also, remove somewhat funny comment
from the shared tlshelpers.h file.

Fixes: QTBUG-105046
Pick-to: 6.4 6.2
Change-Id: I2fd677a11b64df89c0ad0237e1014f5e80144c24
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Timur Pocheptsov 2022-12-01 13:00:54 +01:00
parent 62d76743b3
commit 190e5af111
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,12 @@ qt_internal_add_test(tst_qocsp
Qt::NetworkPrivate
)
qt_internal_extend_target(tst_qocsp CONDITION QT_FEATURE_openssl_linked
LIBRARIES
WrapOpenSSL::WrapOpenSSL
)
## Scopes:
#####################################################################

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

@ -25,6 +25,11 @@ qt_internal_add_test(tst_qsslkey
TESTDATA ${test_data}
)
qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked
LIBRARIES
WrapOpenSSL::WrapOpenSSL
)
## Scopes:
#####################################################################

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

@ -25,6 +25,11 @@ qt_internal_add_test(tst_qsslsocket
QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" "echo" # special case
)
qt_internal_extend_target(tst_qsslsocket CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked
LIBRARIES
WrapOpenSSL::WrapOpenSSL
)
#### Keys ignored in scope 1:.:.:qsslsocket.pro:<TRUE>:
# _REQUIREMENTS = "qtConfig(private_tests)"

5
tests/auto/network/ssl/shared/tlshelpers.h
View File

@ -12,13 +12,8 @@
#include <QtCore/qstring.h>
#include <QtCore/qglobal.h>
// TODO: these 'helpers' later to include OpenSSL resolver/sumbols
// required by some auto-tests.
QT_BEGIN_NAMESPACE
namespace TlsAux {
inline bool classImplemented(QSsl::ImplementedClass cl)