Commits

Anonymous committed 26aa7bd

#i10000# fixes for cygwin

Comments (0)

Files changed (1)

smoketestoo_native/smoketest.pl

 		($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="";
 sub ConvertCygwinToWin {
 	my ($cygwinpath) = @_;
 	my ($winpath);
+	my ($last_lineends) = $/;
 	SetCygwinLineends();
 	$winpath=`cygpath --windows $cygwinpath`;
 	chomp($winpath);
-	SetWinLineends();
+	$/ = $last_lineends;
 	return ($winpath);
 }