diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-16 09:41:23 +0200 |
commit | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (patch) | |
tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /tests/auto/network/ssl | |
parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
parent | f255b1e8e297e7e1363921580007145cff574e0d (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'tests/auto/network/ssl')
-rw-r--r-- | tests/auto/network/ssl/qsslkey/BLACKLIST | 17 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/BLACKLIST | 4 |
2 files changed, 5 insertions, 16 deletions
diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST index e9723001f5..19fb15cd1f 100644 --- a/tests/auto/network/ssl/qsslkey/BLACKLIST +++ b/tests/auto/network/ssl/qsslkey/BLACKLIST @@ -1,16 +1,9 @@ [constructor] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel [length] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel [toEncryptedPemOrDer] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel [toPemOrDer] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel + diff --git a/tests/auto/network/ssl/qsslsocket/BLACKLIST b/tests/auto/network/ssl/qsslsocket/BLACKLIST index 36143691c9..7b4a29f463 100644 --- a/tests/auto/network/ssl/qsslsocket/BLACKLIST +++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST @@ -1,11 +1,7 @@ -[abortOnSslErrors] -windows-10 msvc-2015 [deprecatedProtocols] windows [spontaneousWrite] windows-7sp1 -[sslErrors] -windows-7sp1 [connectToHostEncrypted] osx-10.13 [setSslConfiguration] |