From 8acf636b4e525169a7f52160ce1a5423be762271 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 1 Feb 2019 20:35:15 -0500
Subject: Incorporate improved Windows fragility workaround from qtest

---
 qtest/module/TestDriver.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'qtest/module')

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();
-- 
cgit v1.2.3-54-g00ecf