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

Improve 'collect_one_suite' so it looks in storage/*/mysql-test-suites by default

Browse Source 
Also make it possible to specify a path to the suite, for example:
./mtr --suite=/some/path/to/suitedir 


mysql-test/lib/My/Find.pm:
  Extend 'my_find_paths' to glob path names
This commit is contained in:
unknown 2008-04-22 12:40:48 +02:00
parent fd47c80e6d
commit 3674c72d20
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,12 @@ sub my_find_paths {
@paths= map { "$base/$_" } @paths;
#print "paths: @paths\n";
# -------------------------------------------------------
# Glob all paths to expand wildcards
# -------------------------------------------------------
@paths= map { glob("$_") } @paths;
#print "paths: @paths\n";
# -------------------------------------------------------
# Return the list of paths
# -------------------------------------------------------

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

@ -55,6 +55,7 @@ use File::Basename;
use IO::File();
use My::Config;
use My::Platform;
use My::Find;
require "mtr_misc.pl";
@ -248,11 +249,20 @@ sub collect_one_suite($)
my $suitedir= "$::glob_mysql_test_dir"; # Default
if ( $suite ne "main" )
{
$suitedir= mtr_path_exists("$suitedir/suite/$suite",
"$suitedir/$suite");
if ( -d $suite ){
$suitedir= $suite;
}
else
{
$suitedir= my_find_dir($::basedir,
["mysql-test/suite",
"mysql-test",
# Look in storage engine specific suite dirs
"storage/*/mysql-test-suites"
],
[$suite]);
}
mtr_verbose("suitedir: $suitedir");
}
my $testdir= "$suitedir/t";