From 480ca49ecbdcc61a6c837799bb550a3e52915be6 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sun, 26 Jan 2014 11:23:11 +0100 Subject: runtests.pl: reverse line-ending conversion on Windows It makes more sense to convert the expected output to [CR][LF] on Windows than to force the actual, probably correct, output to [LF]. This way it is actually possible to see if curl outputs the correct line-ending excepted by a text-aware test case. --- tests/runtests.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/runtests.pl b/tests/runtests.pl index b459c33ac..e63aa0321 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -3616,7 +3616,8 @@ sub singletest { my $filemode=$hash{'mode'}; if($filemode && ($filemode eq "text") && $has_textaware) { # text mode when running on windows: fix line endings - map s/\r\n/\n/g, @actual; + map s/\r\n/\n/g, @validstdout; + map s/\n/\r\n/g, @validstdout; } if($hash{'nonewline'}) { @@ -3644,7 +3645,8 @@ sub singletest { my $filemode=$hash{'mode'}; if($filemode && ($filemode eq "text") && $has_textaware) { # text mode when running on windows: fix line endings - map s/\r\n/\n/g, @out; + map s/\r\n/\n/g, @reply; + map s/\n/\r\n/g, @reply; } $res = compare($testnum, $testname, "data", \@out, \@reply); @@ -3788,9 +3790,9 @@ sub singletest { my $filemode=$hash{'mode'}; if($filemode && ($filemode eq "text") && $has_textaware) { - # text mode when running on windows means adding an extra - # strip expression - push @stripfile, "s/\r\n/\n/"; + # text mode when running on windows: fix line endings + map s/\r\n/\n/g, @outfile; + map s/\n/\r\n/g, @outfile; } my $strip; -- cgit v1.2.3