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

mtr: fix the check where a combination is pre-selected

Browse Source 
if all options from a combination from the combinations file are already
present in the server's list of options, then don't try to run tests
in other combinations from this file.

old behavior was: if at least one option from a combination is
already present in the list...
This commit is contained in:
Sergei Golubchik
2021-08-29 09:33:00 +02:00
parent fe2a7048e7
commit 600e494906
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/lib/My/Options.pm
View File

@ -140,24 +140,16 @@ sub diff {
} }
sub is_set { sub is_subset {
my ($opts, $set_opts)= @_; my ($set, $subset)= @_;
my %cache = map { _split_option($_) } @$set;
foreach my $opt (@$opts){ for (@$subset){
my ($name, $value)= _split_option($_);
my ($opt_name1, $value1)= _split_option($opt); return 0 unless exists $cache{$name} and $cache{$name} eq $value;
foreach my $set_opt (@$set_opts){
my ($opt_name2, $value2)= _split_option($set_opt);
if ($opt_name1 eq $opt_name2 and $value1 eq $value2){
# Option already set
return 1;
}
}
} }
return 0; return 1;
} }

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

@ -623,8 +623,10 @@ sub make_combinations($$@)
{ {
# Skip all other combinations if the values they change # Skip all other combinations if the values they change
# are already fixed in master_opt or slave_opt # are already fixed in master_opt or slave_opt
if (My::Options::is_set($test->{master_opt}, $comb->{comb_opt}) && # (empty combinations are not considered a subset of anything)
My::Options::is_set($test->{slave_opt}, $comb->{comb_opt}) ){ if (@{$comb->{comb_opt}} &&
My::Options::is_subset($test->{master_opt}, $comb->{comb_opt}) &&
My::Options::is_subset($test->{slave_opt}, $comb->{comb_opt}) ){
$test_combs->{$comb->{name}} = 2; $test_combs->{$comb->{name}} = 2;