REGTESTS: Replace REQUIRE_OPTIONS with 'haproxy -cc' for 2.5+ tests

This migrates the tests for HAProxy versions that support '-cc' to the native
VTest functionality.
This commit is contained in:
Tim Duesterhus 2021-06-11 19:56:16 +02:00 committed by Willy Tarreau
parent 5efc48dcf1
commit c9570483b0
5 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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