diff options
Diffstat (limited to 'mysql-test/lib/My/ConfigFactory.pm')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index ba1f68a9fc9..19c3ee4d5d8 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -30,6 +30,13 @@ sub get_basedir { return $basedir; } +sub get_testdir { + my ($self, $group)= @_; + my $testdir= $group->if_exist('testdir') || + $self->{ARGS}->{testdir}; + return $testdir; +} + # Retrive build directory (which is different from basedir in out-of-source build) sub get_bindir { if (defined $ENV{MTR_BINDIR}) @@ -151,9 +158,8 @@ sub fix_secure_file_priv { sub fix_std_data { my ($self, $config, $group_name, $group)= @_; - return my_find_dir($self->get_basedir($group), - ["share/mysql-test", "mysql-test"], - "std_data"); + my $testdir= $self->get_testdir($group); + return "$testdir/std_data"; } sub ssl_supported { |