REGTESTS: Use `feature cmd` for 2.5+ tests

Using `REQUIRE_VERSION` is deprecated for tests targeting HAProxy with `-cc`
support.
This commit is contained in:
Tim Duesterhus 2021-08-25 19:14:01 +02:00 committed by Willy Tarreau
parent a39e6266d1
commit 7ba98480cc
3 changed files with 4 additions and 6 deletions

View File

@ -1,6 +1,6 @@
varnishtest "scheme based normalization (rfc3982 6.3.2)"
#REQUIRE_VERSION=2.5
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature ignore_unknown_macro
syslog S1 -level info {

View File

@ -3,10 +3,9 @@
#
varnishtest "Delete server via cli"
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature ignore_unknown_macro
#REQUIRE_VERSION=2.5
haproxy h1 -conf {
defaults
mode http

View File

@ -2,11 +2,10 @@
# cannot be removed at runtime.
varnishtest "Delete lua server via cli"
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA)'"
feature ignore_unknown_macro
#REQUIRE_VERSION=2.5
#REQUIRE_OPTIONS=LUA
server s1 {
rxreq
txresp