diff options
| author | Tim Duesterhus <tim@bastelstu.be> | 2021-08-25 19:14:01 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2021-08-25 21:38:38 +0200 |
| commit | 7ba98480cc5b2ede0fd4cca162959f66beb82c82 (patch) | |
| tree | 9054023ed554518eaa888d8c81083e4171417069 | |
| parent | a39e6266d1b6877b2765217d569bc921bb9e7781 (diff) | |
| download | haproxy-7ba98480cc5b2ede0fd4cca162959f66beb82c82.tar.gz | |
REGTESTS: Use `feature cmd` for 2.5+ tests
Using `REQUIRE_VERSION` is deprecated for tests targeting HAProxy with `-cc`
support.
| -rw-r--r-- | reg-tests/http-messaging/scheme_based_normalize.vtc | 2 | ||||
| -rw-r--r-- | reg-tests/server/cli_delete_server.vtc | 3 | ||||
| -rw-r--r-- | reg-tests/server/cli_delete_server_lua.vtc | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/reg-tests/http-messaging/scheme_based_normalize.vtc b/reg-tests/http-messaging/scheme_based_normalize.vtc index 568b5a8f8..4511a5fea 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 bfa9ff4a9..68f702bc9 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 ab4200f0c..1b2473d76 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 |