Use -syntax 4.0 where appropriate

bin/varnishtest/tests/c00009.vtc

@@ -12,7 +12,7 @@ server s2 {
 	txresp -body "foobar"
 } -start
 
-varnish v1 -arg "-smysteve=malloc,1m" -vcl+backend {
+varnish v1 -syntax 4.0 -arg "-smysteve=malloc,1m" -vcl+backend {
 	sub vcl_recv {
 		if (req.restarts == 0) {
 			set req.url = "/foo";

bin/varnishtest/tests/c00045.vtc

@@ -14,6 +14,7 @@ varnish v1 \
 	-arg "-sdefault,1m" \
 	-arg "-sdefault,1m" \
 	-arg "-sTransient=default" \
+	-syntax 4.0 \
 	-vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_stream = false;

bin/varnishtest/tests/c00046.vtc

@@ -10,6 +10,7 @@ varnish v1 \
 	-arg "-sdefault,1m" \
 	-arg "-sdefault,1m" \
 	-arg "-sTransient=default" \
+	-syntax 4.0 \
 	-vcl+backend {
 	sub vcl_backend_response {
 		set beresp.storage = storage.s0;

bin/varnishtest/tests/c00078.vtc

@@ -9,6 +9,7 @@ varnish v1 \
     -arg "-ss1=default,1m" \
     -arg "-ss2=default,1m" \
     -arg "-ss0=default,1m" \
+    -syntax 4.0 \
     -vcl+backend {
 	import vtc;
 	sub vcl_backend_response {

bin/varnishtest/tests/c00084.vtc

 varnishtest "legal symbol names"
 
-varnish v1 -arg "-s my-store=default" -vcl {
+varnish v1 \
+	-syntax 4.0 \
+	-arg "-s my-store=default" \
+	-vcl {
 	import directors;
 
 	acl my-acl { "127.0.0.1"; }

bin/varnishtest/tests/e00015.vtc

@@ -22,7 +22,7 @@ server s1 {
 	}
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_recv {
 		if (req.url == "/") {
 			set req.esi = false;

bin/varnishtest/tests/e00016.vtc

@@ -26,7 +26,10 @@ server s1 {
 	}
 } -start
 
-varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
+varnish v1 \
+	-syntax 4.0 \
+	-arg "-p feature=+esi_disable_xml_check" \
+	-vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}

bin/varnishtest/tests/e00021.vtc

@@ -13,7 +13,7 @@ server s1 {
 	}
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_recv {
 		set req.esi = true;
 	}

bin/varnishtest/tests/e00022.vtc

@@ -14,7 +14,7 @@ server s1 {
 	}
 } -start
 
-varnish v1 -arg "-p thread_pool_stack=262144" -vcl+backend {
+varnish v1 -syntax 4.0 -arg "-p thread_pool_stack=262144" -vcl+backend {
 	sub vcl_recv {
 		set req.esi = true;
 	}

bin/varnishtest/tests/p00008.vtc

@@ -18,6 +18,7 @@ varnish v1 \
 	-arg "-pban_lurker_sleep=0" \
 	-arg "-sper1=deprecated_persistent,${tmpdir}/_.per1,5m" \
 	-arg "-sper2=deprecated_persistent,${tmpdir}/_.per2,5m" \
+	-syntax 4.0 \
 	-vcl+backend {
 		sub vcl_backend_response {
 			set beresp.storage = storage.per1;

bin/varnishtest/tests/r00940.vtc

@@ -19,7 +19,7 @@ server s1 {
 	txresp -hdr {ETag: "foo4"}  -gzipbody {<H11><esi:remove> foo </esi:remove><H22>}
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_backend_response {
 		if (bereq.url == "/2") {
 			set beresp.do_gzip = true;

bin/varnishtest/tests/r00962.vtc

@@ -18,6 +18,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-arg "-sdeprecated_persistent,${tmpdir}/_.per1,5m" \
 	-arg "-sdeprecated_persistent,${tmpdir}/_.per2,5m" \
+	-syntax 4.0 \
 	-vcl+backend {
 	sub vcl_backend_response {
 		set beresp.storage = storage.s0;

bin/varnishtest/tests/r01175.vtc

@@ -5,7 +5,7 @@ server s1 {
 	txresp -nolen -hdr "Content-Length: 1048576"
 } -start
 
-varnish v1 -arg "-s test=default,1M" -vcl+backend {
+varnish v1 -syntax 4.0 -arg "-s test=default,1M" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.storage = storage.test;
 		set beresp.do_stream = false;

bin/varnishtest/tests/r01284.vtc

@@ -12,6 +12,7 @@ server s1 {
 varnish v1 \
 	-arg "-p nuke_limit=0" \
 	-arg "-sTransient=default,1m" \
+	-syntax 4.0 \
 	-vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_stream = false;

bin/varnishtest/tests/r01810.vtc

@@ -8,7 +8,7 @@ server s1 {
 	delay .4
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_backend_fetch {
 		set bereq.proto = "HTTP/1.0";
 	}

bin/varnishtest/tests/r01914.vtc

@@ -13,6 +13,7 @@ varnish v1 \
     -arg "-s default,1MB" \
     -arg "-s default,1MB" \
     -arg "-s Transient=default" \
+    -syntax 4.0 \
     -vcl+backend {
 	import std;
 	sub vcl_recv {

bin/varnishtest/tests/v00001.vtc

@@ -8,7 +8,7 @@ server s1 {
 
 server s1 -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_recv {
 		set req.http.foobar =
 		    req.url +

bin/varnishtest/tests/v00025.vtc

@@ -5,7 +5,7 @@ server s1 {
 	txresp
 } -start
 
-varnish v1 -arg "-i J.F.Nobody" -vcl+backend {
+varnish v1 -syntax 4.0 -arg "-i J.F.Nobody" -vcl+backend {
 
 	import std;
 	import directors;

bin/varnishtest/tests/v00032.vtc

@@ -5,7 +5,7 @@ server s1 {
 	txresp
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.http.has_s0 = storage.s0;
 		set beresp.http.has_Transient = storage.Transient;

bin/varnishtest/tests/v00033.vtc

@@ -8,7 +8,7 @@ server s1 {
 	txresp -bodylen 5
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 
 	sub vcl_backend_response {
 		set beresp.http.foo =
@@ -37,13 +37,13 @@ client c1 {
 	expect resp.http.bar == true
 } -run
 
-varnish v1 -errvcl {Expected BYTES unit (B, KB, MB...) got '"X"'} {
+varnish v1 -syntax 4.0 -errvcl {Expected BYTES unit (B, KB, MB...) got '"X"'} {
 	sub vcl_recv {
 		if (storage.Transient.free_space > 4 "X") {
 		}
 	}
 }
-varnish v1 -errvcl {Unknown BYTES unit 'X'.  Legal are 'B', 'KB', 'MB', 'GB' and 'TB'} {
+varnish v1 -syntax 4.0 -errvcl {Unknown BYTES unit 'X'.  Legal are 'B', 'KB', 'MB', 'GB' and 'TB'} {
 	sub vcl_recv {
 		if (storage.Transient.free_space > 4 X) {
 		}

bin/varnishtest/tests/v00052.vtc

@@ -8,7 +8,7 @@ server s1 {
 	txresp
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -syntax 4.0 -vcl+backend {
 	sub vcl_hit {
 		set req.http.Hit-Storage = obj.storage;
 	}