Commit e6bc01d1 authored by Bjorn Munch's avatar Bjorn Munch

Bug #48149 MTR should automatically skip SSL tests if SSL not supported

Knowledge of no SSL support is not used
Skip tests the same way e.g. innodb tests are
Does not refer to have_ssl_communication.inc, 
     will add this when merging to 6.0-codebase
parent c6533f9e
...@@ -1036,6 +1036,17 @@ sub collect_one_test_case { ...@@ -1036,6 +1036,17 @@ sub collect_one_test_case {
} }
} }
if ( $tinfo->{'need_ssl'} )
{
# This is a test that needs ssl
if ( ! $::opt_ssl_supported ) {
# SSL is not supported, skip it
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "No SSL support";
return $tinfo;
}
}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Find config file to use if not already selected in <testname>.opt file # Find config file to use if not already selected in <testname>.opt file
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -1116,6 +1127,7 @@ my @tags= ...@@ -1116,6 +1127,7 @@ my @tags=
["include/ndb_master-slave.inc", "ndb_test", 1], ["include/ndb_master-slave.inc", "ndb_test", 1],
["federated.inc", "federated_test", 1], ["federated.inc", "federated_test", 1],
["include/not_embedded.inc", "not_embedded", 1], ["include/not_embedded.inc", "not_embedded", 1],
["include/have_ssl.inc", "need_ssl", 1],
); );
......
...@@ -144,7 +144,7 @@ our @opt_extra_mysqld_opt; ...@@ -144,7 +144,7 @@ our @opt_extra_mysqld_opt;
my $opt_compress; my $opt_compress;
my $opt_ssl; my $opt_ssl;
my $opt_skip_ssl; my $opt_skip_ssl;
my $opt_ssl_supported; our $opt_ssl_supported;
my $opt_ps_protocol; my $opt_ps_protocol;
my $opt_sp_protocol; my $opt_sp_protocol;
my $opt_cursor_protocol; my $opt_cursor_protocol;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment