1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upmerge optional testsuite path

Browse Source
This commit is contained in:
Bjorn Munch 2012-05-15 09:19:58 +02:00
commit 0e66663159
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/lib/My/Find.pm
View File

@ -126,9 +126,9 @@ sub my_find_file {
#
#
sub my_find_dir {
my ($base, $paths, $dirs, $required)= @_;
croak "usage: my_find_dir(<base>, <paths>[, <dirs>])"
unless (@_ == 3 or @_ == 2);
my ($base, $paths, $dirs, $optional)= @_;
croak "usage: my_find_dir(<base>, <paths>[, <dirs>[, <optional>]])"
unless (@_ == 3 or @_ == 2 or @_ == 4);
# -------------------------------------------------------
# Find and return the first directory
@ -136,6 +136,7 @@ sub my_find_dir {
foreach my $path (my_find_paths($base, $paths, $dirs)) {
return $path if ( -d $path );
}
return "" if $optional;
find_error($base, $paths, $dirs);
}

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

@ -137,6 +137,7 @@ sub collect_test_cases ($$$$) {
{
push(@$cases, collect_one_suite($suite, $opt_cases, $opt_skip_test_list));
last if $some_test_found;
push(@$cases, collect_one_suite("i_".$suite, $opt_cases, $opt_skip_test_list));
}
}
@ -288,13 +289,15 @@ sub collect_one_suite($)
$suitedir= my_find_dir($::basedir,
["share/mysql-test/suite",
"mysql-test/suite",
"internal/mysql-test/suite",
"mysql-test",
# Look in storage engine specific suite dirs
"storage/*/mtr",
# Look in plugin specific suite dir
"plugin/$suite/tests",
],
[$suite, "mtr"]);
[$suite, "mtr"], ($suite =~ /^i_/));
return unless $suitedir;
}
mtr_verbose("suitedir: $suitedir");
}