From bf7cec737f9dbb330776aa1d4bf7f130c880e911 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 30 Nov 2020 13:03:57 +0100 Subject: [PATCH] tst_QSslKey: remove blacklist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And do not run the test with QSslSocket::supportsSsl() returns false - this may mean unresolved symbols and thus missing functionality, like i2d_X509 etc. This also makes cases more like other, that already had those checks. Fixes: QTBUG-87386 Change-Id: If4e9a650ca325b6f70956f532891a4c1d50465c0 Reviewed-by: Mårten Nordheim --- tests/auto/network/ssl/qsslkey/BLACKLIST | 6 ------ tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST index b9d7b695283..5705a1982d5 100644 --- a/tests/auto/network/ssl/qsslkey/BLACKLIST +++ b/tests/auto/network/ssl/qsslkey/BLACKLIST @@ -6,9 +6,3 @@ rhel rhel [toPemOrDer] rhel - -# QTBUG-87386 -[passphraseChecks] -android -[noPassphraseChecks] -android diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp index dbb73905915..b96ee4c56b9 100644 --- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp @@ -515,6 +515,9 @@ void tst_QSslKey::toEncryptedPemOrDer() void tst_QSslKey::passphraseChecks_data() { + if (!QSslSocket::supportsSsl()) + QSKIP("This test requires a working TLS library"); + QTest::addColumn("fileName"); QTest::addColumn("passphrase"); @@ -574,6 +577,9 @@ void tst_QSslKey::passphraseChecks() void tst_QSslKey::noPassphraseChecks() { + if (!QSslSocket::supportsSsl()) + QSKIP("This test requires a working TLS library"); + // be sure and check a key without passphrase too QString fileName(testDataDir + "rsa-without-passphrase.pem"); QFile keyFile(fileName);