mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

WL#3949, added skip combinations for some conditions

Browse source
This commit is contained in:
skozlov/ksm@mysql.com/virtop.localdomain 2007-11-21 23:44:31 +03:00
parent 95b65235ba
commit 22c2cdd1a7
3 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/include/have_binlog_format_row_or_statement.inc Normal file
View file

@ -0,0 +1,7 @@
--source include/have_log_bin.inc
-- require r/have_binlog_format_statement.require
--disable_query_log
--replace_result ROW STATEMENT
show variables like "binlog_format";
--enable_query_log

29
mysql-test/lib/mtr_cases.pl
View file

@ -229,24 +229,27 @@ sub collect_one_suite($$)
my $testdir= "$suitedir/t"; my $testdir= "$suitedir/t";
my $resdir= "$suitedir/r"; my $resdir= "$suitedir/r";
if (!@::opt_combination) if (!defined $::opt_record and !defined $::opt_skip_combination)
{ {
# Read combinations file if (!@::opt_combination)
if ( open(COMB,$combination_file) )
{ {
while (<COMB>) # Read combinations file
if ( open(COMB,$combination_file) )
{ {
chomp; while (<COMB>)
s/\ +/ /g; {
push (@$combinations, $_) unless ($_ eq ''); chomp;
s/\ +/ /g;
push (@$combinations, $_) unless ($_ eq '');
}
close COMB;
} }
close COMB;
} }
} else
else {
{ # take the combination from command-line
# take the combination from command-line @$combinations = @::opt_combination;
@$combinations = @::opt_combination; }
} }
# Remember last element position # Remember last element position
my $begin_index = $#{@$cases} + 1; my $begin_index = $#{@$cases} + 1;

3
mysql-test/mysql-test-run.pl
View file

@ -165,6 +165,7 @@ our $opt_small_bench= 0;
our $opt_big_test= 0; our $opt_big_test= 0;
our @opt_combination; our @opt_combination;
our $opt_skip_combination;
our @opt_extra_mysqld_opt; our @opt_extra_mysqld_opt;
@ -532,6 +533,7 @@ sub command_line_setup () {
'skip-test=s' => \$opt_skip_test, 'skip-test=s' => \$opt_skip_test,
'big-test' => \$opt_big_test, 'big-test' => \$opt_big_test,
'combination=s' => \@opt_combination, 'combination=s' => \@opt_combination,
'skip-combination' => \$opt_skip_combination,
# Specify ports # Specify ports
'master_port=i' => \$opt_master_myport, 'master_port=i' => \$opt_master_myport,
@ -5179,6 +5181,7 @@ Options to control what test suites or cases to run
checked from test cases. checked from test cases.
combination="ARG1 .. ARG2" Specify a set of "mysqld" arguments for one combination="ARG1 .. ARG2" Specify a set of "mysqld" arguments for one
combination. combination.
skip-combination Skip any combination options and combinations files
Options that specify ports Options that specify ports