summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-03-25 09:31:12 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2011-03-25 09:41:08 (GMT)
commitaeabe790203e7dcb1786e0dad7b4608f1e45b7d5 (patch)
tree86b90159a5d0b6e9d4c23d2b9cc3df7cf202dc50 /tests
parent04e074e8d7c097295505e63565abdc7ca2b49f7b (diff)
downloadQt-aeabe790203e7dcb1786e0dad7b4608f1e45b7d5.zip
Qt-aeabe790203e7dcb1786e0dad7b4608f1e45b7d5.tar.gz
Qt-aeabe790203e7dcb1786e0dad7b4608f1e45b7d5.tar.bz2
QSslCertificate: fix test for blacklisted certs on Windows
Apparently the wildcard matching and the SRCDIR hack don't go well together. Reviewed-by: Markus Goetz Task-number: QTBUG-18338
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsslcertificate/tst_qsslcertificate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
index ae7d6b1..57f2fa8 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
@@ -821,8 +821,8 @@ void tst_QSslCertificate::largeExpirationDate() // QTBUG-12489
void tst_QSslCertificate::blacklistedCertificates()
{
- QList<QSslCertificate> blacklistedCerts = QSslCertificate::fromPath(SRCDIR "more-certificates/blacklisted*.pem", QSsl::Pem, QRegExp::Wildcard);
- QVERIFY(blacklistedCerts.count() > 0);
+ QList<QSslCertificate> blacklistedCerts = QSslCertificate::fromPath("more-certificates/blacklisted*.pem", QSsl::Pem, QRegExp::Wildcard);
+ QVERIFY2(blacklistedCerts.count() > 0, "Please run this test from the source directory");
for (int a = 0; a < blacklistedCerts.count(); a++) {
QVERIFY(! blacklistedCerts.at(a).isValid());
}