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

tests: fix Accept-Encoding strips to work with Hyper builds

Browse source 
The previous strip also removed the CR which turned problematic.

valgrind.supp: add zstd suppression using hyper

Reported-and-analyzed-by: Kevin Burke
Fixes #7169
Closes #7171
This commit is contained in:
Daniel Stenberg 2021-06-02 09:45:40 +02:00
parent f7d1273cf9
commit 9dc0baf5c6
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
14 changed files with 32 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/data/test220
View file

@ -55,22 +55,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
%if hyper
s/^Accept-Encoding: .*/Accept-Encoding: xxx /
%else
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
%endif
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
%if hyper
Accept-Encoding: xxx
%else
Accept-Encoding: xxx
%endif
</protocol>
</verify>

4
tests/data/test221
View file

@ -55,14 +55,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
<errorcode>

4
tests/data/test222
View file

@ -186,14 +186,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
</verify>

4
tests/data/test223
View file

@ -76,14 +76,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
<errorcode>

4
tests/data/test224
View file

@ -91,14 +91,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
</verify>

4
tests/data/test230
View file

@ -187,14 +187,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
</verify>

4
tests/data/test232
View file

@ -186,14 +186,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
</verify>

10
tests/data/test314
View file

@ -182,22 +182,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
%if hyper
s/^Accept-Encoding: .*/Accept-Encoding: xxx /
%else
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
%endif
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
%if hyper
Accept-Encoding: xxx
%else
Accept-Encoding: xxx
%endif
</protocol>
</verify>

4
tests/data/test315
View file

@ -72,14 +72,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
<errorcode>

4
tests/data/test316
View file

@ -182,14 +182,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
</verify>

4
tests/data/test396
View file

@ -186,14 +186,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
</verify>

4
tests/data/test397
View file

@ -182,14 +182,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
# Verify data after the test has been "shot"
<verify>
<strippart>
s/^Accept-Encoding: .*/Accept-Encoding: xxx/
s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
</strippart>
<protocol>
GET /%TESTNUMBER HTTP/1.1
Host: %HOSTIP:%HTTPPORT
User-Agent: curl/%VERSION
Accept: */*
Accept-Encoding: xxx
Accept-Encoding: xxx
</protocol>
</verify>