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

remove few hard-coded checks from mtr

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-06 16:29:53 +01:00
parent dfafb7bbc9
commit 6f0101186d
2 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mysql-test/lib/mtr_cases.pm
View File

@ -967,37 +967,6 @@ sub collect_one_test_case {
} }
} }
if ( $::opt_embedded_server )
{
if ( $tinfo->{'not_embedded'} )
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Not run for embedded server";
return $tinfo;
}
}
if ( $tinfo->{'not_valgrind'} )
{
if ( $::opt_valgrind_mysqld )
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Not compatible with Valgrind testing";
return $tinfo;
}
}
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;
}
}
if ( $tinfo->{'need_ipv6'} ) if ( $tinfo->{'need_ipv6'} )
{ {
# This is a test that needs ssl # This is a test that needs ssl
@ -1059,14 +1028,10 @@ sub collect_one_test_case {
my $tags_map= {'big_test' => ['big_test', 1], my $tags_map= {'big_test' => ['big_test', 1],
'have_debug' => ['need_debug', 1],
'have_ndb' => ['ndb_test', 1], 'have_ndb' => ['ndb_test', 1],
'have_multi_ndb' => ['ndb_test', 1], 'have_multi_ndb' => ['ndb_test', 1],
'master-slave' => ['rpl_test', 1], 'master-slave' => ['rpl_test', 1],
'ndb_master-slave' => ['rpl_test', 1, 'ndb_test', 1], 'ndb_master-slave' => ['rpl_test', 1, 'ndb_test', 1],
'not_embedded' => ['not_embedded', 1],
'not_valgrind' => ['not_valgrind', 1],
'have_ssl' => ['need_ssl', 1],
'check_ipv6' => ['need_ipv6', 1], 'check_ipv6' => ['need_ipv6', 1],
'long_test' => ['long_test', 1], 'long_test' => ['long_test', 1],
}; };

2
mysql-test/t/ssl_cipher-master.opt
View File

@ -1 +1 @@
--ssl-cipher=AES128-SHA --loose-ssl-cipher=AES128-SHA