backport to 4.1

src/Makefile.am

@@ -16,13 +16,11 @@ nodist_libvmod_all_healthy_la_SOURCES = \
 # Test suite
 
 AM_TESTS_ENVIRONMENT = \
-	PATH="$(abs_builddir):$(VARNISH_TEST_PATH):$(PATH)" \
+	PATH="$(abs_builddir):$(VMOD_TEST_PATH):$(PATH)" \
 	LD_LIBRARY_PATH="$(VARNISH_LIBRARY_PATH)"
 TEST_EXTENSIONS = .vtc
 VTC_LOG_COMPILER = varnishtest -v
-AM_VTC_LOG_FLAGS = \
-	-p vcl_path="$(abs_top_srcdir)/vcl" \
-	-p vmod_path="$(abs_builddir)/.libs:$(vmoddir)"
+AM_VTC_LOG_FLAGS = -Dvmod_dir="$(abs_builddir)/.libs"
 
 TESTS = \
 	vtc/vmod_all_healthy.vtc

src/vtc/vmod_all_healthy.vtc

@@ -2,11 +2,10 @@ varnishtest "test vmod-all_healthy"
 
 varnish v1 -vcl {
 	import std;
-	import vtc;
-	import all_healthy;
+	import all_healthy from "${vmod_dir}/libvmod_all_healthy.so";
 
-	backend be_a { .host = "${bad_backend}"; }
-	backend be_b { .host = "${bad_backend}"; }
+	backend be_a { .host = "${bad_ip}"; }
+	backend be_b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
 		new be = all_healthy.director();
@@ -25,7 +24,7 @@ varnish v1 -vcl {
 	}
 } -start
 
-varnish v1 -cliok "backend.list -j"
+varnish v1 -cliok "backend.list"
 
 client c1 {
 	txreq
@@ -39,7 +38,7 @@ client c1 {
 
 varnish v1 -cliok "backend.set_health be_a sick"
 
-varnish v1 -cliok "backend.list -j"
+varnish v1 -cliok "backend.list"
 
 client c1 {
 	txreq
@@ -54,7 +53,7 @@ client c1 {
 varnish v1 -cliok "backend.set_health be_a healthy"
 varnish v1 -cliok "backend.set_health be_b sick"
 
-varnish v1 -cliok "backend.list -j"
+varnish v1 -cliok "backend.list"
 
 client c1 {
 	txreq
@@ -68,7 +67,7 @@ client c1 {
 
 varnish v1 -cliok "backend.set_health be_b healthy"
 
-varnish v1 -cliok "backend.list -j"
+varnish v1 -cliok "backend.list"
 
 client c1 {
 	txreq