From: Tim Duesterhus <tim@bastelstu.be>
Date: Wed, 25 Aug 2021 17:14:01 +0000 (+0200)
Subject: REGTESTS: Use `feature cmd` for 2.5+ tests
X-Git-Tag: v2.5-dev5~18
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=7ba98480cc5b2ede0fd4cca162959f66beb82c82;p=haproxy-2.5.git

REGTESTS: Use `feature cmd` for 2.5+ tests

Using `REQUIRE_VERSION` is deprecated for tests targeting HAProxy with `-cc`
support.
---

diff --git a/reg-tests/http-messaging/scheme_based_normalize.vtc b/reg-tests/http-messaging/scheme_based_normalize.vtc
index 568b5a8..4511a5f 100644
--- a/reg-tests/http-messaging/scheme_based_normalize.vtc
+++ b/reg-tests/http-messaging/scheme_based_normalize.vtc
@@ -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 {
diff --git a/reg-tests/server/cli_delete_server.vtc b/reg-tests/server/cli_delete_server.vtc
index bfa9ff4..68f702b 100644
--- a/reg-tests/server/cli_delete_server.vtc
+++ b/reg-tests/server/cli_delete_server.vtc
@@ -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
diff --git a/reg-tests/server/cli_delete_server_lua.vtc b/reg-tests/server/cli_delete_server_lua.vtc
index ab4200f..1b2473d 100644
--- a/reg-tests/server/cli_delete_server_lua.vtc
+++ b/reg-tests/server/cli_delete_server_lua.vtc
@@ -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