REGTESTS: Migrate REQUIRE_OPTION to haproxy -cc

With the EOL of HAProxy 2.4 all supported versions of HAProxy support `haproxy -cc`, allowing us to unify the tests in this regard.
2026-07-11 02:02:18 -04:00 · 2026-07-03 23:02:34 +02:00 · 2026-07-03 23:02:34 +02:00 · aebe561d4d
commit aebe561d4d
parent da4b7df81d
45 changed files with 45 additions and 45 deletions
--- a/reg-tests/checks/healthcheck-section.vtc
+++ b/reg-tests/checks/healthcheck-section.vtc
@ -1,6 +1,6 @@
 varnishtest "Health-checks: tests of healthcheck sections"
 feature ignore_unknown_macro
-#REQUIRE_OPTION=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 #REGTEST_TYPE=slow

 server s1 {
--- a/reg-tests/checks/ssl-hello-check.vtc
+++ b/reg-tests/checks/ssl-hello-check.vtc
@ -1,5 +1,5 @@
 varnishtest "Health-checks: ssl-hello health-check"
-#REQUIRE_OPTION=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro

--- a/reg-tests/checks/tcp-check-ssl.vtc
+++ b/reg-tests/checks/tcp-check-ssl.vtc
@ -1,5 +1,5 @@
 varnishtest "Health-checks: tcp-check health-check with ssl options"
-#REQUIRE_OPTION=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro

--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/reg-tests/checks/tls_health_checks.vtc
@ -1,5 +1,5 @@
 varnishtest "Health-check test over TLS/SSL"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 #REGTEST_TYPE=slow
 feature ignore_unknown_macro

--- a/reg-tests/compression/basic.vtc
+++ b/reg-tests/compression/basic.vtc
@ -1,6 +1,6 @@
 varnishtest "Basic compression test"

-#REQUIRE_OPTION=ZLIB|SLZ
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(ZLIB) || feature(SLZ)'"

 feature ignore_unknown_macro

--- a/reg-tests/compression/etags_conversion.vtc
+++ b/reg-tests/compression/etags_conversion.vtc
@ -1,6 +1,6 @@
 varnishtest "Compression converts strong ETags to weak ETags"

-#REQUIRE_OPTION=ZLIB|SLZ
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(ZLIB) || feature(SLZ)'"

 feature ignore_unknown_macro

--- a/reg-tests/compression/lua_validation.vtc
+++ b/reg-tests/compression/lua_validation.vtc
@ -1,7 +1,7 @@
 # Checks that compression doesn't cause corruption..

 varnishtest "Compression validation"
-#REQUIRE_OPTIONS=ZLIB|SLZ,LUA,OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc '(feature(ZLIB) || feature(SLZ)) && feature(LUA) && feature(OPENSSL)'"
 #REGTEST_TYPE=slow

 feature ignore_unknown_macro
--- a/reg-tests/compression/min_size.vtc
+++ b/reg-tests/compression/min_size.vtc
@ -1,6 +1,6 @@
 varnishtest "Compression ignores small payloads"

-#REQUIRE_OPTION=ZLIB|SLZ
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(ZLIB) || feature(SLZ)'"

 feature ignore_unknown_macro

--- a/reg-tests/compression/vary.vtc
+++ b/reg-tests/compression/vary.vtc
@ -1,6 +1,6 @@
 varnishtest "Compression sets Vary header"

-#REQUIRE_OPTION=ZLIB|SLZ
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(ZLIB) || feature(SLZ)'"

 feature ignore_unknown_macro

--- a/reg-tests/connection/http_reuse_conn_hash.vtc
+++ b/reg-tests/connection/http_reuse_conn_hash.vtc
@ -1,5 +1,5 @@
 varnishtest "Test the http-reuse with special connection parameters"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature ignore_unknown_macro

--- a/reg-tests/connection/proxy_protocol_random_fail.vtc
+++ b/reg-tests/connection/proxy_protocol_random_fail.vtc
@ -9,7 +9,7 @@
 # without storing it first.

 varnishtest "PROXY protocol random failures"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature ignore_unknown_macro

--- 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,6 @@
 varnishtest "Check that the unique ID TLV is properly sent for servers with ALPN option"

-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature ignore_unknown_macro

--- a/reg-tests/converter/digest.vtc
+++ b/reg-tests/converter/digest.vtc
@ -1,6 +1,6 @@
 varnishtest "digest converter Test"

-#REQUIRE_OPTION=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature ignore_unknown_macro

--- a/reg-tests/converter/hmac.vtc
+++ b/reg-tests/converter/hmac.vtc
@ -1,6 +1,6 @@
 varnishtest "HMAC converter Test"

-#REQUIRE_OPTION=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature ignore_unknown_macro

--- a/reg-tests/converter/secure_memcmp.vtc
+++ b/reg-tests/converter/secure_memcmp.vtc
@ -1,6 +1,6 @@
 varnishtest "secure_memcmp converter Test"

-#REQUIRE_OPTION=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature ignore_unknown_macro

--- a/reg-tests/converter/sha2.vtc
+++ b/reg-tests/converter/sha2.vtc
@ -1,6 +1,6 @@
 varnishtest "sha2 converter Test"

-#REQUIRE_OPTION=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature ignore_unknown_macro

--- a/reg-tests/filters/filter_sequence.vtc
+++ b/reg-tests/filters/filter_sequence.vtc
@ -2,7 +2,7 @@ varnishtest "Test filter-sequence feature"

 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(3.4-dev0)'"
 feature ignore_unknown_macro
-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"

 barrier b1 cond 2 -cyclic

--- a/reg-tests/filters/random-forwarding.vtc
+++ b/reg-tests/filters/random-forwarding.vtc
@ -1,6 +1,6 @@
 varnishtest "Filtering test with several filters and random forwarding (via trace filter)"

-#REQUIRE_OPTION=ZLIB|SLZ
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(ZLIB) || feature(SLZ)'"
 #REGTEST_TYPE=slow

 feature ignore_unknown_macro
--- a/reg-tests/lua/bad_http_clt_req_duration.vtc
+++ b/reg-tests/lua/bad_http_clt_req_duration.vtc
@ -20,7 +20,7 @@
 # the LUA sleep time.

 varnishtest "LUA bug"
-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"
 #REGTEST_TYPE=bug

 feature ignore_unknown_macro
--- a/reg-tests/lua/close_wait_lf.vtc
+++ b/reg-tests/lua/close_wait_lf.vtc
@ -14,7 +14,7 @@
 # connectio closed by the client may stop the applet.

 varnishtest "possible CLOSE-WAIT with '\n' headers"
-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"
 #REGTEST_TYPE=bug

 feature ignore_unknown_macro
--- a/reg-tests/lua/h_txn_get_priv.vtc
+++ b/reg-tests/lua/h_txn_get_priv.vtc
@ -1,5 +1,5 @@
 varnishtest "Lua: txn:get_priv() scope"
-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"

 feature ignore_unknown_macro

--- a/reg-tests/lua/httpclient_action.vtc
+++ b/reg-tests/lua/httpclient_action.vtc
@ -7,7 +7,7 @@ varnishtest "Lua: test the httpclient when the lua action timeout"
 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev7)'"
 feature ignore_unknown_macro

