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

diff --git a/.travis.yml b/.travis.yml
index 0aa22be73fefbc382be18c14db9c1315a491fcc7..210a0de329d3f382c0fe7304d47609cbd3d76858 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -116,7 +116,7 @@ jobs:
         - libbrotli-dev
         - libzstd-dev
   - env:
-    - T=debug HYPER="yes" C="--with-hyper=$HOME/hyper --with-openssl" LD_LIBRARY_PATH=$HOME/hyper/target/debug:/usr/local/lib TFLAGS="1 to 153"
+    - T=debug HYPER="yes" C="--with-hyper=$HOME/hyper --with-openssl" LD_LIBRARY_PATH=$HOME/hyper/target/debug:/usr/local/lib TFLAGS="1 to 153 220 221 222 223 224 230 232 314 315 316 396 397"
     addons:
       apt:
         <<: *common_apt

diff --git a/tests/data/test220 b/tests/data/test220
index cfc8cbda7715977827266305b1f8cde22fd2e33b..844bb02393b37e1ecb49b832b5af3f18460027c9 100644 (file)
--- 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\r/
-%else
-s/^Accept-Encoding: .*/Accept-Encoding: xxx/
-%endif
+s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-%if hyper
 Accept-Encoding: xxx\r
-%else
-Accept-Encoding: xxx
-%endif
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test221 b/tests/data/test221
index ce80637b1058d9500930fbbb5154f20fbc7bd703..2d769bcc76b8638440311fe59e04cda63220c7a3 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 <errorcode>

diff --git a/tests/data/test222 b/tests/data/test222
index a06234a08ba8fab182c166ce2fc54a9a01a7e743..3f6e7c97f76a40f7b58e63b5e667a82b9ff80189 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test223 b/tests/data/test223
index a37645d7d9c600b2c5c108991c823651569b4616..4d0dddc11545eaaaf8ca36577b54db377995df03 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 <errorcode>

diff --git a/tests/data/test224 b/tests/data/test224
index f98c8eddf39f90a2f6f8d753190f1b77e6e0c991..4fc84207c491a7986eb6df6d209392357d896e4e 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test230 b/tests/data/test230
index ea54f9dd4b012863a4ecff5cff4032da7a980813..a8c04be682e2b14fb03ac58bcc370d4fc47716e7 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test232 b/tests/data/test232
index a856adea21fcfadcc44ffaf205ef3187859be77d..32fdc6a350c2dedd6b28e584660a70a66f6ebb68 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test314 b/tests/data/test314
index 5080ceabc087643b96eca36a0a13d4c399b9bd0e..cdc36af210a0647bba2deb44b8546466c1fbe381 100644 (file)
--- 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\r/
-%else
-s/^Accept-Encoding: .*/Accept-Encoding: xxx/
-%endif
+s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-%if hyper
 Accept-Encoding: xxx\r
-%else
-Accept-Encoding: xxx
-%endif
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test315 b/tests/data/test315
index 62f5b29e5abda63ce21ed1d9716a489c0d894965..3073251e2bfd489905f2b45ad5b1da1d888f9884 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 <errorcode>

diff --git a/tests/data/test316 b/tests/data/test316
index 5b26a2a9db8e9a046615eae5652658a0cd8c4884..be7de17be332d21173a931b3851ac5fa33cbbbdc 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test396 b/tests/data/test396
index 2cd04c389be0773f126d5d669edff0806a19e758..11dd1a901ea988dd1d0db956d311847a2069e72c 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test397 b/tests/data/test397
index 9bc65e994128b94d5f28288adc62b58b83e83168..4ad130a76b306043675dc80155bd1c7d199e78e4 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
-Accept-Encoding: xxx
+Accept-Encoding: xxx\r
 \r
 </protocol>
 </verify>

diff --git a/tests/valgrind.supp b/tests/valgrind.supp
index 6d72a8bb405c11d4dda0df1eae31043b4dca149e..6e570b1bf7c8aa8171f364a4c899f2b8bb05267b 100644 (file)
--- a/tests/valgrind.supp
+++ b/tests/valgrind.supp
@@ -1,3 +1,12 @@
+{
+   zstd_decompression-1.3.3-on-Ubuntu-18.04_with_hyper
+   Memcheck:Cond
+   fun:ZSTD_decompressStream
+   fun:zstd_unencode_write
+   fun:Curl_unencode_write
+   fun:hyper_body_chunk
+}
+
 {
    zstd_decompression-1.3.3-on-Ubuntu-18.04
    Memcheck:Cond