HAProxy 2.4 is the lowest supported version, thus this always matches.
see 7aff1bf6b90caadfa95f6b43b526275191991d6f
---
reg-tests/cache/caching_rules.vtc | 2 --
reg-tests/cache/post_on_entry.vtc | 2 --
reg-tests/cache/vary.vtc | 2 --
reg-tests/cache/vary_accept_encoding.vtc | 2 --
reg-tests/checks/1be_40srv_odd_health_checks.vtc | 1 -
reg-tests/checks/40be_2srv_odd_health_checks.vtc | 1 -
reg-tests/checks/4be_1srv_health_checks.vtc | 1 -
reg-tests/checks/http-check-send.vtc | 1 -
reg-tests/connection/http_reuse_be_transparent.vtc | 2 --
reg-tests/connection/http_reuse_conn_hash.vtc | 1 -
reg-tests/connection/http_reuse_dispatch.vtc | 2 --
reg-tests/connection/proxy_protocol_tlv_validation.vtc | 2 --
reg-tests/connection/tcp_to_http_upgrade.vtc | 2 --
reg-tests/converter/fix.vtc | 1 -
reg-tests/converter/json_query.vtc | 1 -
reg-tests/converter/mqtt.vtc | 3 +--
reg-tests/converter/url_enc.vtc | 2 --
reg-tests/filters/random-forwarding.vtc | 1 -
reg-tests/http-messaging/http_bodyless_response.vtc | 2 --
reg-tests/http-messaging/http_bodyless_spliced_response.vtc | 2 --
reg-tests/http-messaging/http_wait_for_body.vtc | 1 -
reg-tests/http-messaging/protocol_upgrade.vtc | 2 --
reg-tests/http-messaging/websocket.vtc | 2 --
reg-tests/http-rules/except-forwardfor-originalto.vtc | 1 -
reg-tests/http-rules/normalize_uri.vtc | 1 -
reg-tests/http-set-timeout/set_timeout.vtc | 2 --
reg-tests/log/log_uri.vtc | 2 --
reg-tests/lua/txn_get_priv-thread.vtc | 1 -
reg-tests/sample_fetches/hashes.vtc | 2 --
reg-tests/sample_fetches/ubase64.vtc | 2 --
reg-tests/server/cli_add_server.vtc | 2 --
reg-tests/server/cli_delete_dynamic_server.vtc | 2 --
reg-tests/server/cli_set_ssl.vtc | 1 -
reg-tests/ssl/dynamic_server_ssl.vtc | 1 -
reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc | 1 -
reg-tests/stickiness/srvkey-addr.vtc | 2 --
36 files changed, 1 insertion(+), 57 deletions(-)
diff --git a/reg-tests/cache/caching_rules.vtc
b/reg-tests/cache/caching_rules.vtc
index a488875b3..ee85bf25c 100644
--- a/reg-tests/cache/caching_rules.vtc
+++ b/reg-tests/cache/caching_rules.vtc
@@ -2,8 +2,6 @@ varnishtest "Caching rules test"
# A response will not be cached unless it has an explicit age (Cache-Control
max-age of s-maxage, Expires) or a validator (Last-Modified, or ETag)
# A response will not be cached either if it has an Age header that is either
invalid (should be an integer) or greater than its max age.
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
server s1 {
diff --git a/reg-tests/cache/post_on_entry.vtc
b/reg-tests/cache/post_on_entry.vtc
index 66c89e4e4..0b930ecc4 100644
--- a/reg-tests/cache/post_on_entry.vtc
+++ b/reg-tests/cache/post_on_entry.vtc
@@ -1,7 +1,5 @@
varnishtest "A successful unsafe method (POST for instance) on a cached entry
must disable it."
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
server s1 {
diff --git a/reg-tests/cache/vary.vtc b/reg-tests/cache/vary.vtc
index 782a76ca7..494fe8f00 100644
--- a/reg-tests/cache/vary.vtc
+++ b/reg-tests/cache/vary.vtc
@@ -1,7 +1,5 @@
varnishtest "Vary support"
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
server s1 {
diff --git a/reg-tests/cache/vary_accept_encoding.vtc
b/reg-tests/cache/vary_accept_encoding.vtc
index 4b828a86a..c58c106e3 100644
--- a/reg-tests/cache/vary_accept_encoding.vtc
+++ b/reg-tests/cache/vary_accept_encoding.vtc
@@ -1,7 +1,5 @@
varnishtest "Check the Accept-Encoding processing implemented in the Vary
mechanism"
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
server s1 {
diff --git a/reg-tests/checks/1be_40srv_odd_health_checks.vtc
b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
index d0f3be53a..e4c0ff262 100644
--- a/reg-tests/checks/1be_40srv_odd_health_checks.vtc
+++ b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
@@ -6,7 +6,6 @@ feature ignore_unknown_macro
# The first health-checks passed tests are checked for all these servers
# thanks to syslog messages.
-#REQUIRE_VERSION=2.4
#EXCLUDE_TARGETS=freebsd
#REGTEST_TYPE=slow
diff --git a/reg-tests/checks/40be_2srv_odd_health_checks.vtc
b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
index cbd4fc00e..4d67971ff 100644
--- a/reg-tests/checks/40be_2srv_odd_health_checks.vtc
+++ b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
@@ -1,7 +1,6 @@
varnishtest "Health-checks"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
#EXCLUDE_TARGETS=freebsd,osx,generic
#REGTEST_TYPE=slow
diff --git a/reg-tests/checks/4be_1srv_health_checks.vtc
b/reg-tests/checks/4be_1srv_health_checks.vtc
index 02564be54..98f32d79e 100644
--- a/reg-tests/checks/4be_1srv_health_checks.vtc
+++ b/reg-tests/checks/4be_1srv_health_checks.vtc
@@ -1,7 +1,6 @@
varnishtest "Health-check test"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
#EXCLUDE_TARGETS=freebsd
#REGTEST_TYPE=slow
diff --git a/reg-tests/checks/http-check-send.vtc
b/reg-tests/checks/http-check-send.vtc
index 530ad7566..076aba7f9 100644
--- a/reg-tests/checks/http-check-send.vtc
+++ b/reg-tests/checks/http-check-send.vtc
@@ -1,6 +1,5 @@
varnishtest "Health-checks: http-check send test"
#REGTEST_TYPE=slow
-#REQUIRE_VERSION=2.4
feature ignore_unknown_macro
# This script tests HTTP health-checks and more particularly the "http-check
diff --git a/reg-tests/connection/http_reuse_be_transparent.vtc
b/reg-tests/connection/http_reuse_be_transparent.vtc
index ac79331c6..896d515be 100644
--- a/reg-tests/connection/http_reuse_be_transparent.vtc
+++ b/reg-tests/connection/http_reuse_be_transparent.vtc
@@ -5,8 +5,6 @@ feature cmd "$HAPROXY_PROGRAM -cc 'feature(TPROXY)'"
# as private and should only be reused for requests of the same session.
# This is similar to the http-reuse never mode
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
haproxy h1 -conf {
diff --git a/reg-tests/connection/http_reuse_conn_hash.vtc
b/reg-tests/connection/http_reuse_conn_hash.vtc
index 82d46042b..a6c360582 100644
--- a/reg-tests/connection/http_reuse_conn_hash.vtc
+++ b/reg-tests/connection/http_reuse_conn_hash.vtc
@@ -1,5 +1,4 @@
varnishtest "Test the http-reuse with special connection parameters"
-#REQUIRE_VERSION=2.4
#REQUIRE_OPTIONS=OPENSSL
feature ignore_unknown_macro
diff --git a/reg-tests/connection/http_reuse_dispatch.vtc
b/reg-tests/connection/http_reuse_dispatch.vtc
index ae6dd769f..56fbce319 100644
--- a/reg-tests/connection/http_reuse_dispatch.vtc
+++ b/reg-tests/connection/http_reuse_dispatch.vtc
@@ -4,8 +4,6 @@ varnishtest "Test the proper interaction between http-reuse and
dispatch mode"
# reused for requests of the same session
# This is similar to the http-reuse never mode
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
haproxy h1 -conf {
diff --git a/reg-tests/connection/proxy_protocol_tlv_validation.vtc
b/reg-tests/connection/proxy_protocol_tlv_validation.vtc
index 8c7d734ed..cd4fcd946 100644
--- a/reg-tests/connection/proxy_protocol_tlv_validation.vtc
+++ b/reg-tests/connection/proxy_protocol_tlv_validation.vtc
@@ -1,7 +1,5 @@
varnishtest "Check that the TLVs are properly validated"
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
# We need one HAProxy for each test, because apparently the connection by
diff --git a/reg-tests/connection/tcp_to_http_upgrade.vtc
b/reg-tests/connection/tcp_to_http_upgrade.vtc
index 39cedd3d5..0956f2cbd 100644
--- a/reg-tests/connection/tcp_to_http_upgrade.vtc
+++ b/reg-tests/connection/tcp_to_http_upgrade.vtc
@@ -1,7 +1,5 @@
varnishtest "Test connection upgrades from TCP to HTTP"
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
server s1 {
diff --git a/reg-tests/converter/fix.vtc b/reg-tests/converter/fix.vtc
index 8206da355..f15c0c924 100644
--- a/reg-tests/converter/fix.vtc
+++ b/reg-tests/converter/fix.vtc
@@ -1,5 +1,4 @@
varnishtest "fix converters Test"
-#REQUIRE_VERSION=2.4
feature ignore_unknown_macro
diff --git a/reg-tests/converter/json_query.vtc
b/reg-tests/converter/json_query.vtc
index f4e3bb203..4ffaf11d5 100644
--- a/reg-tests/converter/json_query.vtc
+++ b/reg-tests/converter/json_query.vtc
@@ -1,5 +1,4 @@
varnishtest "JSON Query converters Test"
-#REQUIRE_VERSION=2.4
feature ignore_unknown_macro
diff --git a/reg-tests/converter/mqtt.vtc b/reg-tests/converter/mqtt.vtc
index fc3dacae1..3ef0d1fa7 100644
--- a/reg-tests/converter/mqtt.vtc
+++ b/reg-tests/converter/mqtt.vtc
@@ -1,5 +1,4 @@
varnishtest "mqtt converters Test"
-#REQUIRE_VERSION=2.4
feature ignore_unknown_macro
@@ -235,4 +234,4 @@ client c3_31_1 -connect ${h1_fe1_sock} {
# Valid MQTT 3.1 CONNECT packet (id: test_sub - username: test - passwd:
passwd)
sendhex
"102400064d514973647003c200000008746573745f7375620004746573740006706173737764"
recv 4
-} -run
\ No newline at end of file
+} -run
diff --git a/reg-tests/converter/url_enc.vtc b/reg-tests/converter/url_enc.vtc
index 74acac8ff..f3e6271d5 100644
--- a/reg-tests/converter/url_enc.vtc
+++ b/reg-tests/converter/url_enc.vtc
@@ -1,7 +1,5 @@
varnishtest "url_enc converter test"
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
server s1 {
diff --git a/reg-tests/filters/random-forwarding.vtc
b/reg-tests/filters/random-forwarding.vtc
index abb2bccfa..2ca483ea7 100644
--- a/reg-tests/filters/random-forwarding.vtc
+++ b/reg-tests/filters/random-forwarding.vtc
@@ -1,6 +1,5 @@
varnishtest "Filtering test with several filters and random forwarding (via
trace filter)"
-#REQUIRE_VERSION=2.4
#REQUIRE_OPTION=ZLIB|SLZ
#REGTEST_TYPE=slow
diff --git a/reg-tests/http-messaging/http_bodyless_response.vtc
b/reg-tests/http-messaging/http_bodyless_response.vtc
index 6b53bc4f4..c470a97f7 100644
--- a/reg-tests/http-messaging/http_bodyless_response.vtc
+++ b/reg-tests/http-messaging/http_bodyless_response.vtc
@@ -1,8 +1,6 @@
varnishtest "A test to be sure payload is skipped for bodyless responses"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
server s1 {
rxreq
txresp \
diff --git a/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
b/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
index 73916f224..b91809fd1 100644
--- a/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
+++ b/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
@@ -5,8 +5,6 @@ feature cmd "$HAPROXY_PROGRAM $HAPROXY_ARGS -cc
'enabled(FAST-FORWARD)'"
feature cmd "$HAPROXY_PROGRAM $HAPROXY_ARGS -cc 'enabled(SPLICE)'"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
server s1 {
rxreq
txresp \
diff --git a/reg-tests/http-messaging/http_wait_for_body.vtc
b/reg-tests/http-messaging/http_wait_for_body.vtc
index a9f819117..f0873166f 100644
--- a/reg-tests/http-messaging/http_wait_for_body.vtc
+++ b/reg-tests/http-messaging/http_wait_for_body.vtc
@@ -1,7 +1,6 @@
varnishtest "A test for the wait-for-body HTTP action"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
#REGTEST_TYPE=slow
server s1 {
diff --git a/reg-tests/http-messaging/protocol_upgrade.vtc
b/reg-tests/http-messaging/protocol_upgrade.vtc
index 46c98481b..ea66ebd50 100644
--- a/reg-tests/http-messaging/protocol_upgrade.vtc
+++ b/reg-tests/http-messaging/protocol_upgrade.vtc
@@ -8,8 +8,6 @@ varnishtest "h1/h2 support for protocol upgrade test"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
# http/1.1 server
server srv_h1 {
rxreq
diff --git a/reg-tests/http-messaging/websocket.vtc
b/reg-tests/http-messaging/websocket.vtc
index aed55fe51..a792a0b69 100644
--- a/reg-tests/http-messaging/websocket.vtc
+++ b/reg-tests/http-messaging/websocket.vtc
@@ -12,8 +12,6 @@ varnishtest "WebSocket test"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
# valid websocket server
server s1 {
rxreq
diff --git a/reg-tests/http-rules/except-forwardfor-originalto.vtc
b/reg-tests/http-rules/except-forwardfor-originalto.vtc
index a85916042..211c1c109 100644
--- a/reg-tests/http-rules/except-forwardfor-originalto.vtc
+++ b/reg-tests/http-rules/except-forwardfor-originalto.vtc
@@ -1,5 +1,4 @@
varnishtest "Test IPv4/IPv6 except param for the forwardfor and originalto
options"
-#REQUIRE_VERSION=2.4
# This config tests the except parameter for the HTTP forwardfor and originalto
# options.
diff --git a/reg-tests/http-rules/normalize_uri.vtc
b/reg-tests/http-rules/normalize_uri.vtc
index 0a9063050..92325e6a1 100644
--- a/reg-tests/http-rules/normalize_uri.vtc
+++ b/reg-tests/http-rules/normalize_uri.vtc
@@ -1,5 +1,4 @@
varnishtest "normalize-uri tests"
-#REQUIRE_VERSION=2.4
# This reg-test tests the http-request normalize-uri action.
diff --git a/reg-tests/http-set-timeout/set_timeout.vtc
b/reg-tests/http-set-timeout/set_timeout.vtc
index a112bc51e..7887f2abc 100644
--- a/reg-tests/http-set-timeout/set_timeout.vtc
+++ b/reg-tests/http-set-timeout/set_timeout.vtc
@@ -2,8 +2,6 @@ varnishtest "http-request set-timeout test"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
server srv_h1 -repeat 9 {
rxreq
txresp
diff --git a/reg-tests/log/log_uri.vtc b/reg-tests/log/log_uri.vtc
index 6dd50d2fa..753709d0e 100644
--- a/reg-tests/log/log_uri.vtc
+++ b/reg-tests/log/log_uri.vtc
@@ -1,8 +1,6 @@
varnishtest "Verify logging of relative/absolute URI path"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
server s1 {
rxreq
txresp -hdr "Connection: close"
diff --git a/reg-tests/lua/txn_get_priv-thread.vtc
b/reg-tests/lua/txn_get_priv-thread.vtc
index 3d7ec31b8..042404faf 100644
--- a/reg-tests/lua/txn_get_priv-thread.vtc
+++ b/reg-tests/lua/txn_get_priv-thread.vtc
@@ -1,6 +1,5 @@
varnishtest "Lua: txn:get_priv() scope"
#REQUIRE_OPTIONS=LUA,OPENSSL
-#REQUIRE_VERSION=2.4
#REGTEST_TYPE=bug
feature ignore_unknown_macro
diff --git a/reg-tests/sample_fetches/hashes.vtc
b/reg-tests/sample_fetches/hashes.vtc
index 2c2f60d93..e8f97b9d8 100644
--- a/reg-tests/sample_fetches/hashes.vtc
+++ b/reg-tests/sample_fetches/hashes.vtc
@@ -1,7 +1,5 @@
varnishtest "Hash validity test"
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
server s1 {
diff --git a/reg-tests/sample_fetches/ubase64.vtc
b/reg-tests/sample_fetches/ubase64.vtc
index 26fe02e82..dd7eefb7b 100644
--- a/reg-tests/sample_fetches/ubase64.vtc
+++ b/reg-tests/sample_fetches/ubase64.vtc
@@ -1,7 +1,5 @@
varnishtest "ub64dec sample fetche Test"
-#REQUIRE_VERSION=2.4
-
feature ignore_unknown_macro
haproxy h1 -conf {
diff --git a/reg-tests/server/cli_add_server.vtc
b/reg-tests/server/cli_add_server.vtc
index 8c29305e7..572245436 100644
--- a/reg-tests/server/cli_add_server.vtc
+++ b/reg-tests/server/cli_add_server.vtc
@@ -2,8 +2,6 @@ varnishtest "Add server via cli"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
server s1 {
rxreq
txresp
diff --git a/reg-tests/server/cli_delete_dynamic_server.vtc
b/reg-tests/server/cli_delete_dynamic_server.vtc
index e66764164..ef3ef3ff1 100644
--- a/reg-tests/server/cli_delete_dynamic_server.vtc
+++ b/reg-tests/server/cli_delete_dynamic_server.vtc
@@ -5,8 +5,6 @@ varnishtest "Delete server via cli"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
-
# static server
server s1 -repeat 3 {
rxreq
diff --git a/reg-tests/server/cli_set_ssl.vtc b/reg-tests/server/cli_set_ssl.vtc
index fa6fe68c5..d05021d4d 100644
--- a/reg-tests/server/cli_set_ssl.vtc
+++ b/reg-tests/server/cli_set_ssl.vtc
@@ -3,7 +3,6 @@ varnishtest "Set server ssl via CLI"
feature ignore_unknown_macro
# for "set server <srv> ssl"
-#REQUIRE_VERSION=2.4
#REGTEST_TYPE=devel
#REQUIRE_OPTIONS=OPENSSL
diff --git a/reg-tests/ssl/dynamic_server_ssl.vtc
b/reg-tests/ssl/dynamic_server_ssl.vtc
index b7730f558..6c79b6d9a 100644
--- a/reg-tests/ssl/dynamic_server_ssl.vtc
+++ b/reg-tests/ssl/dynamic_server_ssl.vtc
@@ -6,7 +6,6 @@ varnishtest "Delete server via cli and update certificates"
feature ignore_unknown_macro
-#REQUIRE_VERSION=2.4
#REQUIRE_OPTIONS=OPENSSL
feature cmd "command -v socat"
diff --git a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
index 533765fc6..9f39d826e 100644
--- a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
+++ b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
@@ -15,7 +15,6 @@
# This should be backported to 1.8
#REGTEST_TYPE=bug
-#REQUIRE_VERSION=2.4
varnishtest "stick-tables: Test expirations when used with table_*"
diff --git a/reg-tests/stickiness/srvkey-addr.vtc
b/reg-tests/stickiness/srvkey-addr.vtc
index 0dc1148f9..cf9c313f5 100644
--- a/reg-tests/stickiness/srvkey-addr.vtc
+++ b/reg-tests/stickiness/srvkey-addr.vtc
@@ -6,8 +6,6 @@ feature ignore_unknown_macro
# do the job they are supposed to do.
# If we remove one of the "stick on" rule, this script fails.
-#REQUIRE_VERSION=2.4
-
server s_not_used_1 {}
server s_not_used_2 {}
server s_not_used_3 {}
--
2.49.0
