diff options
Diffstat (limited to 'tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp')
| -rw-r--r-- | tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index 56530acb14..229ce4abb5 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -928,7 +928,7 @@ void tst_QSslCertificate::toText() QString txtcert = cert.toText(); -#ifdef Q_OS_WINRT +#ifdef QT_NO_OPENSSL QEXPECT_FAIL("", "QTBUG-40884: QSslCertificate::toText is not implemented on WinRT", Continue); #endif QVERIFY(QString::fromLatin1(txt098) == txtcert || @@ -976,7 +976,7 @@ void tst_QSslCertificate::verify() qPrintable(QString("errors: %1").arg(toString(errors))) \ ) -#ifdef Q_OS_WINRT +#ifdef QT_NO_OPENSSL QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not yet support verifying a chain", Abort); #endif // Empty chain is unspecified error @@ -1060,9 +1060,6 @@ void tst_QSslCertificate::extensions() QSslCertificate cert = certList[0]; QList<QSslCertificateExtension> extensions = cert.extensions(); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not support extensions information", Abort); -#endif QVERIFY(extensions.count() == 9); int unknown_idx = -1; @@ -1161,9 +1158,6 @@ void tst_QSslCertificate::extensionsCritical() QSslCertificate cert = certList[0]; QList<QSslCertificateExtension> extensions = cert.extensions(); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not support extensions information", Abort); -#endif QVERIFY(extensions.count() == 9); int basic_constraints_idx = -1; @@ -1314,7 +1308,7 @@ void tst_QSslCertificate::pkcs12() QSslCertificate cert; QList<QSslCertificate> caCerts; -#ifdef Q_OS_WINRT +#ifdef QT_NO_OPENSSL QEXPECT_FAIL("", "QTBUG-40884: WinRT API does not support pkcs12 imports", Abort); #endif ok = QSslCertificate::importPKCS12(&f, &key, &cert, &caCerts); |