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

Bug #52321 mtr test suite paths need to be updated

Browse Source 
Use $suitedir instead of $basedir to find suites
Add 'testdir' to ConfigFactory
This commit is contained in:
Bjorn Munch 2010-06-15 11:16:38 +02:00
parent bb6e8b6942
commit 070064f2d4
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/lib/My/ConfigFactory.pm
View File

@ -30,6 +30,13 @@ sub get_basedir {
return $basedir; return $basedir;
} }
sub get_testdir {
my ($self, $group)= @_;
my $testdir= $group->if_exist('testdir') ||
$self->{ARGS}->{testdir};
return $testdir;
}
sub fix_charset_dir { sub fix_charset_dir {
my ($self, $config, $group_name, $group)= @_; my ($self, $config, $group_name, $group)= @_;
@ -142,8 +149,8 @@ sub fix_secure_file_priv {
sub fix_std_data { sub fix_std_data {
my ($self, $config, $group_name, $group)= @_; my ($self, $config, $group_name, $group)= @_;
my $basedir= $self->get_basedir($group); my $testdir= $self->get_testdir($group);
return "$basedir/mysql-test/std_data"; return "$testdir/std_data";
} }
sub ssl_supported { sub ssl_supported {

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

@ -266,11 +266,11 @@ sub collect_one_suite($)
} }
else else
{ {
$suitedir= my_find_dir($::basedir, $suitedir= my_find_dir($suitedir,
["mysql-test/suite", ["suite",
"mysql-test", ".",
# Look in storage engine specific suite dirs # Look in storage engine specific suite dirs
"storage/*/mysql-test-suites" "../storage/*/mysql-test-suites"
], ],
[$suite]); [$suite]);
} }

2
mysql-test/mysql-test-run.pl
View File

@ -2742,6 +2742,7 @@ sub default_mysqld {
my $config= My::ConfigFactory->new_config my $config= My::ConfigFactory->new_config
( { ( {
basedir => $basedir, basedir => $basedir,
testdir => $glob_mysql_test_dir,
template_path => "include/default_my.cnf", template_path => "include/default_my.cnf",
vardir => $opt_vardir, vardir => $opt_vardir,
tmpdir => $opt_tmpdir, tmpdir => $opt_tmpdir,
@ -3350,6 +3351,7 @@ sub run_testcase ($) {
$config= My::ConfigFactory->new_config $config= My::ConfigFactory->new_config
( { ( {
basedir => $basedir, basedir => $basedir,
testdir => $glob_mysql_test_dir,
template_path => $tinfo->{template_path}, template_path => $tinfo->{template_path},
extra_template_path => $tinfo->{extra_template_path}, extra_template_path => $tinfo->{extra_template_path},
vardir => $opt_vardir, vardir => $opt_vardir,