#i10000# fixes for cygwin

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);
 }