From 6d3dace7d95bfa9627e524787d076124afc7e773 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 8 Apr 2015 10:57:32 +0200 Subject: [PATCH] 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). --- mysql-test/suite.pm | 6 ------ 1 file changed, 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; }