mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
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''
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user