database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fix suite.pm to not garble $_

Browse Source
This commit is contained in:
Sergei Golubchik
2019-07-02 21:23:47 +02:00
parent 7a3d34d645
commit 3acf741051
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite.pm
View File

@@ -77,11 +77,11 @@ sub skip_combinations {
my $openssl_cnf='/etc/ssl/openssl.cnf'; my $openssl_cnf='/etc/ssl/openssl.cnf';
if ($openssl_ver and open my $f, '<', $openssl_cnf) { if ($openssl_ver and open my $f, '<', $openssl_cnf) {
local $/; local $/;
$_=<$f>; my $cnf=<$f>;
$skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf" $skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf"
if /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m; if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m;
$skip{'main/tls_version1.test'} = "TLSv1.0 disabled in $openssl_cnf" $skip{'main/tls_version1.test'} = "TLSv1.0 disabled in $openssl_cnf"
if /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m; if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m;
} }
%skip; %skip;