database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

WL#4189 mtr.pl v2

Browse Source 
- Add a "skip-ssl=1" to [mysqltest] section so that 
   mysqltest will not run with ssl turned on by default 
   but stil be able to turn it on when requested
 - This avoids that check_warnings and check_testcase
   connects to the server woth SSL turned on
This commit is contained in:
Magnus Svensson
2009-01-27 14:21:18 +01:00
parent c7c0dc6882
commit d850730333
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/lib/My/ConfigFactory.pm
View File

@ -150,6 +150,13 @@ sub ssl_supported {
return $self->{ARGS}->{ssl}; return $self->{ARGS}->{ssl};
} }
sub fix_skip_ssl {
return if !ssl_supported(@_);
# Add skip-ssl if ssl is supported to avoid
# that mysqltest connects with SSL by default
return 1;
}
sub fix_ssl_ca { sub fix_ssl_ca {
return if !ssl_supported(@_); return if !ssl_supported(@_);
my $std_data= fix_std_data(@_); my $std_data= fix_std_data(@_);
@ -287,6 +294,7 @@ my @mysqltest_rules=
{ 'ssl-ca' => \&fix_ssl_ca }, { 'ssl-ca' => \&fix_ssl_ca },
{ 'ssl-cert' => \&fix_ssl_client_cert }, { 'ssl-cert' => \&fix_ssl_client_cert },
{ 'ssl-key' => \&fix_ssl_client_key }, { 'ssl-key' => \&fix_ssl_client_key },
{ 'skip-ssl' => \&fix_skip_ssl },
); );

20
mysql-test/mysql-test-run.pl
View File

@ -130,14 +130,14 @@ our @opt_combinations;
our @opt_extra_mysqld_opt; our @opt_extra_mysqld_opt;
our $opt_compress; my $opt_compress;
our $opt_ssl; my $opt_ssl;
our $opt_skip_ssl; my $opt_skip_ssl;
our $opt_ssl_supported; my $opt_ssl_supported;
our $opt_ps_protocol; my $opt_ps_protocol;
our $opt_sp_protocol; my $opt_sp_protocol;
our $opt_cursor_protocol; my $opt_cursor_protocol;
our $opt_view_protocol; my $opt_view_protocol;
our $opt_debug; our $opt_debug;
our @opt_cases; # The test cases names in argv our @opt_cases; # The test cases names in argv
@ -4454,10 +4454,6 @@ sub start_mysqltest ($) {
# Turn on SSL for _all_ test cases if option --ssl was used # Turn on SSL for _all_ test cases if option --ssl was used
mtr_add_arg($args, "--ssl"); mtr_add_arg($args, "--ssl");
} }
elsif ( $opt_ssl_supported )
{
mtr_add_arg($args, "--skip-ssl");
}
if ( $opt_embedded_server ) if ( $opt_embedded_server )
{ {