diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-12-27 15:52:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-12-27 21:14:42 +0100 |
| commit | 071feae31958bdaaba37c896e9957a0e86112346 (patch) | |
| tree | da49cf953b447c6d5ba1543aa9971bb7f4100cf5 /mysql-test/suite.pm | |
| parent | b86e0f25f896285a34c999515ad50e50d879f3e7 (diff) | |
| download | mariadb-git-071feae31958bdaaba37c896e9957a0e86112346.tar.gz | |
MDEV-20170 main.tls_version and main.tls_version1 fail in buildbot on RHEL8
Instead of trying to detect MinProtocol=TLSv1.2 in all possible
sections of files in all possible locations where openssl is configured
to find its configuration in all possible distros (and these locations
are mutually different in Debian, Ubuntu, and RHEL, btw) - just make
mtr to instruct openssl not to read any config files at all.
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index e21db289445..6666947b03d 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -89,16 +89,6 @@ 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 $/; - my $cnf=<$f>; - $skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf" - if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m; - $skip{'main/tls_version1.test'} = "TLSv1.0 disabled in $openssl_cnf" - if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m; - } - %skip; } |