romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 07:13:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: replace remaining CR bytes with the new macro %CR

Browse source 
There is no more mixed-newline file in the repository after this patch.
Except for`.bat` and `.sln` files (4 in total), all files use LF
newlines.

Also:
- `spacecheck.pl`: drop mixed-EOL exception for test data.
- runtests: add option `-w` to check if test data has stray CR bytes in
  them.
- build: enable the option above in test targets, except the CI-specific
  one where `spacecheck.pl` does this job already.
- tested OK (with expected failures) in CI with stray CRs added.
- cmake: enable option `-a` for the `tests` target. To continue testing
  after a failed test.

Follow-up to 63e9721b63 #19313
Follow-up to 6cf3d7b1b1 #19318
Follow-up to 4d2a05d3fe #19284

Closes #19347
This commit is contained in:
Viktor Szakats 2025-11-03 21:38:35 +01:00
parent 672886f734
commit 904e7ecb66
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
123 changed files with 2045 additions and 2009 deletions
Download patch file Download diff file Expand all files Collapse all files

268
tests/data/test650
View file

@ -70,150 +70,150 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
# boundary string and since 5 of them are in the body contents, we see
# (5*12) == 60 bytes less
<protocol>
POST /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
Transfer-Encoding: chunked
Content-Type: multipart/form-data; boundary=----------------------------
Expect: 100-continue
385
------------------------------
Content-Disposition: form-data; name="fieldname"
Content-Type: text/plain
X-customheader-1: Header 1 data
X-customheader-2: Header 2 data
this is what we post to the silly web server
------------------------------
Content-Disposition: form-data; name="fieldnam"
uhis is what we post to the silly web serve
------------------------------
Content-Disposition: form-data; name="multifile"
Content-Type: multipart/mixed; boundary=----------------------------
------------------------------
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
Content-Type: application/octet-stream
POST /%TESTNUMBER HTTP/1.1%CR
Host: %HOSTIP:%HTTPPORT%CR
Accept: */*%CR
Transfer-Encoding: chunked%CR
Content-Type: multipart/form-data; boundary=----------------------------%CR
Expect: 100-continue%CR
%CR
385%CR
------------------------------%CR
Content-Disposition: form-data; name="fieldname"%CR
Content-Type: text/plain%CR
X-customheader-1: Header 1 data%CR
X-customheader-2: Header 2 data%CR
%CR
this is what we post to the silly web server%CR
------------------------------%CR
Content-Disposition: form-data; name="fieldnam"%CR
%CR
uhis is what we post to the silly web serve%CR
------------------------------%CR
Content-Disposition: form-data; name="multifile"%CR
Content-Type: multipart/mixed; boundary=----------------------------%CR
%CR
------------------------------%CR
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"%CR
Content-Type: application/octet-stream%CR
%CR
This is data from a file.
------------------------------
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
Content-Type: text/whatever
ab
%CR
------------------------------%CR
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"%CR
Content-Type: text/whatever%CR
%CR
%CR
ab%CR
This is data from a file.
------------------------------
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
Content-Type: text/whatever
bb
%CR
------------------------------%CR
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"%CR
Content-Type: text/whatever%CR
%CR
%CR
bb%CR
This is data from a file.
--------------------------------
------------------------------
Content-Disposition: form-data; name="filecontents"
11b
%CR
--------------------------------%CR
%CR
------------------------------%CR
Content-Disposition: form-data; name="filecontents"%CR
%CR
%CR
11b%CR
This is data from a file.
------------------------------
Content-Disposition: form-data; name="formlength"
1433
------------------------------
Content-Disposition: form-data; name="standardinput"
Content-Type: application/octet-stream
16
%CR
------------------------------%CR
Content-Disposition: form-data; name="formlength"%CR
%CR
1433%CR
------------------------------%CR
Content-Disposition: form-data; name="standardinput"%CR
Content-Type: application/octet-stream%CR
%CR
%CR
16%CR
Some data from stdin
36
--------------------------------
0
POST /%TESTNUMBER0002 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
Transfer-Encoding: chunked
Content-Type: multipart/form-data; boundary=----------------------------
Expect: 100-continue
385
------------------------------
Content-Disposition: form-data; name="fieldname"
Content-Type: text/plain
X-customheader-1: Header 1 data
X-customheader-2: Header 2 data
this is what we post to the silly web server
------------------------------
Content-Disposition: form-data; name="fieldnam"
uhis is what we post to the silly web serve
------------------------------
Content-Disposition: form-data; name="multifile"
Content-Type: multipart/mixed; boundary=----------------------------
------------------------------
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
Content-Type: application/octet-stream
%CR
36%CR
%CR
--------------------------------%CR
%CR
0%CR
%CR
POST /%TESTNUMBER0002 HTTP/1.1%CR
Host: %HOSTIP:%HTTPPORT%CR
Accept: */*%CR
Transfer-Encoding: chunked%CR
Content-Type: multipart/form-data; boundary=----------------------------%CR
Expect: 100-continue%CR
%CR
385%CR
------------------------------%CR
Content-Disposition: form-data; name="fieldname"%CR
Content-Type: text/plain%CR
X-customheader-1: Header 1 data%CR
X-customheader-2: Header 2 data%CR
%CR
this is what we post to the silly web server%CR
------------------------------%CR
Content-Disposition: form-data; name="fieldnam"%CR
%CR
uhis is what we post to the silly web serve%CR
------------------------------%CR
Content-Disposition: form-data; name="multifile"%CR
Content-Type: multipart/mixed; boundary=----------------------------%CR
%CR
------------------------------%CR
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"%CR
Content-Type: application/octet-stream%CR
%CR
This is data from a file.
------------------------------
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
Content-Type: text/whatever
ab
%CR
------------------------------%CR
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"%CR
Content-Type: text/whatever%CR
%CR
%CR
ab%CR
This is data from a file.
------------------------------
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
Content-Type: text/whatever
bb
%CR
------------------------------%CR
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"%CR
Content-Type: text/whatever%CR
%CR
%CR
bb%CR
This is data from a file.
--------------------------------
------------------------------
Content-Disposition: form-data; name="filecontents"
11b
%CR
--------------------------------%CR
%CR
------------------------------%CR
Content-Disposition: form-data; name="filecontents"%CR
%CR
%CR
11b%CR
This is data from a file.
------------------------------
Content-Disposition: form-data; name="formlength"
1433
------------------------------
Content-Disposition: form-data; name="standardinput"
Content-Type: application/octet-stream
16
%CR
------------------------------%CR
Content-Disposition: form-data; name="formlength"%CR
%CR
1433%CR
------------------------------%CR
Content-Disposition: form-data; name="standardinput"%CR
Content-Type: application/octet-stream%CR
%CR
%CR
16%CR
Some data from stdin
36
--------------------------------
0
%CR
36%CR
%CR
--------------------------------%CR
%CR
0%CR
%CR
</protocol>
</verify>
</testcase>