database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

per-combination result files

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-06 22:55:17 +01:00
parent 9c8c572fd3
commit 3320a4bffb
8 changed files with 32 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -616,20 +616,6 @@ sub collect_one_test_case {
suite => $suites{$suitename},
);
my $result_file= "$resdir/$tname.result";
if (-f $result_file) {
# Allow nonexistsing result file
# in that case .test must issue "exit" otherwise test
# should fail by default
$tinfo->{result_file}= $result_file;
}
else {
# No .result file exist
# Remember the path where it should be
# saved in case of --record
$tinfo->{record_file}= $result_file;
}
# ----------------------------------------------------------------------
# Skip some tests but include in list, just mark them as skipped
# ----------------------------------------------------------------------
@ -871,6 +857,36 @@ sub collect_one_test_case {
{
@cases = map make_combinations($_, @{$comb}), @cases;
}
for $tinfo (@cases) {
if ($tinfo->{combinations}) {
my $re = '(?:' . join('|', @{$tinfo->{combinations}}) . ')';
my $found = 0;
for (<$resdir/$tname,*.result>) {
m|$tname((?:,$re)+)\.result$| or next;
my $combs = $&;
my @commas = ($combs =~ m/,/g);
# prefer the most specific result file
if (@commas > $found) {
$found = @commas;
$tinfo->{result_file} = $_;
}
}
}
unless (defined $tinfo->{result_file}) {
my $result_file= "$resdir/$tname.result";
if (-f $result_file) {
$tinfo->{result_file}= $result_file;
} else {
# No .result file exist
# Remember the path where it should be
# saved in case of --record
$tinfo->{record_file}= $result_file;
}
}
}
return @cases;
}