diff options
author | unknown <msvensson@pilot.mysql.com> | 2007-12-19 12:58:06 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.mysql.com> | 2007-12-19 12:58:06 +0100 |
commit | 23f0c6d4fcbb0fd3d7281afe9019c9da91bb7290 (patch) | |
tree | 426f515dfdcf63b8869ca5850f0de664f81ec556 /mysql-test/lib/mtr_misc.pl | |
parent | 516a843b521431d359651cdd8ebd71691d217df6 (diff) | |
download | mariadb-git-23f0c6d4fcbb0fd3d7281afe9019c9da91bb7290.tar.gz |
Windows fixeds for mtr
CMakeLists.txt:
Add CMakeLists.txt in mysql-test/lib/My/SafeProcess/
mysql-test/lib/My/Find.pm:
Fix for windows
mysql-test/lib/My/SafeProcess.pm:
Fix Tim's review comments
mysql-test/lib/mtr_misc.pl:
Rename glob_win32 to is_win32
mysql-test/mysql-test-run.pl:
Move set_mtr_build_thread_ports earlier
Set MTR_BUILD_THREAD if to the used value
mysql-test/lib/My/SafeProcess/CMakeLists.txt:
New BitKeeper file ``mysql-test/lib/My/SafeProcess/CMakeLists.txt''
Diffstat (limited to 'mysql-test/lib/mtr_misc.pl')
-rw-r--r-- | mysql-test/lib/mtr_misc.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl index 95f5bf584f0..3c1d60fd6ab 100644 --- a/mysql-test/lib/mtr_misc.pl +++ b/mysql-test/lib/mtr_misc.pl @@ -49,7 +49,7 @@ sub mtr_native_path($) if ($::mysql_version_id < 50000); $path=~ s/\//\\/g - if ($::glob_win32); + if ($::is_win32); return $path; } @@ -72,7 +72,7 @@ sub mtr_add_arg ($$@) { # Quote args if args contain space $format= "\"$format\"" - if ($::glob_win32 and grep(/\s/, @fargs)); + if ($::is_win32 and grep(/\s/, @fargs)); push(@$args, sprintf($format, @fargs)); } @@ -111,7 +111,7 @@ sub mtr_path_exists (@) { sub mtr_script_exists (@) { foreach my $path ( @_ ) { - if($::glob_win32) + if($::is_win32) { return $path if -f $path; } @@ -151,10 +151,10 @@ sub mtr_file_exists (@) { sub mtr_exe_maybe_exists (@) { my @path= @_; - map {$_.= ".exe"} @path if $::glob_win32; + map {$_.= ".exe"} @path if $::is_win32; foreach my $path ( @path ) { - if($::glob_win32) + if($::is_win32) { return $path if -f $path; } |