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

tests: shorten space and tab macro names

Browse source 
Easier to write and read.

Follow-up to d29f14b9cf #19300

Closes #19349
This commit is contained in:
Viktor Szakats 2025-11-04 04:05:19 +01:00
parent 87f448ed52
commit 403a2c2b06
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
41 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/tests/FILEFORMAT.md
View file

@ -81,8 +81,8 @@ For example, to insert the word hello 100 times:
To add significant whitespace characters at the end of the line, or to empty
lines:
%spc%
%tab%
%SP - space
%TAB - horizontal tab
## Insert capped epoch days

2
tests/data/test1029
View file

@ -50,7 +50,7 @@ Content-Length: 62
Connection: close
This server reply is for testing a simple Location: following
http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER 0%spc%
http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER 0%SP
</stdout>
</verify>
</testcase>

2
tests/data/test1070
View file

@ -57,7 +57,7 @@ Expect: 100-continue
Content-Length: 2313
Content-Type: application/x-www-form-urlencoded
This creates%spc%
This creates%SP
</protocol>
</verify>
</testcase>

2
tests/data/test1090
View file

@ -30,7 +30,7 @@ Connection: close
Content-Type: text/plain; charset=us-ascii
0007
bigger%spc%
bigger%SP
0008
monster

6
tests/data/test1105
View file

@ -19,9 +19,9 @@ Funny-head: yesyes swsclose
Set-Cookie: foobar=name;
Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
Set-Cookie: foo%tab%bar=barfoo
Set-Cookie: bar%tab%foo=
Set-Cookie: bar=foo%tab%bar
Set-Cookie: foo%TABbar=barfoo
Set-Cookie: bar%TABfoo=
Set-Cookie: bar=foo%TABbar
</data>
</reply>

10
tests/data/test1185
View file

