diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-07-02 21:23:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-07-02 21:27:12 +0200 |
| commit | 3acf74105175d4c909e0ea8e969f3d78bfc5f7af (patch) | |
| tree | b649e35a9e3c79aa4cbc1f5483fb14725e97ab38 /mysql-test/suite.pm | |
| parent | 7a3d34d6456ed719da62a896e5ac6e983b72f3d8 (diff) | |
| download | mariadb-git-3acf74105175d4c909e0ea8e969f3d78bfc5f7af.tar.gz | |
fix suite.pm to not garble $_
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 7c0c1b508ea..5b3ccc711de 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -77,11 +77,11 @@ sub skip_combinations { my $openssl_cnf='/etc/ssl/openssl.cnf'; if ($openssl_ver and open my $f, '<', $openssl_cnf) { local $/; - $_=<$f>; + my $cnf=<$f>; $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" - if /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m; + if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m; } %skip; |