Disable QSslDiffieHellmanParameters tests for QT_NO_SSL builds

Change-Id: Ie0b7e9c819ddd1627709f64c30c8d2374bf50c9b Reviewed-by: Timur Pocheptsov <[email protected]>
w45350956 · Jun 10, 2016 · 9466d0e · 9466d0e
1 parent 04e224b
commit 9466d0e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp b/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp
@@ -46,15 +46,19 @@ class tst_QSslDiffieHellmanParameters : public QObject
 {
     Q_OBJECT
 
+#ifndef QT_NO_SSL
 private Q_SLOTS:
     void constructionEmpty();
     void constructionDefault();
     void constructionDER();
     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
@@ -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
     }
 }