REGTESTS: Fix some scripts to be compatible with 2.4 and prior
"feature cmd" is not supported on older versions. In addition, the
HAPROXY_TEST_TIMEOUT variable cannot be used to customize timeout values in
haproxy configurations.
This commit is specific to 2.4. There is no upstream ID.
diff --git a/reg-tests/http-rules/restrict_req_hdr_names.vtc b/reg-tests/http-rules/restrict_req_hdr_names.vtc
index 071b9bd..57bc7e1 100644
--- a/reg-tests/http-rules/restrict_req_hdr_names.vtc
+++ b/reg-tests/http-rules/restrict_req_hdr_names.vtc
@@ -1,5 +1,5 @@
varnishtest "http-restrict-req-hdr-names option tests"
-feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.0-dev0)'"
+#REQUIRE_VERSION=2.0
# This config tests "http-restrict-req-hdr-names" option
@@ -38,9 +38,9 @@
haproxy h1 -conf {
defaults
mode http
- timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
- timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
- timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout connect 1s
+ timeout client 1s
+ timeout server 1s
frontend fe1
bind "fd@${fe1}"
@@ -74,9 +74,9 @@
defaults
mode http
- timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
- timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
- timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout connect 1s
+ timeout client 1s
+ timeout server 1s
option http-restrict-req-hdr-names preserve
frontend fe2
diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc
index 607225d..4f97346 100644
--- a/reg-tests/ssl/ssl_default_server.vtc
+++ b/reg-tests/ssl/ssl_default_server.vtc
@@ -11,8 +11,8 @@
#
varnishtest "Test the 'set ssl cert' feature of the CLI"
-feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
-feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
+#REQUIRE_VERSION=2.4
+#REQUIRE_OPTIONS=OPENSSL
feature ignore_unknown_macro
server s1 -repeat 7 {