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

MDEV-399 Combinations defined in the base suite cannot be skipped by overlay

Browse Source 
When appliying parent combinations to the overlay,
filter them through the %skip_combinations using the overlayed filename
This commit is contained in:
Sergei Golubchik
2012-08-01 19:57:36 +02:00
parent bd39599668
commit 6ed4a283fd
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,11 +472,13 @@ sub process_suite {
else else
{ {
my @combs; my @combs;
@combs = combinations_from_file($parent, "$suitedir/combinations") my $from = "$suitedir/combinations";
unless $suite->{skip}; @combs = combinations_from_file($parent, $from) unless $suite->{skip};
$suite->{combinations} = [ @combs ]; $suite->{combinations} = [ @combs ];
# in overlays it's a union of parent's and overlay's files. # in overlays it's a union of parent's and overlay's files.
unshift @{$suite->{combinations}}, @{$parent->{combinations}} if $parent; unshift @{$suite->{combinations}},
grep { not $skip_combinations{"$from => $_->{name}"} }
@{$parent->{combinations}} if $parent;
} }
# suite.opt # suite.opt
@ -1039,8 +1041,11 @@ sub get_tags_from_file($$) {
$suite = load_suite_for_file($comb_file) if $prefix[0] eq ''; $suite = load_suite_for_file($comb_file) if $prefix[0] eq '';
my @comb; my @comb;
unless ($suite->{skip}) { unless ($suite->{skip}) {
@comb = combinations_from_file($over, "$prefix[0]$comb_file"); my $from = "$prefix[0]$comb_file";
push @comb, combinations_from_file(undef, "$prefix[1]$comb_file") if $over; @comb = combinations_from_file($over, $from);
push @comb,
grep { not $skip_combinations{"$from => $_->{name}"} }
combinations_from_file(undef, "$prefix[1]$comb_file") if $over;
} }
push @combinations, [ @comb ]; push @combinations, [ @comb ];

5
mysql-test/suite/mtr2/combinations Normal file
View File

@ -0,0 +1,5 @@
[1st]
lock-wait-timeout=5
[2nd]
lock-wait-timeout=3

8
storage/example/mysql-test/mtr/suite.pm Normal file
View File

@ -0,0 +1,8 @@
package My::Suite::MTR::Example;
@ISA = qw(My::Suite);
sub skip_combinations {(
't/combs.combinations' => [ 'c1' ],
)}
bless { };

9
storage/myisam/mysql-test/mtr2/suite.pm Normal file
View File

@ -0,0 +1,9 @@
package My::Suite::MTR2::MyISAM;
@ISA = qw(My::Suite);
sub skip_combinations {(
'combinations' => [ '1st' ],
)}
bless { };