-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"

 haproxy h1 -conf {

--- a/reg-tests/lua/lua_httpclient.vtc
+++ b/reg-tests/lua/lua_httpclient.vtc
@ -10,7 +10,7 @@ varnishtest "Lua: check httpclient functionality from a lua-task"
 feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev7)'"
 feature ignore_unknown_macro

-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"

 server s1 {
    rxreq
--- a/reg-tests/lua/lua_socket.vtc
+++ b/reg-tests/lua/lua_socket.vtc
@ -1,7 +1,7 @@
 varnishtest "Lua: check socket functionality from a lua-task"
 feature ignore_unknown_macro

-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"

 server s1 {
    rxreq
--- a/reg-tests/lua/set_var.vtc
+++ b/reg-tests/lua/set_var.vtc
@ -1,5 +1,5 @@
 varnishtest "Lua: set_var"
-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"

 feature ignore_unknown_macro

--- a/reg-tests/lua/txn_get_priv-thread.vtc
+++ b/reg-tests/lua/txn_get_priv-thread.vtc
@ -1,5 +1,5 @@
 varnishtest "Lua: txn:get_priv() scope"
-#REQUIRE_OPTIONS=LUA,OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA) && feature(OPENSSL)'"
 #REGTEST_TYPE=bug

 feature ignore_unknown_macro
--- a/reg-tests/lua/txn_get_priv.vtc
+++ b/reg-tests/lua/txn_get_priv.vtc
@ -1,5 +1,5 @@
 varnishtest "Lua: txn:get_priv() scope"
-#REQUIRE_OPTIONS=LUA,OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA) && feature(OPENSSL)'"
 #REGTEST_TYPE=bug

 feature ignore_unknown_macro
--- a/reg-tests/lua/wrong_types_usage.vtc
+++ b/reg-tests/lua/wrong_types_usage.vtc
@ -31,7 +31,7 @@


 varnishtest "Basic LUA test h00000"
-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"
 #REGTEST_TYPE=bug

 feature ignore_unknown_macro
--- a/reg-tests/mailers/healthcheckmail.vtc
+++ b/reg-tests/mailers/healthcheckmail.vtc
@ -1,5 +1,5 @@
 varnishtest "Check health-check email alerts"
-#REQUIRE_OPTIONS=LUA
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"

 feature ignore_unknown_macro

--- a/reg-tests/peers/tls_basic_sync.vtc
+++ b/reg-tests/peers/tls_basic_sync.vtc
@ -1,5 +1,5 @@
 vtest "Basic test for peers protocol over SSL/TLS"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature ignore_unknown_macro

 #REGTEST_TYPE=slow
--- a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
+++ b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
@ -1,7 +1,7 @@
 vtest "Basic test for peers protocol over SSL/TLS with stick-table declared in peers sections"
 feature ignore_unknown_macro

-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 #REGTEST_TYPE=slow

 haproxy h1 -arg "-L A" -conf {
--- a/reg-tests/quic/add_ssl_crt-list.vtc
+++ b/reg-tests/quic/add_ssl_crt-list.vtc
@ -11,7 +11,7 @@
 # - Check that you have socat

 varnishtest "Test the 'add ssl crt-list' feature of the CLI"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature cmd "command -v socat"
 feature cmd "$HAPROXY_PROGRAM -cc 'feature(QUIC) && !feature(QUIC_OPENSSL_COMPAT) && !feature(OPENSSL_WOLFSSL)'"

--- a/reg-tests/quic/del_ssl_crt-list.vtc
+++ b/reg-tests/quic/del_ssl_crt-list.vtc
@ -10,7 +10,7 @@
 # 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_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 feature cmd "$HAPROXY_PROGRAM -cc 'feature(QUIC) && !feature(QUIC_OPENSSL_COMPAT) && !feature(OPENSSL_WOLFSSL) && ssllib_name_startswith(OpenSSL) && openssl_version_atleast(1.1.1)'"

--- a/reg-tests/server/cli_set_ssl.vtc
+++ b/reg-tests/server/cli_set_ssl.vtc
@ -4,7 +4,7 @@ feature ignore_unknown_macro

 # for "set server <srv> ssl"
 #REGTEST_TYPE=devel
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 # Do nothing. Is there only to create s1_* macros
 server s1 {
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@ -11,7 +11,7 @@
 # - Check that you have socat

 varnishtest "Test the 'add ssl crt-list' feature of the CLI"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature cmd "command -v socat"

 setenv VTC_SOCK_TYPE stream
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@ -10,7 +10,7 @@
 # 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_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 setenv VTC_SOCK_TYPE stream
 include ${testdir}/../ssl/del_ssl_crt-list.vtci
--- a/reg-tests/ssl/dynamic_server_ssl.vtc
+++ b/reg-tests/ssl/dynamic_server_ssl.vtc
@ -4,7 +4,7 @@
 #
 varnishtest "Delete server via cli and update certificates"

-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature cmd "command -v socat"

 setenv VTC_SOCK_TYPE stream
--- a/reg-tests/ssl/set_ssl_bug_2265.vtc
+++ b/reg-tests/ssl/set_ssl_bug_2265.vtc
@ -14,7 +14,7 @@
 # - Check that you have socat

 varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature cmd "command -v socat"

 setenv VTC_SOCK_TYPE stream
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@ -20,7 +20,7 @@
 # - Check that you have socat

 varnishtest "Test the 'set ssl cert' feature of the CLI"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature cmd "command -v socat"

 setenv VTC_SOCK_TYPE stream
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@ -12,7 +12,7 @@
 # - Check that you have socat

 varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature cmd "command -v socat"

 setenv VTC_SOCK_TYPE stream
--- a/reg-tests/ssl/ssl_client_auth.vtc
+++ b/reg-tests/ssl/ssl_client_auth.vtc
@ -15,7 +15,7 @@
 # https://www.haproxy.com/blog/ssl-client-certificate-management-at-application-level/

 varnishtest "Test the client auth"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 setenv VTC_SOCK_TYPE stream
 include ${testdir}/ssl_client_auth.vtci
--- a/reg-tests/ssl/ssl_frontend_samples.vtc
+++ b/reg-tests/ssl/ssl_frontend_samples.vtc
@ -1,7 +1,7 @@
 #REGTEST_TYPE=devel

 varnishtest "Test the ssl_f_* sample fetches"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 setenv VTC_SOCK_TYPE stream
 include ${testdir}/ssl_frontend_samples.vtci
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@ -1,7 +1,7 @@
 #REGTEST_TYPE=devel

 varnishtest "Test the ssl_s_* sample fetches"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 setenv VTC_SOCK_TYPE stream
 include ${testdir}/ssl_server_samples.vtci
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@ -2,7 +2,7 @@
 varnishtest "Test for the bug #940"
 # Test that the SNI are correctly inserted with the same file multiple times.

-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"

 setenv VTC_SOCK_TYPE stream
 include ${testdir}/ssl_simple_crt-list.vtci
--- a/reg-tests/ssl/wrong_ctx_storage.vtc
+++ b/reg-tests/ssl/wrong_ctx_storage.vtc
@ -18,7 +18,7 @@
 #REGTEST_TYPE=bug

 varnishtest "OpenSSL bug: Random crashes"
-#REQUIRE_OPTIONS=OPENSSL
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
 feature ignore_unknown_macro