From: Tim Duesterhus <tim@bastelstu.be>
Date: Wed, 29 May 2024 17:55:33 +0000 (+0200)
Subject: REGTESTS: Remove REQUIRE_VERSION=2.2 from all tests
X-Git-Tag: v3.1-dev1~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e349159a3479f17815060b2d1260291e5ba1997e;p=thirdparty%2Fhaproxy.git

REGTESTS: Remove REQUIRE_VERSION=2.2 from all tests

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

see 7aff1bf6b90caadfa95f6b43b526275191991d6f
---

diff --git a/reg-tests/checks/http-check-expect.vtc b/reg-tests/checks/http-check-expect.vtc
index 637eec69ac..118eef6d81 100644
--- a/reg-tests/checks/http-check-expect.vtc
+++ b/reg-tests/checks/http-check-expect.vtc
@@ -1,6 +1,5 @@
 varnishtest "Health-checks: some http-check expect tests"
 feature ignore_unknown_macro
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 # This script tests http-check expect rules.
 
diff --git a/reg-tests/checks/http-check.vtc b/reg-tests/checks/http-check.vtc
index 335306075c..0cb6a167c5 100644
--- a/reg-tests/checks/http-check.vtc
+++ b/reg-tests/checks/http-check.vtc
@@ -1,6 +1,5 @@
 varnishtest "Health-checks: some http-check tests"
 feature ignore_unknown_macro
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 # This script tests HTTP health-checks.
 
diff --git a/reg-tests/checks/http-monitor-uri.vtc b/reg-tests/checks/http-monitor-uri.vtc
index b6c8ccb494..26e6e8136b 100644
--- a/reg-tests/checks/http-monitor-uri.vtc
+++ b/reg-tests/checks/http-monitor-uri.vtc
@@ -1,5 +1,4 @@
 varnishtest "Test the HTTP directive monitor-uri"
-#REQUIRE_VERSION=2.2
 
 # This config tests the HTTP directive monitor-uri. Especially the path matching
 # when an absolute-form uri is received from the client. But also the
diff --git a/reg-tests/checks/ldap-check.vtc b/reg-tests/checks/ldap-check.vtc
index a0e550916a..38204bf3b3 100644
--- a/reg-tests/checks/ldap-check.vtc
+++ b/reg-tests/checks/ldap-check.vtc
@@ -1,5 +1,4 @@
 varnishtest "Health-checks: LDAP health-check"
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/mysql-check.vtc b/reg-tests/checks/mysql-check.vtc
index b2348c388b..3600138065 100644
--- a/reg-tests/checks/mysql-check.vtc
+++ b/reg-tests/checks/mysql-check.vtc
@@ -1,5 +1,4 @@
 varnishtest "Health-checks: MySQL health-check"
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/pgsql-check.vtc b/reg-tests/checks/pgsql-check.vtc
index 2c9c65b0e0..5003e7df10 100644
--- a/reg-tests/checks/pgsql-check.vtc
+++ b/reg-tests/checks/pgsql-check.vtc
@@ -1,5 +1,4 @@
 varnishtest "Health-checks: PostgreSQL health-check"
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/redis-check.vtc b/reg-tests/checks/redis-check.vtc
index 78b6ed35f4..3c74c93e85 100644
--- a/reg-tests/checks/redis-check.vtc
+++ b/reg-tests/checks/redis-check.vtc
@@ -1,5 +1,4 @@
 varnishtest "Health-checks: Redis health-check"
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/smtp-check.vtc b/reg-tests/checks/smtp-check.vtc
index 723f5f0485..6a5f7b79db 100644
--- a/reg-tests/checks/smtp-check.vtc
+++ b/reg-tests/checks/smtp-check.vtc
@@ -1,5 +1,4 @@
 varnishtest "Health-checks: SMTP health-check"
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/spop-check.vtc b/reg-tests/checks/spop-check.vtc
index 93cef59454..202476cc71 100644
--- a/reg-tests/checks/spop-check.vtc
+++ b/reg-tests/checks/spop-check.vtc
@@ -1,5 +1,4 @@
 varnishtest "Health-checks: SPOP health-check"
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/ssl-hello-check.vtc b/reg-tests/checks/ssl-hello-check.vtc
index 49abc0b003..7cabfabc8d 100644
--- a/reg-tests/checks/ssl-hello-check.vtc
+++ b/reg-tests/checks/ssl-hello-check.vtc
@@ -1,6 +1,5 @@
 varnishtest "Health-checks: ssl-hello health-check"
 #REQUIRE_OPTION=OPENSSL
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/tcp-check-ssl.vtc b/reg-tests/checks/tcp-check-ssl.vtc
index 6ac1782bb9..9ad0dfab51 100644
--- a/reg-tests/checks/tcp-check-ssl.vtc
+++ b/reg-tests/checks/tcp-check-ssl.vtc
@@ -1,6 +1,5 @@
 varnishtest "Health-checks: tcp-check health-check with ssl options"
 #REQUIRE_OPTION=OPENSSL
