diff options
author | unknown <msvensson@pilot.mysql.com> | 2008-02-20 14:55:30 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.mysql.com> | 2008-02-20 14:55:30 +0100 |
commit | 0d01221c176da491ec96b803c3981e9432a2cfde (patch) | |
tree | abea8679a6fbc88f4b168a528803167c9af64b31 /mysql-test/lib/My/Platform.pm | |
parent | 6f26028287968970f911adf3a47cf644d80b1002 (diff) | |
download | mariadb-git-0d01221c176da491ec96b803c3981e9432a2cfde.tar.gz |
Use My::Platform
Put all path conversions in one file
Convert the --tmpdir passed to "mysqld --verbose --help"
mysql-test/lib/My/Find.pm:
Use My::Platform
mysql-test/lib/My/SafeProcess.pm:
use My::Platform
mysql-test/lib/mtr_cases.pm:
Use My::Platform
mysql-test/lib/mtr_misc.pl:
Move 'mtr_native_path' to My::Platform
mysql-test/lib/My/Platform.pm:
New BitKeeper file ``mysql-test/lib/My/Platform.pm''
mysql-test/lib/t/Platform.t:
New BitKeeper file ``mysql-test/lib/t/Platform.t''
Diffstat (limited to 'mysql-test/lib/My/Platform.pm')
-rw-r--r-- | mysql-test/lib/My/Platform.pm | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm new file mode 100644 index 00000000000..27543d55adf --- /dev/null +++ b/mysql-test/lib/My/Platform.pm @@ -0,0 +1,95 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +package My::Platform; + +use strict; + +use base qw(Exporter); +our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL + native_path posix_path mixed_path); + +BEGIN { + if ($^O eq "cygwin") { + # Make sure cygpath works + if ((system("cygpath > /dev/null 2>&1") >> 8) != 1){ + die "Could not execute 'cygpath': $!"; + } + eval 'sub IS_CYGWIN { 1 }'; + } + else { + eval 'sub IS_CYGWIN { 0 }'; + } + if ($^O eq "MSWin32") { + eval 'sub IS_WIN32PERL { 1 }'; + } + else { + eval 'sub IS_WIN32PERL { 0 }'; + } +} + +BEGIN { + if (IS_CYGWIN or IS_WIN32PERL) { + eval 'sub IS_WINDOWS { 1 }'; + } + else { + eval 'sub IS_WINDOWS { 0 }'; + } +} + + +# +# native_path +# Convert from path format used by perl to the underlying +# operating systems format +# +# NOTE +# Used when running windows binaries (that expect windows paths) +# in cygwin perl (that uses unix paths) +# + +sub mixed_path { + my ($path)= @_; + if (IS_CYGWIN){ + return unless defined $path; + $path= `cygpath -m $path`; + chomp $path; + } + return $path; +} + + +sub native_path { + my ($path)= @_; + $path=~ s/\//\\/g + if (IS_CYGWIN or IS_WIN32PERL); + return $path; +} + + +sub posix_path { + my ($path)= @_; + if (IS_CYGWIN){ + return unless defined $path; + $path= `cygpath $path`; + chomp $path; + } + return $path; +} + + + +1; |