summaryrefslogtreecommitdiff
path: root/mysql-test/suite.pm
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-11-19 00:19:52 +0100
committerSergei Golubchik <sergii@pisem.net>2014-11-19 00:19:52 +0100
commit496fda66fdc34b447ef4dec26d1250b034a321e3 (patch)
tree39f069d1dd1afe94699dad5c42d530f63c545190 /mysql-test/suite.pm
parentcb8f837a3d0d16bdbfc9c545d32527ad28b0d841 (diff)
downloadmariadb-git-496fda66fdc34b447ef4dec26d1250b034a321e3.tar.gz
openssl-poodle_6975.test: don't run it for older OpenSSL versions
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r--mysql-test/suite.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index ef0325bd3e7..60d3c0b6d8d 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -39,6 +39,9 @@ sub skip_combinations {
}
$skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
+ $skip{'t/openssl-poodle_6975.test'} = 'no or too old openssl'
+ unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 2>&1 >/dev/null";
+
%skip;
}