-#REQUIRE_VERSION=2.2
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro
 
diff --git a/reg-tests/checks/tcp-check_min-recv.vtc b/reg-tests/checks/tcp-check_min-recv.vtc
index 81f93e002f..b5b2aabb77 100644
--- a/reg-tests/checks/tcp-check_min-recv.vtc
+++ b/reg-tests/checks/tcp-check_min-recv.vtc
@@ -1,7 +1,6 @@
 varnishtest "tcp-check negative bounded regex match"
 #EXCLUDE_TARGETS=freebsd,osx,generic
 #REGTEST_TYPE=slow
-#REQUIRE_VERSION=2.2
 # This test use a negative expect rule and verify that setting a required
 # minimum amount of data to match.
 feature ignore_unknown_macro
diff --git a/reg-tests/connection/http_reuse_aggressive.vtc b/reg-tests/connection/http_reuse_aggressive.vtc
index 71f4cee742..a7b9ff76c4 100644
--- a/reg-tests/connection/http_reuse_aggressive.vtc
+++ b/reg-tests/connection/http_reuse_aggressive.vtc
@@ -1,7 +1,5 @@
 varnishtest "Test the http-reuse aggressive mode"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
diff --git a/reg-tests/connection/http_reuse_always.vtc b/reg-tests/connection/http_reuse_always.vtc
index 3dbd7c05f0..f9f00b3fd0 100644
--- a/reg-tests/connection/http_reuse_always.vtc
+++ b/reg-tests/connection/http_reuse_always.vtc
@@ -1,7 +1,5 @@
 varnishtest "Test the http-reuse always mode"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -W -conf {
diff --git a/reg-tests/connection/http_reuse_never.vtc b/reg-tests/connection/http_reuse_never.vtc
index fc746310c2..f7fabec4c0 100644
--- a/reg-tests/connection/http_reuse_never.vtc
+++ b/reg-tests/connection/http_reuse_never.vtc
@@ -1,7 +1,5 @@
 varnishtest "Test the http-reuse never mode"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
diff --git a/reg-tests/connection/http_reuse_safe.vtc b/reg-tests/connection/http_reuse_safe.vtc
index fa00dd4ef0..b15f7c0032 100644
--- a/reg-tests/connection/http_reuse_safe.vtc
+++ b/reg-tests/connection/http_reuse_safe.vtc
@@ -1,7 +1,5 @@
 varnishtest "Test the http-reuse safe mode"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
diff --git a/reg-tests/connection/proxy_protocol_send_generic.vtc b/reg-tests/connection/proxy_protocol_send_generic.vtc
index 605f38cf2a..af42dd342e 100644
--- a/reg-tests/connection/proxy_protocol_send_generic.vtc
+++ b/reg-tests/connection/proxy_protocol_send_generic.vtc
@@ -1,7 +1,5 @@
 varnishtest "Check that generic TLV IDs are sent properly"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
diff --git a/reg-tests/connection/proxy_protocol_send_unique_id.vtc b/reg-tests/connection/proxy_protocol_send_unique_id.vtc
index 4f6b848e70..590137ec78 100644
--- a/reg-tests/connection/proxy_protocol_send_unique_id.vtc
+++ b/reg-tests/connection/proxy_protocol_send_unique_id.vtc
@@ -1,7 +1,5 @@
 varnishtest "Check that the unique ID TLV is properly sent"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
diff --git a/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc b/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
index 87e590a9b6..09b968efe6 100644
--- a/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
+++ b/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
@@ -1,6 +1,5 @@
 varnishtest "Check that the unique ID TLV is properly sent for servers with ALPN option"
 
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 
 feature ignore_unknown_macro
diff --git a/reg-tests/converter/digest.vtc b/reg-tests/converter/digest.vtc
index e911ff4927..fff0ae398e 100644
--- a/reg-tests/converter/digest.vtc
+++ b/reg-tests/converter/digest.vtc
@@ -1,6 +1,5 @@
 varnishtest "digest converter Test"
 
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTION=OPENSSL
 
 feature ignore_unknown_macro
diff --git a/reg-tests/converter/hmac.vtc b/reg-tests/converter/hmac.vtc
index 230a44d6d0..13729f650c 100644
--- a/reg-tests/converter/hmac.vtc
+++ b/reg-tests/converter/hmac.vtc
@@ -1,6 +1,5 @@
 varnishtest "HMAC converter Test"
 
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTION=OPENSSL
 
 feature ignore_unknown_macro
diff --git a/reg-tests/converter/secure_memcmp.vtc b/reg-tests/converter/secure_memcmp.vtc
index 6ff74e6e45..dfda40ec37 100644
--- a/reg-tests/converter/secure_memcmp.vtc
+++ b/reg-tests/converter/secure_memcmp.vtc
@@ -1,6 +1,5 @@
 varnishtest "secure_memcmp converter Test"
 
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTION=OPENSSL
 
 feature ignore_unknown_macro
diff --git a/reg-tests/http-errorfiles/http-error.vtc b/reg-tests/http-errorfiles/http-error.vtc
index 1af909b76e..6d82f28280 100644
--- a/reg-tests/http-errorfiles/http-error.vtc
+++ b/reg-tests/http-errorfiles/http-error.vtc
@@ -1,11 +1,9 @@
 varnishtest "Test the http-error directive"
-#REQUIRE_VERSION=2.2
 
 # This config tests the http-error directive.
 
 feature ignore_unknown_macro
 
-
 haproxy h1 -conf {
     http-errors errors-1
         errorfile 400  ${testdir}/errors/400-1.http
diff --git a/reg-tests/http-errorfiles/http_deny_errors.vtc b/reg-tests/http-errorfiles/http_deny_errors.vtc
index 353045db24..befec708e2 100644
--- a/reg-tests/http-errorfiles/http_deny_errors.vtc
+++ b/reg-tests/http-errorfiles/http_deny_errors.vtc
@@ -1,11 +1,9 @@
 varnishtest "Test the custom errors for HTTP deny rules"
-#REQUIRE_VERSION=2.2
 
 # This config tests the custom errors for HTTP deny rules.
 
 feature ignore_unknown_macro
 
-
 haproxy h1 -conf {
     http-errors errors-1
         errorfile 400  ${testdir}/errors/400-1.http
diff --git a/reg-tests/http-errorfiles/http_errors.vtc b/reg-tests/http-errorfiles/http_errors.vtc
index 6b20be724d..4bc2276741 100644
--- a/reg-tests/http-errorfiles/http_errors.vtc
+++ b/reg-tests/http-errorfiles/http_errors.vtc
@@ -1,11 +1,9 @@
 varnishtest "Test the errorfiles directive"
-#REQUIRE_VERSION=2.2
 
 # This config tests the errorfiles directive.
 
 feature ignore_unknown_macro
 
-
 haproxy h1 -conf {
     http-errors errors-1
         errorfile 400  ${testdir}/errors/400-1.http
diff --git a/reg-tests/http-errorfiles/http_return.vtc b/reg-tests/http-errorfiles/http_return.vtc
index 8db77a9b19..b7750501c8 100644
--- a/reg-tests/http-errorfiles/http_return.vtc
+++ b/reg-tests/http-errorfiles/http_return.vtc
@@ -1,5 +1,4 @@
 varnishtest "Test the HTTP return action with errorfiles"
-#REQUIRE_VERSION=2.2
 
 # This config tests the HTTP return action when error files are used to reply to
 # the client.
diff --git a/reg-tests/http-messaging/http_msg_full_on_eom.vtc b/reg-tests/http-messaging/http_msg_full_on_eom.vtc
index 2edba7db2d..f02666f1f8 100644
--- a/reg-tests/http-messaging/http_msg_full_on_eom.vtc
+++ b/reg-tests/http-messaging/http_msg_full_on_eom.vtc
@@ -1,7 +1,6 @@
 varnishtest "cannot add the HTX EOM block because the buffer is full"
 feature ignore_unknown_macro
 
-#REQUIRE_VERSION=2.2
 #REQUIRE_VERSION_BELOW=2.4
 #REGTEST_TYPE=devel
 
diff --git a/reg-tests/http-rules/http_after_response.vtc b/reg-tests/http-rules/http_after_response.vtc
index 7e8cc1d4e3..871cc27730 100644
--- a/reg-tests/http-rules/http_after_response.vtc
+++ b/reg-tests/http-rules/http_after_response.vtc
@@ -1,5 +1,4 @@
 varnishtest "Test HTTP response manipulation under the http-after-response rulesets"
-#REQUIRE_VERSION=2.2
 
 # This config tests various http-after-response rules for HTTP responses from a
 # server and the stats applet, but also for internal responses
diff --git a/reg-tests/http-rules/http_return.vtc b/reg-tests/http-rules/http_return.vtc
index ae9677539a..f292353cdc 100644
--- a/reg-tests/http-rules/http_return.vtc
+++ b/reg-tests/http-rules/http_return.vtc
@@ -1,5 +1,4 @@
 varnishtest "Test the HTTP return action"
-#REQUIRE_VERSION=2.2
 
 # This config tests the HTTP return action.
 
diff --git a/reg-tests/http-rules/path_and_pathq.vtc b/reg-tests/http-rules/path_and_pathq.vtc
index 31e85be668..971cbe2d5d 100644
--- a/reg-tests/http-rules/path_and_pathq.vtc
+++ b/reg-tests/http-rules/path_and_pathq.vtc
@@ -1,5 +1,4 @@
 varnishtest "path vs pathq tests"
-#REQUIRE_VERSION=2.2
 
 # This config tests various http request rules (set/replace) manipulating the
 # path, with or without the query-string. It also test path and pathq sample
diff --git a/reg-tests/http-rules/strict_rw_mode.vtc b/reg-tests/http-rules/strict_rw_mode.vtc
index 14e6901459..89a4548f7e 100644
--- a/reg-tests/http-rules/strict_rw_mode.vtc
+++ b/reg-tests/http-rules/strict_rw_mode.vtc
@@ -1,5 +1,4 @@
 varnishtest "Test the strict rewriting mode"
-#REQUIRE_VERSION=2.2
 
 # This config tests the strict-mode of HTTP rules.
 
diff --git a/reg-tests/lua/set_var.vtc b/reg-tests/lua/set_var.vtc
index 0c8a4b162f..780c882c3c 100644
--- a/reg-tests/lua/set_var.vtc
+++ b/reg-tests/lua/set_var.vtc
@@ -1,5 +1,4 @@
 varnishtest "Lua: set_var"
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=LUA
 
 feature ignore_unknown_macro
diff --git a/reg-tests/sample_fetches/so_name.vtc b/reg-tests/sample_fetches/so_name.vtc
index c6211fa54d..72028a2b9f 100644
--- a/reg-tests/sample_fetches/so_name.vtc
+++ b/reg-tests/sample_fetches/so_name.vtc
@@ -1,7 +1,5 @@
 varnishtest "so_name sample fetche Test"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -conf {
diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc b/reg-tests/ssl/add_ssl_crt-list.vtc
index 8810b72a81..fbf3817386 100644
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -11,7 +11,6 @@
 # - Check that you have socat
 
 varnishtest "Test the 'add ssl crt-list' feature of the CLI"
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 feature cmd "command -v socat"
 feature ignore_unknown_macro
diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc b/reg-tests/ssl/del_ssl_crt-list.vtc
index 83eda245ff..5cf4c6af32 100644
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -10,7 +10,6 @@
 # of a frontend that does not have the strict-sni option enabled cannot be deleted.
 
 varnishtest "Test the 'del ssl crt-list' feature of the CLI"
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 feature ignore_unknown_macro
 
diff --git a/reg-tests/ssl/set_ssl_bug_2265.vtc b/reg-tests/ssl/set_ssl_bug_2265.vtc
index 21e837a545..e743c0a818 100644
--- a/reg-tests/ssl/set_ssl_bug_2265.vtc
+++ b/reg-tests/ssl/set_ssl_bug_2265.vtc
@@ -14,7 +14,6 @@
 # - Check that you have socat
 
 varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 feature cmd "command -v socat"
 feature ignore_unknown_macro
diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index 9d4d5a020c..70a6f5ee01 100644
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -20,7 +20,6 @@
 # - Check that you have socat
 
 varnishtest "Test the 'set ssl cert' feature of the CLI"
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 feature cmd "command -v socat"
 feature ignore_unknown_macro
diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc b/reg-tests/ssl/set_ssl_cert_noext.vtc
index 4326711059..8eb8b24ddd 100644
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -12,7 +12,6 @@
 # - Check that you have socat
 
 varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 feature cmd "command -v socat"
 feature ignore_unknown_macro
diff --git a/reg-tests/ssl/ssl_server_samples.vtc b/reg-tests/ssl/ssl_server_samples.vtc
index cd97634d35..c037523b12 100644
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@@ -1,7 +1,6 @@
 #REGTEST_TYPE=devel
 
 varnishtest "Test the ssl_s_* sample fetches"
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 feature ignore_unknown_macro
 
diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc b/reg-tests/ssl/ssl_simple_crt-list.vtc
index 7f150561b9..f7b03a2753 100644
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@@ -2,7 +2,6 @@
 varnishtest "Test for the bug #940"
 # Test that the SNI are correctly inserted with the same file multiple times.
 
-#REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL
 feature ignore_unknown_macro
 
diff --git a/reg-tests/stream/unique-id-from-proxy.vtc b/reg-tests/stream/unique-id-from-proxy.vtc
index eaac065970..fc91f257d0 100644
--- a/reg-tests/stream/unique-id-from-proxy.vtc
+++ b/reg-tests/stream/unique-id-from-proxy.vtc
@@ -1,7 +1,5 @@
 varnishtest "Check that we are able to read a unique-id from PROXYv2"
 
-#REQUIRE_VERSION=2.2
-
 feature ignore_unknown_macro
 
 haproxy h1 -conf {