diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 16:27:16 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 16:27:16 +0100 |
commit | dbbe3651326e8e1ff9507686fe7b5ca1a28b0cbb (patch) | |
tree | 46454235d0476be2c58a765c293688fb6c7f0987 /mysql-test/suite.pm | |
parent | 3c12c27907ed167e03e4bafd22ca7c551575738c (diff) | |
parent | 48f4961a12919405a719c951630a8b804e685997 (diff) | |
download | mariadb-git-dbbe3651326e8e1ff9507686fe7b5ca1a28b0cbb.tar.gz |
5.5 merge
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r-- | mysql-test/suite.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index e0e47560331..ac4068a6373 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -52,7 +52,7 @@ sub skip_combinations { } $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); - $skip{'t/openssl-poodle_6975.test'} = 'no or too old openssl' + $skip{'t/openssl_6975.test'} = 'no or too old openssl' unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 2>&1 >/dev/null"; %skip; |