summaryrefslogtreecommitdiff
path: root/mysql-test/suite.pm
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-04-08 10:57:32 +0200
committerSergei Golubchik <serg@mariadb.org>2015-04-09 18:42:42 +0200
commit6d3dace7d95bfa9627e524787d076124afc7e773 (patch)
tree4c19e8f371ef9d1f8d66127ca16be82d773589b4 /mysql-test/suite.pm
parent6a3932fdd0709deed103327511be618104178593 (diff)
downloadmariadb-git-6d3dace7d95bfa9627e524787d076124afc7e773.tar.gz
mtr: don't disable tests in suite.pm unnecessary
only those tests should be disabled in suite.pm that cannot be disabled from mysqltest files (e.g. when the server is started with a special command-line option - unknown option will abort the server before mysqltest will start its checks).
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r--mysql-test/suite.pm6
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 220c15eb172..5eafd4e2ffd 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -70,12 +70,6 @@ sub skip_combinations {
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
and $1 ge "1.0.1";
- $skip{'include/have_example_key_management_plugin.inc'} = 'no example_key_management_plugin'
- unless $ENV{EXAMPLE_KEY_MANAGEMENT_PLUGIN_SO};
-
- $skip{'include/have_file_key_management_plugin.inc'} = 'no file_key_management_plugin'
- unless $ENV{FILE_KEY_MANAGEMENT_PLUGIN_SO};
-
%skip;
}