aboutsummaryrefslogtreecommitdiffstats
path: root/qtest/module
diff options
context:
space:
mode:
Diffstat (limited to 'qtest/module')
-rw-r--r--qtest/module/TestDriver.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/qtest/module/TestDriver.pm b/qtest/module/TestDriver.pm
index 7029457e..061d0e26 100644
--- a/qtest/module/TestDriver.pm
+++ b/qtest/module/TestDriver.pm
@@ -107,7 +107,7 @@ my $color_emph = "";
# MSWin32 support
my $in_windows = 0;
my $winbin = undef;
-if ($^O eq 'MSWin32')
+if (($^O eq 'MSWin32') || ($^O eq 'msys'))
{
$in_windows = 1;
}
@@ -784,6 +784,10 @@ sub runtest
binmode F;
while (<$in>)
{
+ if ($flags & $rep->NORMALIZE_NEWLINES)
+ {
+ s/\r$//;
+ }
print F;
}
$in->close();