From e79b9005f19748964345e9f4b35a21529bf7f0e7 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 17 Jun 2019 13:35:16 +0200 Subject: [PATCH] don't run tls_version test if TLSv1.1 is disabled in /etc/ssl/openssl.cnf as it happens to be on the buster builder --- mysql-test/suite.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index cb30a3186e5..ac4a448ba5c 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -74,6 +74,14 @@ sub skip_combinations { $skip{'main/ssl_verify_ip.test'} = 'x509v3 support required' unless $openssl_ver ge "1.0.2"; + my $openssl_cnf='/etc/ssl/openssl.cnf'; + if ($openssl_ver and open my $f, '<', $openssl_cnf) { + local $/; + $_=<$f>; + $skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf" + if /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m; + } + %skip; }