This migrates the tests for HAProxy versions that support '-cc' to the native VTest functionality. --- reg-tests/ssl/new_del_ssl_cafile.vtc | 2 +- reg-tests/ssl/new_del_ssl_crlfile.vtc | 2 +- reg-tests/ssl/set_ssl_cafile.vtc | 2 +- reg-tests/ssl/set_ssl_crlfile.vtc | 2 +- reg-tests/ssl/show_ssl_ocspresponse.vtc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc b/reg-tests/ssl/new_del_ssl_cafile.vtc index f943a6632..536db5007 100644 --- a/reg-tests/ssl/new_del_ssl_cafile.vtc +++ b/reg-tests/ssl/new_del_ssl_cafile.vtc @@ -10,7 +10,7 @@ varnishtest "Test the 'new ssl ca-file' and 'del ssl ca-file' commands of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -#REQUIRE_OPTIONS=OPENSSL +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" #REQUIRE_BINARIES=socat feature ignore_unknown_macro diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc b/reg-tests/ssl/new_del_ssl_crlfile.vtc index 027f00096..eeed09caf 100644 --- a/reg-tests/ssl/new_del_ssl_crlfile.vtc +++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc @@ -10,7 +10,7 @@ varnishtest "Test the 'new ssl crl-file' and 'del ssl crl-file' commands of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -#REQUIRE_OPTIONS=OPENSSL +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" #REQUIRE_BINARIES=socat feature ignore_unknown_macro diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc index 2f4ef2e8a..5dcfaf989 100644 --- a/reg-tests/ssl/set_ssl_cafile.vtc +++ b/reg-tests/ssl/set_ssl_cafile.vtc @@ -16,7 +16,7 @@ varnishtest "Test the 'set ssl ca-file' feature of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -#REQUIRE_OPTIONS=OPENSSL +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" #REQUIRE_BINARIES=socat feature ignore_unknown_macro diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc index d3aad9065..4ee7c1225 100644 --- a/reg-tests/ssl/set_ssl_crlfile.vtc +++ b/reg-tests/ssl/set_ssl_crlfile.vtc @@ -19,7 +19,7 @@ varnishtest "Test the 'set ssl crl-file' feature of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -#REQUIRE_OPTIONS=OPENSSL +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" #REQUIRE_BINARIES=socat feature ignore_unknown_macro diff --git a/reg-tests/ssl/show_ssl_ocspresponse.vtc b/reg-tests/ssl/show_ssl_ocspresponse.vtc index a942f2c47..29673a525 100644 --- a/reg-tests/ssl/show_ssl_ocspresponse.vtc +++ b/reg-tests/ssl/show_ssl_ocspresponse.vtc @@ -20,7 +20,7 @@ varnishtest "Test the 'show ssl ocsp-response' and 'show ssl cert foo.pem.ocsp' features of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -#REQUIRE_OPTIONS=OPENSSL +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" #REQUIRE_BINARIES=socat feature ignore_unknown_macro -- 2.32.0
