diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2019-02-02 02:35:15 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2019-02-02 04:25:25 +0100 |
| commit | 8acf636b4e525169a7f52160ce1a5423be762271 (patch) | |
| tree | 084809f1558da02f21af80e180ab0fef1346cc02 /qtest/module | |
| parent | d491ed875347be9f5b5dce27dd28f28b382ca9ab (diff) | |
| download | qpdf-8acf636b4e525169a7f52160ce1a5423be762271.tar.zst | |
Incorporate improved Windows fragility workaround from qtest
Diffstat (limited to 'qtest/module')
| -rw-r--r-- | qtest/module/TestDriver.pm | 6 |
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(); |