From 1dccfbeb5bfd1ff396642268d98128a691accff5 Mon Sep 17 00:00:00 2001 From: Jerome Magnin Date: Wed, 30 Oct 2019 18:27:45 +0100 Subject: [PATCH] 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"). --- reg-tests/mcli/mcli_show_info.vtc | 2 +- reg-tests/seamless-reload/abns_socket.vtc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc index e92b786886..dd6c6205fa 100644 --- 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 d4aaccce9a..2df5c667fc 100644 --- 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