With the EOL of HAProxy 2.4 all supported versions of HAProxy support `haproxy
-cc`, allowing us to unify the tests in this regard.
---
reg-tests/checks/healthcheck-section.vtc | 2 +-
reg-tests/checks/ssl-hello-check.vtc | 2 +-
reg-tests/checks/tcp-check-ssl.vtc | 2 +-
reg-tests/checks/tls_health_checks.vtc | 2 +-
reg-tests/compression/basic.vtc | 2 +-
reg-tests/compression/etags_conversion.vtc | 2 +-
reg-tests/compression/lua_validation.vtc | 2 +-
reg-tests/compression/min_size.vtc | 2 +-
reg-tests/compression/vary.vtc | 2 +-
reg-tests/connection/http_reuse_conn_hash.vtc | 2 +-
reg-tests/connection/proxy_protocol_random_fail.vtc | 2 +-
reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc | 2 +-
reg-tests/converter/digest.vtc | 2 +-
reg-tests/converter/hmac.vtc | 2 +-
reg-tests/converter/secure_memcmp.vtc | 2 +-
reg-tests/converter/sha2.vtc | 2 +-
reg-tests/filters/filter_sequence.vtc | 2 +-
reg-tests/filters/random-forwarding.vtc | 2 +-
reg-tests/lua/bad_http_clt_req_duration.vtc | 2 +-
reg-tests/lua/close_wait_lf.vtc | 2 +-
reg-tests/lua/h_txn_get_priv.vtc | 2 +-
reg-tests/lua/httpclient_action.vtc | 2 +-
reg-tests/lua/lua_httpclient.vtc | 2 +-
reg-tests/lua/lua_socket.vtc | 2 +-
reg-tests/lua/set_var.vtc | 2 +-
reg-tests/lua/txn_get_priv-thread.vtc | 2 +-
reg-tests/lua/txn_get_priv.vtc | 2 +-
reg-tests/lua/wrong_types_usage.vtc | 2 +-
reg-tests/mailers/healthcheckmail.vtc | 2 +-
reg-tests/peers/tls_basic_sync.vtc | 2 +-
reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc | 2 +-
reg-tests/quic/add_ssl_crt-list.vtc | 2 +-
reg-tests/quic/del_ssl_crt-list.vtc | 2 +-
reg-tests/server/cli_set_ssl.vtc | 2 +-
reg-tests/ssl/add_ssl_crt-list.vtc | 2 +-
reg-tests/ssl/del_ssl_crt-list.vtc | 2 +-
reg-tests/ssl/dynamic_server_ssl.vtc | 2 +-
reg-tests/ssl/set_ssl_bug_2265.vtc | 2 +-
reg-tests/ssl/set_ssl_cert.vtc | 2 +-
reg-tests/ssl/set_ssl_cert_noext.vtc | 2 +-
reg-tests/ssl/ssl_client_auth.vtc | 2 +-
reg-tests/ssl/ssl_frontend_samples.vtc | 2 +-
reg-tests/ssl/ssl_server_samples.vtc | 2 +-
reg-tests/ssl/ssl_simple_crt-list.vtc | 2 +-
reg-tests/ssl/wrong_ctx_storage.vtc | 2 +-
45 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/reg-tests/checks/healthcheck-section.vtc
b/reg-tests/checks/healthcheck-section.vtc
index 38fa2f20e..7bd74fc82 100644
--- 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 {
diff --git a/reg-tests/checks/ssl-hello-check.vtc
b/reg-tests/checks/ssl-hello-check.vtc
index b3d74e345..981854d40 100644
--- 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
diff --git a/reg-tests/checks/tcp-check-ssl.vtc
b/reg-tests/checks/tcp-check-ssl.vtc
index c0e33aaa5..da7f22d39 100644
--- 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
diff --git a/reg-tests/checks/tls_health_checks.vtc
b/reg-tests/checks/tls_health_checks.vtc
index 324218e37..4200756bb 100644
--- 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
diff --git a/reg-tests/compression/basic.vtc b/reg-tests/compression/basic.vtc
index f1e088753..5c166d752 100644
--- 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
diff --git a/reg-tests/compression/etags_conversion.vtc
b/reg-tests/compression/etags_conversion.vtc
index 57a9748b3..d397819d8 100644
--- 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
diff --git a/reg-tests/compression/lua_validation.vtc
b/reg-tests/compression/lua_validation.vtc
index ff2840eeb..b85738a7b 100644
--- 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
diff --git a/reg-tests/compression/min_size.vtc
b/reg-tests/compression/min_size.vtc
index cdf8f6e51..ce4b44a98 100644
--- 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
diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc
index b1e56432f..439e50e5e 100644
--- 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
diff --git a/reg-tests/connection/http_reuse_conn_hash.vtc
b/reg-tests/connection/http_reuse_conn_hash.vtc
index d67d3c568..414506367 100644
--- 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
diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc
b/reg-tests/connection/proxy_protocol_random_fail.vtc
index 9870d131b..97187a706 100644
--- 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
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 fa2f7d454..8fc1bc01c 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,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
diff --git a/reg-tests/converter/digest.vtc b/reg-tests/converter/digest.vtc
index 5c3435e2f..d35cc228f 100644
--- 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
diff --git a/reg-tests/converter/hmac.vtc b/reg-tests/converter/hmac.vtc
index 12f1227ec..96a2693fd 100644
--- 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
diff --git a/reg-tests/converter/secure_memcmp.vtc
b/reg-tests/converter/secure_memcmp.vtc
index b3ef4ecd3..c5a89fe4c 100644
--- 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
diff --git a/reg-tests/converter/sha2.vtc b/reg-tests/converter/sha2.vtc
index 3d7e7b1d3..da7557f75 100644
--- 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
diff --git a/reg-tests/filters/filter_sequence.vtc
b/reg-tests/filters/filter_sequence.vtc
index 22e0c9213..e4fe05954 100644
--- 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
diff --git a/reg-tests/filters/random-forwarding.vtc
b/reg-tests/filters/random-forwarding.vtc
index 0db734007..485406fdc 100644
--- 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
diff --git a/reg-tests/lua/bad_http_clt_req_duration.vtc
b/reg-tests/lua/bad_http_clt_req_duration.vtc
index cb9d1fed0..4da411f48 100644
--- 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
diff --git a/reg-tests/lua/close_wait_lf.vtc b/reg-tests/lua/close_wait_lf.vtc
index c909e4556..0c9e5b486 100644
--- 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
diff --git a/reg-tests/lua/h_txn_get_priv.vtc b/reg-tests/lua/h_txn_get_priv.vtc
index 798ead771..54c187c9b 100644
--- 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
diff --git a/reg-tests/lua/httpclient_action.vtc
b/reg-tests/lua/httpclient_action.vtc
index 0507fb4db..b74167656 100644
--- 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 {
diff --git a/reg-tests/lua/lua_httpclient.vtc b/reg-tests/lua/lua_httpclient.vtc
index a157a8df0..25a6c3dad 100644
--- 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
diff --git a/reg-tests/lua/lua_socket.vtc b/reg-tests/lua/lua_socket.vtc
index 6d715950f..4e30d26ed 100644
--- 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
diff --git a/reg-tests/lua/set_var.vtc b/reg-tests/lua/set_var.vtc
index 4918ebc6b..3cc68152f 100644
--- 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
diff --git a/reg-tests/lua/txn_get_priv-thread.vtc
b/reg-tests/lua/txn_get_priv-thread.vtc
index 87a402d96..c77a41d9b 100644
--- 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
diff --git a/reg-tests/lua/txn_get_priv.vtc b/reg-tests/lua/txn_get_priv.vtc
index ef306ad42..f1b0e03ed 100644
--- 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
diff --git a/reg-tests/lua/wrong_types_usage.vtc
b/reg-tests/lua/wrong_types_usage.vtc
index 51e8d8dae..5ad545221 100644
--- 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
diff --git a/reg-tests/mailers/healthcheckmail.vtc
b/reg-tests/mailers/healthcheckmail.vtc
index c23aa7273..6fe5254d5 100644
--- 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
diff --git a/reg-tests/peers/tls_basic_sync.vtc
b/reg-tests/peers/tls_basic_sync.vtc
index 4d81a73e4..5955173d7 100644
--- 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
diff --git a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
index 4a6358e26..0b982af65 100644
--- 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 {
diff --git a/reg-tests/quic/add_ssl_crt-list.vtc
b/reg-tests/quic/add_ssl_crt-list.vtc
index 2970cb6ec..d5cbee657 100644
--- 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)'"
diff --git a/reg-tests/quic/del_ssl_crt-list.vtc
b/reg-tests/quic/del_ssl_crt-list.vtc
index 298e9fc94..39ac7cff6 100644
--- 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)'"
diff --git a/reg-tests/server/cli_set_ssl.vtc b/reg-tests/server/cli_set_ssl.vtc
index 3f35d0921..b2262a7fb 100644
--- 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 {
diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc
b/reg-tests/ssl/add_ssl_crt-list.vtc
index d4d046410..49432bfc4 100644
--- 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
diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc
b/reg-tests/ssl/del_ssl_crt-list.vtc
index aa701e8dc..ec6b845a3 100644
--- 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
diff --git a/reg-tests/ssl/dynamic_server_ssl.vtc
b/reg-tests/ssl/dynamic_server_ssl.vtc
index 95a3c5a1b..34779fdbc 100644
--- 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
diff --git a/reg-tests/ssl/set_ssl_bug_2265.vtc
b/reg-tests/ssl/set_ssl_bug_2265.vtc
index 23c9a9e3c..b59fff477 100644
--- 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
diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index 93d614ca3..6c0dbc222 100644
--- 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
diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc
b/reg-tests/ssl/set_ssl_cert_noext.vtc
index a9e2a5fc8..2d63f33c0 100644
--- 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
diff --git a/reg-tests/ssl/ssl_client_auth.vtc
b/reg-tests/ssl/ssl_client_auth.vtc
index 9bb464eaa..12a4277af 100644
--- 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
diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc
b/reg-tests/ssl/ssl_frontend_samples.vtc
index 2c631642d..84faba71f 100644
--- 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
diff --git a/reg-tests/ssl/ssl_server_samples.vtc
b/reg-tests/ssl/ssl_server_samples.vtc
index 39ed4f9d2..2beda062b 100644
--- 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
diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc
b/reg-tests/ssl/ssl_simple_crt-list.vtc
index 36f586ec8..d6c8f1f88 100644
--- 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
diff --git a/reg-tests/ssl/wrong_ctx_storage.vtc
b/reg-tests/ssl/wrong_ctx_storage.vtc
index 156eb03e1..00f1fccc3 100644
--- 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
--
2.54.0
