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

mtr bug: even if the test is skipped, process combinations

Browse source 
otherwise, e.g.

  ./mtr main.mysql_install_db_win_admin,innodb

results in sporadic

mysql-test-run: *** ERROR: Could not run main.mysql_install_db_win_admin with 'innodb' combination(s)

depending on whether it'll process the skip (not windows admin)
or the innodb.combinations first (if skip is processed first,
innodb combination wasn't, making the further code think that the test
doesn't have innodb combination)
This commit is contained in:
Sergei Golubchik 2023-09-29 00:18:19 +02:00
parent 87d1ab9ad9
commit 04b7b3a0ca
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/lib/mtr_cases.pm
View file

@ -614,7 +614,7 @@ sub make_combinations($$@)
{
my ($test, $test_combs, @combinations) = @_;
return ($test) if $test->{'skip'} or not @combinations;
return ($test) unless @combinations;
if ($combinations[0]->{skip}) {
$test->{skip} = 1;
$test->{comment} = $combinations[0]->{skip} unless $test->{comment};
@ -647,6 +647,8 @@ sub make_combinations($$@)
}
}
return ($test) if $test->{'skip'};
my @cases;
foreach my $comb (@combinations)
{