diff options
| author | André Klitzing <aklitzing@gmail.com> | 2016-06-10 10:07:16 +0200 |
|---|---|---|
| committer | André Klitzing <aklitzing@gmail.com> | 2016-06-10 13:18:03 +0000 |
| commit | 9466d0e63365bb5fb94f95d46ba9b1ab053f3289 (patch) | |
| tree | 2e1f080e2960335d803613b30b2348248946d862 /tests | |
| parent | 04e224b19ab04ff4d5e0b3fa70c2669ab2656037 (diff) | |
Disable QSslDiffieHellmanParameters tests for QT_NO_SSL builds
Change-Id: Ie0b7e9c819ddd1627709f64c30c8d2374bf50c9b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/network/ssl/ssl.pro | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp b/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp index de3667e108..32cc982a65 100644 --- a/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp +++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp @@ -46,6 +46,7 @@ class tst_QSslDiffieHellmanParameters : public QObject { Q_OBJECT +#ifndef QT_NO_SSL private Q_SLOTS: void constructionEmpty(); void constructionDefault(); @@ -53,8 +54,11 @@ private Q_SLOTS: void constructionPEM(); void unsafe512Bits(); void unsafeNonPrime(); +#endif }; +#ifndef QT_NO_SSL + void tst_QSslDiffieHellmanParameters::constructionEmpty() { QSslDiffieHellmanParameters dh; @@ -153,5 +157,7 @@ void tst_QSslDiffieHellmanParameters::unsafeNonPrime() #endif } +#endif // QT_NO_SSL + QTEST_MAIN(tst_QSslDiffieHellmanParameters) #include "tst_qssldiffiehellmanparameters.moc" diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index a4f3fad1f2..df7c10ed19 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -2,7 +2,6 @@ TEMPLATE=subdirs SUBDIRS=\ qsslcertificate \ qsslcipher \ - qssldiffiehellmanparameters \ qsslellipticcurve \ qsslerror \ qsslkey \ @@ -22,6 +21,7 @@ winrt: SUBDIRS -= \ contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { contains(QT_CONFIG, private_tests) { - SUBDIRS += qasn1element + SUBDIRS += qasn1element \ + qssldiffiehellmanparameters } } |