diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2023-11-09 17:21:39 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2023-11-28 19:59:49 +0100 |
| commit | 4f05ffeb41e02d1958f2d16cacc3bc4e21dd9b5b (patch) | |
| tree | 3e63126adb8ae6fb2ad726d758e73b3240046e39 /tests/auto/network | |
| parent | 0e528f2976a64d0348fe0bebfb97293eae5bac73 (diff) | |
Restore ASN.1 Element tests after move to plugin
When SSL backends were broken out as plugins, various tests were
suppressed since the code they test is now in a plugin, no longer part
of the network libraries.
The ASN.1 test is, however, fairly self-contained, so just compile it
with the relevant plugin sources (which are likewise self-contained)
and brute-force the paths to line up for the test.
Task-number: QTBUG-46843
Change-Id: I778489e68b7361a7fd55c88d2a35257ad6a58c46
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/ssl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/network/ssl/qasn1element/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/CMakeLists.txt b/tests/auto/network/ssl/CMakeLists.txt index 34b3a0aef1..b11b15b6ba 100644 --- a/tests/auto/network/ssl/CMakeLists.txt +++ b/tests/auto/network/ssl/CMakeLists.txt @@ -13,7 +13,7 @@ if(QT_FEATURE_private_tests AND QT_FEATURE_ssl) add_subdirectory(qsslsocket) add_subdirectory(qsslsocket_onDemandCertificates_member) add_subdirectory(qsslsocket_onDemandCertificates_static) -# add_subdirectory(qasn1element) + add_subdirectory(qasn1element) add_subdirectory(qssldiffiehellmanparameters) add_subdirectory(qsslserver) endif() diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt index 98730a3fb2..7b01a0b22d 100644 --- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt +++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt @@ -14,7 +14,12 @@ endif() qt_internal_add_test(tst_qasn1element SOURCES tst_qasn1element.cpp + ../../../../../src/plugins/tls/shared/qasn1element_p.h + ../../../../../src/plugins/tls/shared/qasn1element.cpp + INCLUDE_DIRECTORIES + ../../../../../src/plugins/tls/shared LIBRARIES + Qt::Core Qt::Network Qt::NetworkPrivate BUNDLE_ANDROID_OPENSSL_LIBS diff --git a/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp b/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp index aa126f0f1a..75170b03b4 100644 --- a/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp +++ b/tests/auto/network/ssl/qasn1element/tst_qasn1element.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2014 Jeremy Lainé <jeremy.laine@m4x.org> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "private/qasn1element_p.h" +#include "qasn1element_p.h" #include <QTest> |