diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-05-11 15:47:22 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-05-11 15:47:22 +0000 |
commit | 0bbe22f34e4843ec5358d3671f2bda710954b465 (patch) | |
tree | 139acfbde5e88e89ec6cb3aff04364043d06b41b /smoketestoo_native | |
parent | #i10000# Correct echo statement for 4nt case. (diff) | |
download | core-0bbe22f34e4843ec5358d3671f2bda710954b465.tar.gz core-0bbe22f34e4843ec5358d3671f2bda710954b465.zip |
#i10000# fixes for cygwin
Diffstat (limited to 'smoketestoo_native')
-rwxr-xr-x | smoketestoo_native/smoketest.pl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index 61b95f7efa2f..fc7fbf278a7c 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -837,8 +837,13 @@ sub getInstset { ($NEWINSTSET, $INSTSET, $sufix) = fileparse ($smoketest_install); return ($NEWINSTSET, $INSTSET); } - if (!isLocalEnv() and !defined($ENV{CWS_WORK_STAMP}) and (-e $SHIP) and ($gui ne $cygwin)) { + if (!isLocalEnv() and !defined($ENV{CWS_WORK_STAMP}) and (-e $SHIP)) { + my $last_lineend = $/; + if ($gui = $cygwin) { + &SetCygwinLineends(); + } ($NEWINSTSET, $INSTSET) = getSetFromServer(); + $/ = $last_lineend; } else { $InstDir=""; @@ -1095,10 +1100,11 @@ sub ConvertCygwinToWin_Shell { sub ConvertCygwinToWin { my ($cygwinpath) = @_; my ($winpath); + my ($last_lineends) = $/; SetCygwinLineends(); $winpath=`cygpath --windows $cygwinpath`; chomp($winpath); - SetWinLineends(); + $/ = $last_lineends; return ($winpath); } |