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

mtr: allow nested plugin suites to be defaults too

Browse Source
This commit is contained in:
Sergei Golubchik 2014-02-06 16:25:18 +01:00
parent 78f11e8ee2
commit ceae5aaa7e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,15 +337,20 @@ sub parse_disabled {
# #
sub collect_default_suites(@) sub collect_default_suites(@)
{ {
my @dirs = my_find_dir(dirname($::glob_mysql_test_dir), use File::Find;
[ @plugin_suitedirs ], '*'); my @dirs;
for my $d (@dirs) { find(sub {
next unless -f "$d/suite.pm"; push @dirs, [$File::Find::topdir, $File::Find::name]
my $sname= basename($d); if -d and -f "$File::Find::name/suite.pm";
}, my_find_dir(dirname($::glob_mysql_test_dir), \@plugin_suitedirs));
for (@dirs) {
my ($plugin_root, $dir) = @$_;
my $sname= substr $dir, 1 + length $plugin_root;
# ignore overlays here, otherwise we'd need accurate # ignore overlays here, otherwise we'd need accurate
# duplicate detection with overlay support for the default suite list # duplicate detection with overlay support for the default suite list
next if $sname eq 'main' or -d "$::glob_mysql_test_dir/suite/$sname"; next if $sname eq 'main' or -d "$::glob_mysql_test_dir/suite/$sname";
my $s = load_suite_object($sname, $d); my $s = load_suite_object($sname, $dir);
push @_, $sname if $s->is_default(); push @_, $sname if $s->is_default();
} }
return @_; return @_;