diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
| commit | 8cbb14ef5d180687f131bc44a4e8fc84083d033c (patch) | |
| tree | 091f11e2d20f95656a7b12294782eb0488fd4fcc /mysql-test/suite.pm | |
| parent | 4345868382ca3525de5eb432302b6b9b957b47c1 (diff) | |
| parent | b85aa20065504bdda4bc03c2bd7eb7de38865c5d (diff) | |
| download | mariadb-git-8cbb14ef5d180687f131bc44a4e8fc84083d033c.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 3849e4ef886..fe68295340c 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -74,10 +74,15 @@ sub skip_combinations { unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ 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+)/ and $1 ge "1.0.2"; + $skip{'t/ssl_verify_ip.test'} = 'x509v3 support required' + unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ + and $1 ge "1.0.2"; + %skip; } |