[master] 0c5569f Use -syntax 4.0 where appropriate
Poul-Henning Kamp
phk at FreeBSD.org
Tue Feb 20 10:49:09 UTC 2018
commit 0c5569f7ebef530b71a7146a25fc01563d7ff122
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Feb 20 10:47:53 2018 +0000
Use -syntax 4.0 where appropriate
diff --git a/bin/varnishtest/tests/c00009.vtc b/bin/varnishtest/tests/c00009.vtc
index 6ff3d97..b71ce59 100644
--- a/bin/varnishtest/tests/c00009.vtc
+++ b/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";
diff --git a/bin/varnishtest/tests/c00045.vtc b/bin/varnishtest/tests/c00045.vtc
index 896a520..6475033 100644
--- a/bin/varnishtest/tests/c00045.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/c00046.vtc b/bin/varnishtest/tests/c00046.vtc
index 55832f3..a3ce00f 100644
--- a/bin/varnishtest/tests/c00046.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/c00078.vtc b/bin/varnishtest/tests/c00078.vtc
index d5464ef..f8d234a 100644
--- a/bin/varnishtest/tests/c00078.vtc
+++ b/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 {
diff --git a/bin/varnishtest/tests/c00084.vtc b/bin/varnishtest/tests/c00084.vtc
index 3a4c77c..37b3be2 100644
--- a/bin/varnishtest/tests/c00084.vtc
+++ b/bin/varnishtest/tests/c00084.vtc
@@ -1,6 +1,9 @@
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"; }
diff --git a/bin/varnishtest/tests/e00015.vtc b/bin/varnishtest/tests/e00015.vtc
index daaea75..b394668 100644
--- a/bin/varnishtest/tests/e00015.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/e00016.vtc b/bin/varnishtest/tests/e00016.vtc
index 7cf78cc..feb86d6 100644
--- a/bin/varnishtest/tests/e00016.vtc
+++ b/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;
}
diff --git a/bin/varnishtest/tests/e00021.vtc b/bin/varnishtest/tests/e00021.vtc
index dc8f1cf..8199937 100644
--- a/bin/varnishtest/tests/e00021.vtc
+++ b/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;
}
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index 65e14d1..446d2e2 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/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;
}
diff --git a/bin/varnishtest/tests/p00008.vtc b/bin/varnishtest/tests/p00008.vtc
index a17c17c..c3973b4 100644
--- a/bin/varnishtest/tests/p00008.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/r00940.vtc b/bin/varnishtest/tests/r00940.vtc
index 4e4711d..d70bb91 100644
--- a/bin/varnishtest/tests/r00940.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index bff9498..7f96219 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/r01175.vtc b/bin/varnishtest/tests/r01175.vtc
index 5b7a748..6dd776e 100644
--- a/bin/varnishtest/tests/r01175.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/r01284.vtc b/bin/varnishtest/tests/r01284.vtc
index 5612acb..d899fac 100644
--- a/bin/varnishtest/tests/r01284.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/r01810.vtc b/bin/varnishtest/tests/r01810.vtc
index 3448314..cb641e9 100644
--- a/bin/varnishtest/tests/r01810.vtc
+++ b/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";
}
diff --git a/bin/varnishtest/tests/r01914.vtc b/bin/varnishtest/tests/r01914.vtc
index d7f1b20..2414dad 100644
--- a/bin/varnishtest/tests/r01914.vtc
+++ b/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 {
diff --git a/bin/varnishtest/tests/v00001.vtc b/bin/varnishtest/tests/v00001.vtc
index 822c847..0e9729d 100644
--- a/bin/varnishtest/tests/v00001.vtc
+++ b/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 +
diff --git a/bin/varnishtest/tests/v00025.vtc b/bin/varnishtest/tests/v00025.vtc
index aadaa83..544240b 100644
--- a/bin/varnishtest/tests/v00025.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/v00032.vtc b/bin/varnishtest/tests/v00032.vtc
index 47f1af8..b86c583 100644
--- a/bin/varnishtest/tests/v00032.vtc
+++ b/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;
diff --git a/bin/varnishtest/tests/v00033.vtc b/bin/varnishtest/tests/v00033.vtc
index b370dd7..bbe21d1 100644
--- a/bin/varnishtest/tests/v00033.vtc
+++ b/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) {
}
diff --git a/bin/varnishtest/tests/v00052.vtc b/bin/varnishtest/tests/v00052.vtc
index a014b60..76c0590 100644
--- a/bin/varnishtest/tests/v00052.vtc
+++ b/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;
}
More information about the varnish-commit
mailing list