database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Create 'main' test directory and move 't' and 'r' there

Browse Source
This commit is contained in:
Michael Widenius
2018-03-09 14:05:35 +02:00
committed by Monty
parent ab1941266c
commit a7abddeffa
2114 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite.pm
View File

@ -45,7 +45,7 @@ sub skip_combinations {
$skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
$skip{'t/plugin_loaderr.test'} = 'needs compiled-in innodb'
$skip{'main/plugin_loaderr.test'} = 'needs compiled-in innodb'
unless $::mysqld_variables{'innodb'} eq "ON";
# disable tests that use ipv6, if unsupported
@ -59,11 +59,11 @@ sub skip_combinations {
}
$skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
$skip{'t/openssl_6975.test'} = 'no or too old openssl'
$skip{'main/openssl_6975.test'} = 'no or too old openssl'
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
and $1 ge "1.0.1d";
$skip{'t/ssl_7937.combinations'} = [ 'x509v3' ]
$skip{'main/ssl_7937.combinations'} = [ 'x509v3' ]
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
and $1 ge "1.0.2";