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

allow suite.pm to tell mtr to skip the suite

Browse Source
This commit is contained in:
Sergei Golubchik
2010-08-24 14:33:34 +02:00
parent 8da7be6302
commit ced635391e
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/README.suites
View File

@ -31,6 +31,8 @@ package that inherits from My::Suite.
The suite.pm needs to have @ISA=qw(My::Suite) and it must end The suite.pm needs to have @ISA=qw(My::Suite) and it must end
with bless {}; - that is it must return an object of that class. with bless {}; - that is it must return an object of that class.
It can also return a string - in this case all tests in the suite
will be skipped, with this string being printed as a reason.
A suite class can define config_files() and servers() methods. A suite class can define config_files() and servers() methods.

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

@ -997,6 +997,13 @@ sub collect_one_test_case {
} }
} }
if (not ref $::suites{$tinfo->{suite}})
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= $::suites{$tinfo->{suite}};
return $tinfo;
}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Append mysqld extra options to master and slave, as appropriate # Append mysqld extra options to master and slave, as appropriate
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------

4
mysql-test/suite/innodb_plugin/suite.pm
View File

@ -3,12 +3,14 @@ package My::Suite::InnoDB_plugin;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);
############# initialization ###################### ############# initialization ######################
my @combinations=('none'); my @combinations;
push @combinations, 'innodb_plugin' if $ENV{HA_INNODB_PLUGIN_SO}; push @combinations, 'innodb_plugin' if $ENV{HA_INNODB_PLUGIN_SO};
push @combinations, 'xtradb_plugin' if $ENV{HA_XTRADB_SO}; push @combinations, 'xtradb_plugin' if $ENV{HA_XTRADB_SO};
push @combinations, 'xtradb' if $::mysqld_variables{'innodb'} eq "ON"; push @combinations, 'xtradb' if $::mysqld_variables{'innodb'} eq "ON";
return "Neither innodb_plugin nor xtradb are available" unless @combinations;
$ENV{INNODB_PLUGIN_COMBINATIONS}=join ':', @combinations $ENV{INNODB_PLUGIN_COMBINATIONS}=join ':', @combinations
unless $ENV{INNODB_PLUGIN_COMBINATIONS}; unless $ENV{INNODB_PLUGIN_COMBINATIONS};