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 568b5a8f854953d327eed03e7d4aa15782934121..4511a5fea3686b3227fb4e9fefea410559aaeeb0 100644 (file)
--- 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 bfa9ff4a9670f8f0c975b557bfaec849f49a0c6d..68f702bc9c539185c4dcb02e1015d96eef69bfcf 100644 (file)
--- 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 ab4200f0c510cbc0f05e3dc54cf8bb91115b1e3e..1b2473d766fb3b5c4809293001eff5b43b1f33ac 100644 (file)
--- 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