Browse Source

Resolve opt_vardir in MTR with realpath. Server resolves some directory names, thus

mtr should do it as well, to avoid differences in test output. 

This fixes sys_vars.secure_file_priv on FreeBSD9.0 buildbot.
pull/57/head
Vladislav Vaintroub 14 years ago
parent
commit
2cf17b09ed
  1. 13
      mysql-test/mysql-test-run.pl

13
mysql-test/mysql-test-run.pl

@ -78,7 +78,8 @@ BEGIN {
use lib "lib";
use Cwd;
use Cwd ;
use Cwd 'realpath';
use Getopt::Long;
use My::File::Path; # Patched version of File::Path
use File::Basename;
@ -1040,8 +1041,14 @@ sub ignore_option {
# Setup any paths that are $opt_vardir related
sub set_vardir {
my ($vardir)= @_;
$opt_vardir= $vardir;
if(IS_WINDOWS)
{
$opt_vardir= $vardir;
}
else
{
$opt_vardir= realpath($vardir);
}
$path_vardir_trace= $opt_vardir;
# Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...

Loading…
Cancel
Save