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.

diff --git a/reg-tests/checks/healthcheck-section.vtc b/reg-tests/checks/healthcheck-section.vtc
index 38fa2f20eb7d535b92ef3b2ec1814807069ae4a4..7bd74fc8238c1a668314637e180f5a13ca6fd5fb 100644 (file)
--- 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 b3d74e3459bf798a49810bcdb29490e4268a9b68..981854d40a2438b73a9eabe64a59bdd4393c46f5 100644 (file)
--- 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 c0e33aaa510dc66121f32dff8d8bf7fe2b1ca07e..da7f22d397220df1705e99835bda8669f9970d12 100644 (file)
--- 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 324218e37587dd98abaccefb28ac2b676f5595ac..4200756bbe8a9686d6330ba9eea5f14f986bc674 100644 (file)
--- 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 f1e088753b4b00cb26c7203636eba95cca3307c7..5c166d752e939c6d39e7ad861527d2c23e2adfca 100644 (file)
--- 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 57a9748b33b8166eba1c17b1d1000d111e4eb085..d397819d8c4febf462d30860c0fac85187bfab46 100644 (file)
--- 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 ff2840eebe346912bfdbabd9667c7a6b42db9359..b85738a7b3946331136926f7d3bb7e59555ed1e2 100644 (file)
--- 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 cdf8f6e513d2518a92af61c82a1de803b36a0324..ce4b44a9883eacae43d2a74dee447f3e39fa26a7 100644 (file)
--- 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 b1e56432f2d702d8023e30ffa3831411ddd4cb15..439e50e5e5e61321d1812e369e0813a7ec617bb0 100644 (file)
--- 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 d67d3c568ca3c804331ee9523d275421aabdf5a0..41450636745a696e949b36c7a4faf9f43182606f 100644 (file)
--- 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 9870d131be8b5980a16da2c1db71e17f67a04f8a..97187a706e3f4fa16be50214ccd0ac8f528eadac 100644 (file)
--- 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 fa2f7d4545cf334e12267b607e06078b319c2b31..8fc1bc01c468244e555c4fd37c0046bb5cad8965 100644 (file)
--- 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 5c3435e2f1ea92f0b9f8dae5eff07bce1d77bba3..d35cc228f8ec30301e5dcc658c16ea9a1e54d3c8 100644 (file)
--- 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 12f1227ec4afc3d85eba116ade049e860f61876f..96a2693fd7ee38e5f24c9060a1e27f275d52c775 100644 (file)
--- 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 b3ef4ecd3451876699f0ffbc1c1fd0d266cd9563..c5a89fe4c672bb0e35329f203aa54d0f7f8de0c6 100644 (file)
--- 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 3d7e7b1d36c68fbac7fcd64e8e37c224c43145b1..da7557f75428175ed3533f90a2dab86df12253ef 100644 (file)
--- 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 22e0c92138501d28f787e4564509acea58aa09c3..e4fe05954241124d13cc23b1b2b0abc97591dbd5 100644 (file)
--- 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 0db734007bb4bcfb8a0297d9f92b065043d66f6a..485406fdc6464f73017d25a6b95ef967e4dc9340 100644 (file)
--- 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 cb9d1fed01afd833845ce47d1c3f5e7756651212..4da411f4803c9f8fe1d22449bf7f76acc41d6738 100644 (file)
--- 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 c909e45563d676976df51e32fd53cdf49ad6b5ba..0c9e5b4867c36db73dea8ab8d7c7d60cf65eebde 100644 (file)
--- 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 798ead7710ae219dc6f039ae6b5f3eac6c78bd49..54c187c9b178beb96dc19fabf9e1b5dccfff27ad 100644 (file)
--- 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 0507fb4dbc97931bcb34a076ad85d64b00505d5e..b74167656c251859890a15e8ae5d030c2125d7e3 100644 (file)
--- 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 a157a8df0fc20392b8f528cf12c51c1de367d411..25a6c3dad2a40bec8127beba58a61fc865792da1 100644 (file)
--- 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 6d715950fc5c9575618afe1c158afd3d195c505e..4e30d26ed61ed46eeb10f3737429c5151c6eed38 100644 (file)
--- 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 4918ebc6b2a6656738bb6368c045cc806d8cab11..3cc68152fc053a3319329596e884a7ab9738fa13 100644 (file)
--- 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 87a402d96b2da33fa2bff76e109839fa7229e960..c77a41d9bb749c08903fa2d1391c2a63e311f9fd 100644 (file)
--- 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 ef306ad42d2a4bc7d3047e5b000bdfbad7ada192..f1b0e03edfb71347cb8b68c4421ae46cfee3a9b7 100644 (file)
--- 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 51e8d8dae169ca1cd3cac0676079dd9c12fbd1c9..5ad5452211531133c6d61b4d5ac6ad843e04df12 100644 (file)
--- 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 c23aa727359b7b8fbc44318715555f73d476b77d..6fe5254d5985cdafd15c7ee1e2e91a2b11a1cdd3 100644 (file)
--- 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 4d81a73e4aeadfa605117323f507410c3d1915ff..5955173d7b5e9d44c6ddac6e250c95d92bb59767 100644 (file)
--- 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 4a6358e26bdd09a2c2820de1928bf513338ddff5..0b982af656b388e03a010051f9f39925e83fbdc8 100644 (file)
--- 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 2970cb6ec32ba5148d021ce762875898605885e5..d5cbee6573c60e25049ad19cd218bbba0f595678 100644 (file)
--- 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 298e9fc94f39536a16599d085e9944ae3f363b91..39ac7cff645d5710aa1894226bacbf26463aee97 100644 (file)
--- 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 3f35d0921a50ade9dfe826d577b9f52d8c0a7003..b2262a7fbfa226301019037cc16d01c9986b529b 100644 (file)
--- 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 d4d046410de7189e5d054daacc9ed29660d94ff1..49432bfc4e34f63bdb1ea87c14d93a1edd029b60 100644 (file)
--- 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 aa701e8dc3a0839d82f466635b5e6e26d1709b76..ec6b845a3b5191d15929d4c725f308cfca05939a 100644 (file)
--- 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 95a3c5a1b6e10e878ef0af747153eb6abcdf31e7..34779fdbc9b8a677ccf65acfd4496176aeed24a2 100644 (file)
--- 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 23c9a9e3c0a4690a2213086ae3ffeb833a55825a..b59fff477ae590248ce0ecd4b7cd2f912b09705f 100644 (file)
--- 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 93d614ca3a0b6f0ac5d65247b0659eb34c5e8944..6c0dbc222b4f7c7e91e6c8343119eaf59c6195ee 100644 (file)
--- 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 a9e2a5fc8f23dbd76f7bbc18ac890a3651991225..2d63f33c0f73de0f34f412aa12f17fadba0793b4 100644 (file)
--- 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 9bb464eaabd2cd6f06d1cf69d021ed2c155fed95..12a4277af568e2bba8215b548ccb048c077ae7b9 100644 (file)
--- 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 2c631642d364afec4299eab0234ae566eb1fae69..84faba71f064a6892af492cc3c170b4c4bfb02ba 100644 (file)
--- 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 39ed4f9d26241cd591ee92835be8a2e60c627079..2beda062b1b4bc48625c9998d243f8cc05e16e7e 100644 (file)
--- 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 36f586ec8096beb32d83a9703f5bec615093df53..d6c8f1f884ccc48ce61e2cbfdb0b6d7e33c1b0a3 100644 (file)
--- 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 156eb03e14afb335305b94264bf952cf1cd14de1..00f1fccc3923f386cd4441a81278b44101fb5a7c 100644 (file)
--- 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