f477f3efc3
Viktor Szakats
2025-11-10
Subject
tests/data: support using native newlines on disk, drop `.gitattributes`
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
tests/data/.gitattributes +0 -5tests/devtest.pl +1 -1tests/getpart.pm +41 -8tests/runner.pm +4 -7tests/runtests.pl +4 -4tests/util.py +3 -3
tests/data/.gitattributes+0 -5
| @@ -1,5 +0,0 @@ | |
| - | # Copyright (C) Daniel Stenberg, <[email protected]>, et al. |
| - | # |
| - | # SPDX-License-Identifier: curl |
| - | |
| - | test* -crlf |
tests/devtest.pl+1 -1
| @@ -176,7 +176,7 @@ while(@ARGV) { | |
| } | |
| elsif($ARGV[0] eq "preprocess") { | |
| shift @ARGV; | |
| - | loadtest("${TESTDIR}/test${ARGV[0]}"); |
| + | loadtest("${TESTDIR}/test${ARGV[0]}", 1); |
| readtestkeywords(); | |
| singletest_preprocess($ARGV[0]); | |
| } | |
tests/getpart.pm+41 -8
| @@ -217,7 +217,7 @@ sub partexists { | |
| # memoize('partexists', NORMALIZER => 'normalize_part'); # cache each result | |
| sub loadtest { | |
| - | my ($file)=@_; |
| + | my ($file, $original)=@_; |
| if(defined $xmlfile && $file eq $xmlfile) { | |
| # This test is already loaded | |
| @@ -228,7 +228,12 @@ sub loadtest { | |
| $xmlfile = ""; | |
| if(open(my $xmlh, "<", "$file")) { | |
| - | binmode $xmlh; # for crapage systems, use binary |
| + | if($original) { |
| + | binmode $xmlh, ':crlf' |
| + | } |
| + | else { |
| + | binmode $xmlh; # for crapage systems, use binary |
| + | } |
| while(<$xmlh>) { | |
| push @xml, $_; | |
| } | |
| @@ -251,16 +256,44 @@ sub fulltest { | |
| return @xml; | |
| } | |
| + | sub eol_detect { |
| + | my ($content) = @_; |
| + | |
| + | my $cr = () = $content =~ /\r/g; |
| + | my $lf = () = $content =~ /\n/g; |
| + | |
| + | if($cr > 0 && $lf == 0) { |
| + | return "cr"; |
| + | } |
| + | elsif($cr == 0 && $lf > 0) { |
| + | return "lf"; |
| + | } |
| + | elsif($cr == 0 && $lf == 0) { |
| + | return "bin"; |
| + | } |
| + | elsif($cr == $lf) { |
| + | return "crlf"; |
| + | } |
| + | |
| + | return ""; |
| + | } |
| + | |
| sub checktest { | |
| - | my $anyerr = 0; |
| + | my ($file) = @_; |
| - | for my $i (0 .. $#xml) { |
| - | if(index($xml[$i], "\r") >= 0) { |
| - | print STDERR "*** getpart.pm: $xmlfile:$i: 0x0d carriage return found. Use %CR macro instead.\n"; |
| - | $anyerr = 1; |
| + | if(open(my $xmlh, '<', $file)) { |
| + | binmode $xmlh; # we want the raw data to check original newlines |
| + | my $content = do { local $/; <$xmlh> }; |
| + | close($xmlh); |
| + | |
| + | my $eol = eol_detect($content); |
| + | if($eol eq '') { |
| + | print STDERR "*** getpart.pm: $xmlfile has mixed newlines. Replace significant carriage return with %CR macro, or convert to consistent newlines.\n"; |
| + | return 1; |
| } | |
| } | |
| - | return $anyerr; |
| + | |
| + | return 0; |
| } | |
| # write the test to the given file | |
tests/runner.pm+4 -7
| @@ -1149,12 +1149,9 @@ sub singletest_postcheck { | |
| } | |
| } | |
| - | if($checktests) { |
| - | loadtest("${TESTDIR}/test${testnum}"); # load the raw original data |
| - | if(checktest()) { |
| - | logmsg " $testnum: postcheck FAILED: issue(s) found in test data\n"; |
| - | return -1; |
| - | } |
| + | if($checktests && checktest("${TESTDIR}/test${testnum}")) { |
| + | logmsg " $testnum: postcheck FAILED: issue(s) found in test data\n"; |
| + | return -1; |
| } | |
| return 0; | |
| @@ -1181,7 +1178,7 @@ sub runner_test_preprocess { | |
| # ignore any error here--if there were one, it would have been | |
| # caught during the selection phase and this test would not be | |
| # running now | |
| - | loadtest("${TESTDIR}/test${testnum}"); |
| + | loadtest("${TESTDIR}/test${testnum}", 1); |
| readtestkeywords(); | |
| ################################################################### | |
tests/runtests.pl+4 -4
| @@ -1078,7 +1078,7 @@ sub singletest_shouldrun { | |
| $errorreturncode = 2; | |
| } | |
| - | if(loadtest("${TESTDIR}/test${testnum}")) { |
| + | if(loadtest("${TESTDIR}/test${testnum}", 1)) { |
| if($verbose) { | |
| # this is not a test | |
| logmsg "RUN: $testnum doesn't look like a test case\n"; | |
| @@ -1191,7 +1191,7 @@ sub singletest_shouldrun { | |
| } | |
| } | |
| - | if($why && $checktests && checktest()) { |
| + | if($why && $checktests && checktest("${TESTDIR}/test${testnum}")) { |
| logmsg "Warning: issue(s) found in test data: ${TESTDIR}/test${testnum}\n"; | |
| } | |
| @@ -1980,7 +1980,7 @@ sub singletest { | |
| ################################################################### | |
| # Load test file so CI registration can get the right data before the | |
| # runner is called | |
| - | loadtest("${TESTDIR}/test${testnum}"); |
| + | loadtest("${TESTDIR}/test${testnum}", 1); |
| ################################################################### | |
| # Register the test case with the CI environment | |
| @@ -3281,7 +3281,7 @@ if(%skipped && !$short) { | |
| sub testnumdetails { | |
| my ($desc, $numlist) = @_; | |
| foreach my $testnum (split(' ', $numlist)) { | |
| - | if(!loadtest("${TESTDIR}/test${testnum}")) { |
| + | if(!loadtest("${TESTDIR}/test${testnum}", 1)) { |
| my @info_keywords = getpart("info", "keywords"); | |
| my $testname = (getpart("client", "name"))[0]; | |
| chomp $testname; | |
tests/util.py+3 -3
| @@ -75,8 +75,8 @@ class TestData(object): | |
| log.debug("Parsing file %s", filename) | |
| - | with open(filename, "rb") as f: |
| - | contents = f.read().decode("utf-8") |
| + | with open(filename, "r", encoding='us-ascii') as f: |
| + | contents = f.read() |
| m = REPLY_DATA.search(contents) | |
| if not m: | |
| @@ -88,5 +88,5 @@ class TestData(object): | |
| if __name__ == '__main__': | |
| td = TestData("./data") | |
| - | data = td.get_test_data(1) |
| + | data = td.get_test_data(1451) |
| print(data) | |