diff --git a/.travis.yml b/.travis.yml index 210a0de32..4947ee4c1 100644 --- 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 220 221 222 223 224 230 232 314 315 316 396 397" + - 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 271 314 315 316 396 397" addons: apt: <<: *common_apt diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index e5c2a312a..b99fd26a9 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -177,12 +177,14 @@ that will be checked/used if specified. ### `` A newline-separated list of keywords describing what this test case uses and -tests. Try to use an already used keyword. These keywords will be used for -statistical/informational purposes and for choosing or skipping classes -of tests. "Keywords" must begin with an alphabetic character, "-", "[" -or "{" and may actually consist of multiple words separated by spaces -which are treated together as a single identifier. +tests. Try to use already used keywords. These keywords will be used for +statistical/informational purposes and for choosing or skipping classes of +tests. "Keywords" must begin with an alphabetic character, "-", "[" or "{" +and may actually consist of multiple words separated by spaces which are +treated together as a single identifier. +When using curl built with Hyper, the keywords must include HTTP or HTTPS for +'hyper mode' to kick in and make line ending checks work for tests. ## `` ### `` diff --git a/tests/runtests.pl b/tests/runtests.pl index 696c11a72..2a2b4ee1a 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -3524,7 +3524,8 @@ sub prepro { if($show) { subVariables(\$s, $testnum, "%"); subBase64(\$s); - subNewlines(\$s) if($has_hyper); + subNewlines(\$s) if($has_hyper && ($keywords{"HTTP"} || + $keywords{"HTTPS"})); push @out, $s; } }