REGTESTS: Remove REQUIRE_VERSION=2.4 from all tests

HAProxy 2.4 is the lowest supported version, thus this always matches.

see 7aff1bf6b90caadfa95f6b43b526275191991d6f

diff --git a/reg-tests/cache/caching_rules.vtc b/reg-tests/cache/caching_rules.vtc
index a488875b30fc795ae2fa6bb58dde121fc269177b..ee85bf25cef58ed7a262e77abe57a541808c4be1 100644 (file)
--- 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 66c89e4e48530687876aecb65101dbefab476a7f..0b930ecc4ab3755358932e288c3b6029e4ac1742 100644 (file)
--- 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 782a76ca76e8e507654a726eb919d1a303618489..494fe8f0093e316e4c73a9d5856db9697062c608 100644 (file)
--- 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 4b828a86a62835bd6f23350c6c8502af1cc89a2b..c58c106e3e10436ccc750cca103f5199ce06a672 100644 (file)
--- 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 d0f3be53ae1827cb3942952c154e25774614e293..e4c0ff2625c445a635a7ea82bd30ec6c121d7aa7 100644 (file)
--- 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 cbd4fc00e6c9815904e9c10e82d77d1155445dd6..4d67971ff4b98d23b993ad669e5aecd036ea3e57 100644 (file)
--- 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 02564be54c1d46a6eb6d05483c4da5f25e2f593b..98f32d79e02d8bc8248cefb799a990e13453a83b 100644 (file)
--- 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 530ad75669e20584f452d497e9aa7b8d72758683..076aba7f91755fa3e72ffe9a100886d4837e0daf 100644 (file)
--- 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 ac79331c6a6237c2a12b8505993cd95b16525ca0..896d515bec8398aa92aa75d62d7727744c54cdb9 100644 (file)
--- 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 82d46042b1e4728ec36de080cff1b940f38de385..a6c3605825857a838cd4629c39af83c16f297d28 100644 (file)
--- 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 ae6dd769f78f271836160be520fb68b71f2a90c1..56fbce3195fa613913aec72325ad5ae8fa1bb892 100644 (file)
--- 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 8c7d734edd22315a6e1ac8739a9fba50fc7d9d72..cd4fcd9468dfa47f21d5c5d941297e01777c8efa 100644 (file)
--- 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 39cedd3d5d345faf45acc30f68ed41278ef61552..0956f2cbdb957349b260c8cfd564e95651a5cbcc 100644 (file)
--- 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 8206da355265a874b46e4c46f464505e1a1e0477..f15c0c9249626cc12b7900f06d5ba92f4031e9d4 100644 (file)
--- 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 f4e3bb203c0eeb9de11660ae4687c5fe5b97780c..4ffaf11d56c0eae7f1054a8408a93f3c5434b9fb 100644 (file)
--- 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 fc3dacae1498cf2a489c49cc09347e6d73235cd2..3ef0d1fa75b2ae5948743db5abd0b6bc54e027ca 100644 (file)
--- 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 74acac8ff14d8dd6fe8956ec995ff5cdbb4f9706..f3e6271d55359bedc69b15edbea13da0af20d45f 100644 (file)
--- 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 abb2bccfa41475c10bdb92f05e735a168d066e99..2ca483ea7371ff7f7d84603b45eb477f53572fea 100644 (file)
--- 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 6b53bc4f4735416817fbcb530dd695349bdbe483..c470a97f73c58f18ff1c6e819ca94257b4ab285e 100644 (file)
--- 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 73916f224198e0ee033691c1ccd09fe0a0ace4c7..b91809fd15bca99dcd5055b331e0dda2c864dd6e 100644 (file)
--- 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 a9f819117e7754f0b8eec5eb3189d14dda706a8d..f0873166ffc0f0700e959dd9c13f8ec2703134db 100644 (file)
--- 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 46c98481ba831f9705aa19cee4bd381dba4b8178..ea66ebd5058b1fd82095e524b451d25772252a0a 100644 (file)
--- 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 aed55fe5153d1742d838a08ab3a30a0c5c78254e..a792a0b6972163837b834412d997b09e80d3659a 100644 (file)
--- 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 a8591604238516fff823570820ace6e30423c2bf..211c1c109c0922f5a72b2ced2b3b0650247f6694 100644 (file)
--- 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 0a9063050ae4a0c29cb11af6636561c9016eaa90..92325e6a149f9a9c399590fa2b8e95065a0c57b8 100644 (file)
--- 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 a112bc51e0f9d9d64d068ae118dec9be6af69af9..7887f2abc72cd50932bf80f9e92684d4c1557f40 100644 (file)
--- 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 6dd50d2fac6686045d03139b91ae0407af771b0d..753709d0e157337c1edad6fe583c14d4c8a9168d 100644 (file)
--- 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 3d7ec31b80fb8b58b96eb226a1553fa8189f5b91..042404fafea06fd097c58457dd9d1141d24069f0 100644 (file)
--- 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 2c2f60d9345a3035f6441c72b19c122456537bd8..e8f97b9d871bcb63ca9f10b64e20aefbc14a0ce5 100644 (file)
--- 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 26fe02e820f55f4575cba728656d2004a6de797c..dd7eefb7b6b7d254afb2661813a437f23f5b3a3f 100644 (file)
--- 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 8c29305e7457e8bfe76a89c18fe9431da6cc5c5b..5722454367d8d44b0c94ba5e5a50e0d8c847904b 100644 (file)
--- 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 e66764164ca3eda9f9e8cb114b1422541fb08630..ef3ef3ff182026897c1aca725bf56c092cf9a760 100644 (file)
--- 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 fa6fe68c5d89e42a127db5a16af55376bd6b8759..d05021d4d23623960f16cb3378b6cc20552171f3 100644 (file)
--- 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 b7730f558350696480066b3e343eef021c0cbcbf..6c79b6d9a3eae8385387f80bffc917e2d124eaa6 100644 (file)
--- 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 533765fc61f8b0d07ef72578d13730495ae7d1b2..9f39d826e883b6be704f976a4c64d28a76c0b89e 100644 (file)
--- 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 0dc1148f9cfefeda0cbb952505377f3a4faa4688..cf9c313f5d31158069f1e19010fabc7b0cab463c 100644 (file)
--- 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 {}