summaryrefslogtreecommitdiff
path: root/mysql-test/suite.pm
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2018-03-09 14:05:35 +0200
committerMonty <monty@mariadb.org>2018-03-29 13:59:44 +0300
commita7abddeffa6a760ce948c2dfb007cdf3f1a369d5 (patch)
tree70eb743fa965a17380bbc0ac88ae79ca1075b896 /mysql-test/suite.pm
parentab1941266c59a19703a74b5593cf3f508a5752d7 (diff)
downloadmariadb-git-a7abddeffa6a760ce948c2dfb007cdf3f1a369d5.tar.gz
Create 'main' test directory and move 't' and 'r' there
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r--mysql-test/suite.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 0baa8a41639..651b99f31a5 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -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";