REGTEST: vtest can now enable mcli with its own flag

VTest can now enable mworker and mcli with separate flags so lets
update vtc files that need it. This also allows to revert the change
made with 1545a59c ("REGTESTS: make seamless-reload depend on 1.9
and above").

diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc
index e92b786886ec3f2695262b134f8fe0ffb81e3e09..dd6c6205fa219aa42ffd456a484aad7123a74cf4 100644 (file)
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -8,7 +8,7 @@ feature ignore_unknown_macro
 server s1 {
 } -start
 
-haproxy h1 -W -conf {
+haproxy h1 -W -S -conf {
     global
         nbproc 4
     defaults

diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index d4aaccce9a556c217eec0fd65006c8d1b3d286d4..2df5c667fc22c360c612b51eee731e131f154178 100644 (file)
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -11,9 +11,6 @@
 varnishtest "Seamless reload issue with abns sockets"
 feature ignore_unknown_macro
 
-# expose-fd is available starting at version 1.8, but vtest requires the
-# master CLI, available in 1.9 and above.
-#REQUIRE_VERSION=1.9
 # abns@ sockets are not available on freebsd
 #EXCLUDE_TARGETS=freebsd,osx,generic
 #REGTEST_TYPE=bug