@ -20,7 +20,7 @@ checksrc
* Violate each rule at least once.
**/
int hello; /*------------------------------------------------------------------*/
int%tab%tab;
int%TABtab;
int trailing_space;
int a = func ();
int b = func( b);
@ -91,7 +91,7 @@ void startfunc(int a, int b) {
./%LOGDIR/code1185.c:4:82: warning: Longer than 79 columns (LONGLINE)
int hello; /*------------------------------------------------------------------*/
./%LOGDIR/code1185.c:5:4: error: Contains TAB character (TABS)
int%tab%tab;
int%TABtab;
^
./%LOGDIR/code1185.c:7:13: warning: func with space (SPACEBEFOREPAREN)
int a = func ();
@ -118,7 +118,7 @@ void startfunc(int a, int b) {
} else {
^
./%LOGDIR/code1185.c:24:11: warning: missing space after close paren (PARENBRACE)
if(a == 2){%spc%%spc%
if(a == 2){%SP%SP
^
./%LOGDIR/code1185.c:28:14: warning: no space before semicolon (SPACESEMICOLON)
func_return() ;
@ -205,10 +205,10 @@ void startfunc(int a, int b) {
// CPP comment ?
^
./%LOGDIR/code1185.c:1:1: error: Missing copyright statement (COPYRIGHT)
%spc%
%SP
^
./%LOGDIR/code1185.c:1:1: error: Missing closing comment (OPENCOMMENT)
%spc%
%SP
^
checksrc: 0 errors and 41 warnings
</stdout>

2
tests/data/test136
View file

@ -30,7 +30,7 @@ FTP with user and no password
<verify>
<protocol crlf="yes">
USER user
PASS%spc%
PASS%SP
PWD
EPSV
TYPE I

4
tests/data/test1461
View file

@ -47,8 +47,8 @@ Usage: curl [options...] <url>
This is not the full help; this menu is split into categories.
Use "--help category" to get an overview of all categories, which are:
auth, connection, curl, deprecated, dns, file, ftp, global, http, imap, ldap,%spc%
output, pop3, post, proxy, scp, sftp, smtp, ssh, telnet, tftp, timeout, tls,%spc%
auth, connection, curl, deprecated, dns, file, ftp, global, http, imap, ldap,%SP
output, pop3, post, proxy, scp, sftp, smtp, ssh, telnet, tftp, timeout, tls,%SP
upload, verbose.
Use "--help all" to list all options
Use "--help [option]" to view documentation for a given option

2
tests/data/test1654
View file

@ -27,7 +27,7 @@ h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 0
# a comment
h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 0
h1 example.com 443 h3 shiny.example.com 8443 "20121231 00:00:01" 0 0
%tab%h3 example.com 443 h3 shiny.example.com 8443 "20131231 00:00:00" 0 0
%TABh3 example.com 443 h3 shiny.example.com 8443 "20131231 00:00:00" 0 0
# also a comment
bad example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 0
rubbish

2
tests/data/test1664
View file

@ -68,7 +68,7 @@ curlx_str_singlespace
3: ("b") 5, line 0
4: ("\") 5, line 0
5: (" ") 0, line 1
6: ("%tab%") 5, line 0
6: ("%TAB") 5, line 0
7: ("
") 5, line 0
8: ("") 5, line 0

2
tests/data/test17
View file

@ -46,7 +46,7 @@ request MOOO
<protocol crlf="yes">
MOOO /that.site.com/%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: agent007 license to drill%tab%
User-Agent: agent007 license to drill%TAB
Accept: */*
</protocol>

4
tests/data/test1700
View file

@ -76,7 +76,7 @@ HTTP/1.1 101 Switching Protocols
Connection: Upgrade
Upgrade: h2c
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
last-modified: Tue, 13 Jun 2000 12:10:00 GMT
etag: "21025-dc7-39462498"
@ -87,7 +87,7 @@ funny-head: yesyes
via: 1.1 nghttpx
-foo-
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html

2
tests/data/test1701
View file

@ -65,7 +65,7 @@ HTTP/1.1 101 Switching Protocols
Connection: Upgrade
Upgrade: h2c
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
last-modified: Tue, 13 Jun 2000 12:10:00 GMT
etag: "21025-dc7-39462498"

2
tests/data/test1702
View file

@ -61,7 +61,7 @@ HTTP/1.1 101 Switching Protocols
Connection: Upgrade
Upgrade: h2c
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
last-modified: Tue, 13 Jun 2000 12:10:00 GMT
etag: "21025-dc7-39462498"

4
tests/data/test188
View file

@ -19,7 +19,7 @@ Content-Length: 3
OK
</data>
<data1>
HTTP/1.1 200 OK%spc%
HTTP/1.1 200 OK%SP
Connection: close
Content-Length: 15
Content-Range: bytes 50-
@ -32,7 +32,7 @@ HTTP/1.1 301 OK swsbounce
Location: /%TESTNUMBER
Content-Length: 3
HTTP/1.1 200 OK%spc%
HTTP/1.1 200 OK%SP
Connection: close
Content-Length: 15
Content-Range: bytes 50-

4
tests/data/test189
View file

@ -16,7 +16,7 @@ Content-Length: 3
OK
</data>
<data1>
HTTP/1.1 200 OK%spc%
HTTP/1.1 200 OK%SP
Connection: close
Content-Length: 15
@ -28,7 +28,7 @@ HTTP/1.1 301 OK swsbounce
Location: /%TESTNUMBER
Content-Length: 3
HTTP/1.1 200 OK%spc%
HTTP/1.1 200 OK%SP
Connection: close
Content-Length: 15

4
tests/data/test1940
View file

@ -59,8 +59,8 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
- Set-Cookie == secondcookie=2data; (1/3)
- Set-Cookie == cookie3=data3; (2/3)
Fold == is folding a line
Blank ==%spc%
Blank2 ==%spc%
Blank ==%SP
Blank2 ==%SP
</stdout>
</verify>
</testcase>

2
tests/data/test1955
View file

@ -65,7 +65,7 @@ Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, S
X-Xxx-Date: 19700101T000000Z
test3: 1234
test2:
test_space: t%tab%s m%tab% end%repeat[4 x ]%
test_space: t%TABs m%TAB end%repeat[4 x ]%
tesMixCase: MixCase
</protocol>

2
tests/data/test1958
View file

@ -63,7 +63,7 @@ GET /aws_sigv4/testapi/test HTTP/1.1
Host: exam.ple.com:9000
Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff
X-Xxx-Date: 19700101T000000Z
X-Xxx-Content-Sha256: %tab%arbitrary%spc%
X-Xxx-Content-Sha256: %TABarbitrary%SP
</protocol>
</verify>

4
tests/data/test212
View file

@ -51,11 +51,11 @@ PWD
CWD a
CWD path
EPRT |1|
PORT%spc%
PORT%SP
TYPE I
SIZE %TESTNUMBER
RETR %TESTNUMBER
PORT%spc%
PORT%SP
SIZE %TESTNUMBER
RETR %TESTNUMBER
QUIT

2
tests/data/test2302
View file

@ -66,7 +66,7 @@ Connection: Upgrade
%hex[%8a%808321]hex%
</protocol>
<stdout mode="text">
68 65 6c 6c 6f%spc%
68 65 6c 6c 6f%SP
RECFLAGS: 1
</stdout>
<limits>

2
tests/data/test2306
View file

@ -24,7 +24,7 @@ Funny-head: yesyes
</data>
<data2 nocheck="yes">
HTTP/1.1 200 OK swsclose
%tab%Access-Control-Allow-Origin: *
%TABAccess-Control-Allow-Origin: *
Connection: Keep-Alive
Content-Type: text/html; charset=utf-8
Date: Wed, 10 May 2023 14:58:08 GMT

2
tests/data/test2400
View file

@ -50,7 +50,7 @@ HTTP/2 GET over HTTPS
# Verify data after the test has been "shot"
<verify>
<stdout crlf="headers">
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html

2
tests/data/test2401
View file

@ -47,7 +47,7 @@ HTTP/2 POST over HTTPS
# Verify data after the test has been "shot"
<verify>
<stdout crlf="headers">
HTTP/2 201%spc%
HTTP/2 201%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 0
funny-head: yesyes

2
tests/data/test2403
View file

@ -51,7 +51,7 @@ HTTP/2 GET using %{header_json}
# Verify data after the test has been "shot"
<verify>
<stdout crlf="headers">
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html

2
tests/data/test2406
View file

@ -49,7 +49,7 @@ HTTP/2 over HTTPS with -f
# Verify data after the test has been "shot"
<verify>
<stdout crlf="headers">
HTTP/2 404%spc%
HTTP/2 404%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html

2
tests/data/test2500
View file

@ -58,7 +58,7 @@ Accept: */*
</protocol>
<stdout crlf="headers">
HTTP/3 200%spc%
HTTP/3 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
last-modified: Tue, 13 Jun 2000 12:10:00 GMT
etag: "21025-dc7-39462498"

2
tests/data/test2501
View file

@ -47,7 +47,7 @@ HTTP/3 POST
# Verify data after the test has been "shot"
<verify>
<stdout crlf="headers">
HTTP/3 201%spc%
HTTP/3 201%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 0
funny-head: yesyes

2
tests/data/test2503
View file

@ -50,7 +50,7 @@ HTTP/3 header-api
# Verify data after the test has been "shot"
<verify>
<stdout crlf="headers">
HTTP/3 200%spc%
HTTP/3 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html

4
tests/data/test358
View file

@ -60,7 +60,7 @@ HTTP/1.1 101 Switching Protocols
Connection: Upgrade
Upgrade: h2c
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html
@ -69,7 +69,7 @@ alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
via: 1.1 nghttpx
-foo-
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html

4
tests/data/test359
View file

@ -60,7 +60,7 @@ HTTP/1.1 101 Switching Protocols
Connection: Upgrade
Upgrade: h2c
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html
@ -69,7 +69,7 @@ alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
via: 1.1 nghttpx
-foo-
HTTP/2 200%spc%
HTTP/2 200%SP
date: Tue, 09 Nov 2010 14:49:00 GMT
content-length: 6
content-type: text/html

2
tests/data/test378
View file

@ -29,7 +29,7 @@ Reject using -T and -d at once
2
</errorcode>
<stderr mode="text">
Warning: You can only select one HTTP request method! You asked for both PUT%spc%
Warning: You can only select one HTTP request method! You asked for both PUT%SP
Warning: (-T, --upload-file) and POST (-d, --data).
</stderr>
</verify>

4
tests/data/test4
View file

@ -44,7 +44,7 @@ User-Agent: curl/%VERSION
extra-header: here
Accept: replaced
X-Custom-Header:
X-Test: foo;%spc%
X-Test: foo;%SP
X-Test2: foo;
GET /%TESTNUMBER HTTP/1.1
@ -53,7 +53,7 @@ User-Agent: curl/%VERSION
extra-header: here
Accept: replaced
X-Custom-Header:
X-Test: foo;%spc%
X-Test: foo;%SP
X-Test2: foo;
</protocol>

2
tests/data/test421
View file

@ -21,7 +21,7 @@ referrer-policy: strict-origin-when-cross-origin
access-control-allow-methods: GET, POST, PUT, DELETE, OPTIONS
access-control-max-age: 1728000
access-control-allow-headers: Authorization, Content-Type, AuthorizationOauth, X-EARLY-ACCESS
access-control-expose-headers:%spc%
access-control-expose-headers:%SP
vary: Accept
etag: W/"2678f9ab2ba550d164e7cc014aefd31e"
cache-control: max-age=0, private, must-revalidate

2
tests/data/test459
View file

@ -56,7 +56,7 @@ Content-Type: application/x-www-form-urlencoded
arg
</protocol>
<stderr mode="text">
Warning: %LOGDIR/config:1: warning: 'data' uses unquoted whitespace. This may%spc%
Warning: %LOGDIR/config:1: warning: 'data' uses unquoted whitespace. This may%SP
Warning: cause side-effects. Consider double quotes.
</stderr>
</verify>

8
tests/data/test46
View file

@ -65,7 +65,7 @@ www.loser.com FALSE / FALSE 2139150993 UID 99
domain..tld FALSE / FALSE 2139150993 mooo indeed
#HttpOnly_domain..tld FALSE /want FALSE 2139150993 mooo2 indeed2
%endif
domain..tld FALSE /want FALSE 0 empty%tab%
domain..tld FALSE /want FALSE 0 empty%TAB
</file>
<features>
cookies
@ -88,18 +88,18 @@ Cookie: empty=; mooo2=indeed2; mooo=indeed
# This file was generated by libcurl! Edit at your own risk.
domain..tld FALSE /want/ FALSE 0 simplyhuge %repeat[3998 x z]%
domain..tld FALSE / FALSE 0 justaname%tab%
domain..tld FALSE / FALSE 0 justaname%TAB
domain..tld FALSE / FALSE 0 ASPSESSIONIDQGGQQSJJ GKNBDIFAAOFDPDAIEAKDIBKE
domain..tld FALSE / FALSE 0 ckySession temporary
domain..tld FALSE / FALSE %days[400] ckyPersistent permanent
%if large-time
domain..tld FALSE /want FALSE 0 empty%tab%
domain..tld FALSE /want FALSE 0 empty%TAB
#HttpOnly_domain..tld FALSE /want FALSE 22139150993 mooo2 indeed2
domain..tld FALSE / FALSE 22139150993 mooo indeed
www.loser.com FALSE / FALSE 22139150993 UID 99
www.fake.come FALSE / FALSE 22147483647 cookiecliente si
%else
domain..tld FALSE /want FALSE 0 empty%tab%
domain..tld FALSE /want FALSE 0 empty%TAB
#HttpOnly_domain..tld FALSE /want FALSE 2139150993 mooo2 indeed2
domain..tld FALSE / FALSE 2139150993 mooo indeed
www.loser.com FALSE / FALSE 2139150993 UID 99

2
tests/data/test54
View file

@ -11,7 +11,7 @@ followlocation
<data>
HTTP/1.1 302 This is a weirdo text message swsclose
Connection: close
Location:%spc%
Location:%SP
This server reply is for testing
</data>

2
tests/data/test646
View file

@ -39,7 +39,7 @@ It may contain any type of data.
</file1>
<file2 name="%LOGDIR/headers%TESTNUMBER">
# This line is a comment
X-fileheader1: This is a header from a file%spc%
X-fileheader1: This is a header from a file%SP
# This line is another comment. It precedes a folded header.
X-fileheader2: This is #a

2
tests/data/test792
View file

@ -36,7 +36,7 @@ machine %HOSTIP login username password%hex[%00]hex% hello
<verify>
<protocol crlf="yes">
USER username
PASS%spc%
PASS%SP
PWD
EPSV
TYPE I

2
tests/data/test793
View file

@ -36,7 +36,7 @@ machine %HOSTIP login username "password"%hex[%00]hex% hello
<verify>
<protocol crlf="yes">
USER username
PASS%spc%
PASS%SP
PWD
EPSV
TYPE I

4
tests/testutil.pm
View file

@ -147,8 +147,8 @@ sub subbase64 {
$$thing =~ s/%%DAYS%%/%alternatives[$d,$d2]/;
}
$$thing =~ s/%spc%/ /g; # space
$$thing =~ s/%tab%/\t/g; # horizontal tab
$$thing =~ s/%SP/ /g; # space
$$thing =~ s/%TAB/\t/g; # horizontal tab
# include a file
$$thing =~ s/%include ([^%]*)%[\n\r]+/includefile($1)/ge;