diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-24 20:18:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-01-25 19:57:37 +0100 |
| commit | 74f184aff253076781b7057ddba5e6460dfd467f (patch) | |
| tree | e3a252a6cb8c4a0ba9b63107c8538d3c0e5b2ae2 /mysql-test/suite.pm | |
| parent | 31d0727a103b5f8e983bd89d0ddd0dbe2a2278f2 (diff) | |
| download | mariadb-git-74f184aff253076781b7057ddba5e6460dfd467f.tar.gz | |
Fix tests not to fail with OpenSSL 1.1.1 with TLSv1.3
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 30e50671496..3849e4ef886 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -70,9 +70,9 @@ sub skip_combinations { } $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); - $skip{'t/openssl_6975.test'} = 'no or too old openssl' + $skip{'t/openssl_6975.test'} = 'no or wrong openssl version' unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ - and $1 ge "1.0.1d"; + and $1 ge "1.0.1d" and $1 lt "1.1.1"; $skip{'t/ssl_7937.combinations'} = [ 'x509v3' ] unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ |