diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-06-02 09:45:40 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-06-02 22:59:33 +0200 |
| commit | 9dc0baf5c611d46ff5136f1e32ef898b438e0aea (patch) | |
| tree | e95af7e0ad5c2a858480205d46f5f42ec9bf2e2e /tests/data | |
| parent | f7d1273cf9f9bc6553b30de38ed010e6c1ca3d28 (diff) | |
| download | curl-9dc0baf5c611d46ff5136f1e32ef898b438e0aea.tar.gz | |
tests: fix Accept-Encoding strips to work with Hyper builds
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
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/test220 | 10 | ||||
| -rw-r--r-- | tests/data/test221 | 4 | ||||
| -rw-r--r-- | tests/data/test222 | 4 | ||||
| -rw-r--r-- | tests/data/test223 | 4 | ||||
| -rw-r--r-- | tests/data/test224 | 4 | ||||
| -rw-r--r-- | tests/data/test230 | 4 | ||||
| -rw-r--r-- | tests/data/test232 | 4 | ||||
| -rw-r--r-- | tests/data/test314 | 10 | ||||
| -rw-r--r-- | tests/data/test315 | 4 | ||||
| -rw-r--r-- | tests/data/test316 | 4 | ||||
| -rw-r--r-- | tests/data/test396 | 4 | ||||
| -rw-r--r-- | tests/data/test397 | 4 |
12 files changed, 22 insertions, 38 deletions
diff --git a/tests/data/test220 b/tests/data/test220 index cfc8cbda7..844bb0239 100644 --- a/tests/data/test220 +++ b/tests/data/test220 @@ -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> diff --git a/tests/data/test221 b/tests/data/test221 index ce80637b1..2d769bcc7 100644 --- a/tests/data/test221 +++ b/tests/data/test221 @@ -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> diff --git a/tests/data/test222 b/tests/data/test222 index a06234a08..3f6e7c97f 100644 --- a/tests/data/test222 +++ b/tests/data/test222 @@ -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> diff --git a/tests/data/test223 b/tests/data/test223 index a37645d7d..4d0dddc11 100644 --- a/tests/data/test223 +++ b/tests/data/test223 @@ -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> diff --git a/tests/data/test224 b/tests/data/test224 index f98c8eddf..4fc84207c 100644 --- a/tests/data/test224 +++ b/tests/data/test224 @@ -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> diff --git a/tests/data/test230 b/tests/data/test230 index ea54f9dd4..a8c04be68 100644 --- a/tests/data/test230 +++ b/tests/data/test230 @@ -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> diff --git a/tests/data/test232 b/tests/data/test232 index a856adea2..32fdc6a35 100644 --- a/tests/data/test232 +++ b/tests/data/test232 @@ -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> diff --git a/tests/data/test314 b/tests/data/test314 index 5080ceabc..cdc36af21 100644 --- a/tests/data/test314 +++ b/tests/data/test314 @@ -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> diff --git a/tests/data/test315 b/tests/data/test315 index 62f5b29e5..3073251e2 100644 --- a/tests/data/test315 +++ b/tests/data/test315 @@ -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> diff --git a/tests/data/test316 b/tests/data/test316 index 5b26a2a9d..be7de17be 100644 --- a/tests/data/test316 +++ b/tests/data/test316 @@ -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> diff --git a/tests/data/test396 b/tests/data/test396 index 2cd04c389..11dd1a901 100644 --- a/tests/data/test396 +++ b/tests/data/test396 @@ -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> diff --git a/tests/data/test397 b/tests/data/test397 index 9bc65e994..4ad130a76 100644 --- a/tests/data/test397 +++ b/tests/data/test397 @@ -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> |