mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-17 14:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

runtests.pl: reverse line-ending conversion on Windows

Browse Source 
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.
This commit is contained in:
Marc Hoersken 2014-01-26 11:23:11 +01:00
parent 82f558366f
commit 480ca49ecb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/runtests.pl
View File

@ -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;