[master] d2ad24e Retire ${vmod_*} macros for varnishtest -i
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Feb 22 16:26:52 CET 2016
commit d2ad24e49e8b8179b11c92a6cc440002ccbc2101
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Sun Feb 21 20:15:08 2016 +0100
Retire ${vmod_*} macros for varnishtest -i
diff --git a/bin/varnishtest/tests/b00016.vtc b/bin/varnishtest/tests/b00016.vtc
index f4763ee..abf25b3 100644
--- a/bin/varnishtest/tests/b00016.vtc
+++ b/bin/varnishtest/tests/b00016.vtc
@@ -19,7 +19,7 @@ client c1 {
} -run
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new bar = directors.random();
diff --git a/bin/varnishtest/tests/c00055.vtc b/bin/varnishtest/tests/c00055.vtc
index ccfb53c..10c87f2 100644
--- a/bin/varnishtest/tests/c00055.vtc
+++ b/bin/varnishtest/tests/c00055.vtc
@@ -11,7 +11,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_recv {
if (std.cache_req_body(1KB)) {
diff --git a/bin/varnishtest/tests/c00067.vtc b/bin/varnishtest/tests/c00067.vtc
index 65303af..fff734c 100644
--- a/bin/varnishtest/tests/c00067.vtc
+++ b/bin/varnishtest/tests/c00067.vtc
@@ -31,7 +31,7 @@ client c1 {
delay .2
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_recv {
if (std.cache_req_body(110B)) {
diff --git a/bin/varnishtest/tests/c00070.vtc b/bin/varnishtest/tests/c00070.vtc
index b2df5b4..a3064d8 100644
--- a/bin/varnishtest/tests/c00070.vtc
+++ b/bin/varnishtest/tests/c00070.vtc
@@ -9,7 +9,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_backend_response {
set beresp.http.free_backend = debug.workspace_free(backend);
}
diff --git a/bin/varnishtest/tests/c00071.vtc b/bin/varnishtest/tests/c00071.vtc
index 7572613..e589386 100644
--- a/bin/varnishtest/tests/c00071.vtc
+++ b/bin/varnishtest/tests/c00071.vtc
@@ -12,7 +12,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
debug.workspace_allocate(client, debug.workspace_free(client) - 150);
diff --git a/bin/varnishtest/tests/c00074.vtc b/bin/varnishtest/tests/c00074.vtc
index f20f71c..61f2dec 100644
--- a/bin/varnishtest/tests/c00074.vtc
+++ b/bin/varnishtest/tests/c00074.vtc
@@ -6,8 +6,8 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
- import ${vmod_std};
+ import debug;
+ import std;
sub vcl_recv {
set req.http.ws-free = debug.workspace_free(session);
diff --git a/bin/varnishtest/tests/d00000.vtc b/bin/varnishtest/tests/d00000.vtc
index 2ec92ff..507e9c7 100644
--- a/bin/varnishtest/tests/d00000.vtc
+++ b/bin/varnishtest/tests/d00000.vtc
@@ -21,7 +21,7 @@ server s4 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new rr = directors.round_robin();
diff --git a/bin/varnishtest/tests/d00001.vtc b/bin/varnishtest/tests/d00001.vtc
index 2311b0a..4051476 100644
--- a/bin/varnishtest/tests/d00001.vtc
+++ b/bin/varnishtest/tests/d00001.vtc
@@ -16,7 +16,7 @@ server s3 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new fb1 = directors.fallback();
diff --git a/bin/varnishtest/tests/d00002.vtc b/bin/varnishtest/tests/d00002.vtc
index 0a0ba98..b13518c 100644
--- a/bin/varnishtest/tests/d00002.vtc
+++ b/bin/varnishtest/tests/d00002.vtc
@@ -8,7 +8,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new foo = directors.random();
@@ -43,7 +43,7 @@ server s2 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new foo = directors.random();
diff --git a/bin/varnishtest/tests/d00003.vtc b/bin/varnishtest/tests/d00003.vtc
index 970ed2d..7f12096 100644
--- a/bin/varnishtest/tests/d00003.vtc
+++ b/bin/varnishtest/tests/d00003.vtc
@@ -21,8 +21,8 @@ server s2 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
- import ${vmod_directors};
+ import std;
+ import directors;
sub vcl_init {
new h1 = directors.hash();
diff --git a/bin/varnishtest/tests/d00004.vtc b/bin/varnishtest/tests/d00004.vtc
index cef05f0..82b35b5 100644
--- a/bin/varnishtest/tests/d00004.vtc
+++ b/bin/varnishtest/tests/d00004.vtc
@@ -35,7 +35,7 @@ server s4 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new foo = directors.random();
diff --git a/bin/varnishtest/tests/d00005.vtc b/bin/varnishtest/tests/d00005.vtc
index d00e9c0..4d3b857 100644
--- a/bin/varnishtest/tests/d00005.vtc
+++ b/bin/varnishtest/tests/d00005.vtc
@@ -21,7 +21,7 @@ server s4 -repeat 2 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new rr1 = directors.round_robin();
diff --git a/bin/varnishtest/tests/d00006.vtc b/bin/varnishtest/tests/d00006.vtc
index 9d8ba1d..e98d66a 100644
--- a/bin/varnishtest/tests/d00006.vtc
+++ b/bin/varnishtest/tests/d00006.vtc
@@ -23,7 +23,7 @@ server s4 {
} -start
varnish v1 -errvcl {Names of VCL objects cannot contain '-'} {
- import ${vmod_directors};
+ import directors;
backend b1 { .host = "127.0.0.1"; .port = "8080";}
sub vcl_init {
new rr1-xx = directors.round_robin();
@@ -32,7 +32,7 @@ varnish v1 -errvcl {Names of VCL objects cannot contain '-'} {
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new rr1 = directors.round_robin();
rr1.add_backend(s1);
diff --git a/bin/varnishtest/tests/d00007.vtc b/bin/varnishtest/tests/d00007.vtc
index 26112e6..cdc889c 100644
--- a/bin/varnishtest/tests/d00007.vtc
+++ b/bin/varnishtest/tests/d00007.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl {
- import ${vmod_debug};
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/d00008.vtc b/bin/varnishtest/tests/d00008.vtc
index 79096b9..465fcda 100644
--- a/bin/varnishtest/tests/d00008.vtc
+++ b/bin/varnishtest/tests/d00008.vtc
@@ -13,7 +13,7 @@ server s2 {
} -start
varnish v1 -vcl {
- import ${vmod_debug};
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/d00009.vtc b/bin/varnishtest/tests/d00009.vtc
index 46d05c4..6b20030 100644
--- a/bin/varnishtest/tests/d00009.vtc
+++ b/bin/varnishtest/tests/d00009.vtc
@@ -16,7 +16,7 @@ server s2 {
} -start
varnish v1 -vcl {
- import ${vmod_debug};
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/d00010.vtc b/bin/varnishtest/tests/d00010.vtc
index 145112a..e67fd54 100644
--- a/bin/varnishtest/tests/d00010.vtc
+++ b/bin/varnishtest/tests/d00010.vtc
@@ -16,7 +16,7 @@ server s2 {
} -start
varnish v1 -vcl {
- import ${vmod_debug};
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/d00011.vtc b/bin/varnishtest/tests/d00011.vtc
index 639161e..ab1c8e0 100644
--- a/bin/varnishtest/tests/d00011.vtc
+++ b/bin/varnishtest/tests/d00011.vtc
@@ -9,8 +9,8 @@ server s2 {
} -start
varnish v1 -vcl {
- import ${vmod_std};
- import ${vmod_debug};
+ import std;
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/d00012.vtc b/bin/varnishtest/tests/d00012.vtc
index edc028b..aba0aec 100644
--- a/bin/varnishtest/tests/d00012.vtc
+++ b/bin/varnishtest/tests/d00012.vtc
@@ -10,7 +10,7 @@ server s1 {
} -start
varnish v1 -arg "-p thread_pools=1" -vcl {
- import ${vmod_debug};
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
@@ -39,7 +39,7 @@ server s2 {
} -start
varnish v1 -vcl {
- import ${vmod_debug};
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/d00013.vtc b/bin/varnishtest/tests/d00013.vtc
index 6762f41..4a397ee 100644
--- a/bin/varnishtest/tests/d00013.vtc
+++ b/bin/varnishtest/tests/d00013.vtc
@@ -9,8 +9,8 @@ server s2 {
} -start
varnish v1 -vcl {
- import ${vmod_std};
- import ${vmod_debug};
+ import std;
+ import debug;
backend dummy { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc
index b3ac748..b4d29c8 100644
--- a/bin/varnishtest/tests/m00000.vtc
+++ b/bin/varnishtest/tests/m00000.vtc
@@ -7,8 +7,8 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
- import ${vmod_debug};
+ import std;
+ import debug;
sub vcl_recv {
debug.rot52(req);
@@ -37,14 +37,14 @@ client c1 {
} -run
varnish v1 -errvcl {Wrong enum value. Expected one of:} {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.who = debug.author(jfk);
}
}
varnish v1 -errvcl {Wrong argument type. Expected REAL. Got STRING.} {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.who = std.random("foo", "bar");
}
diff --git a/bin/varnishtest/tests/m00001.vtc b/bin/varnishtest/tests/m00001.vtc
index 968345a..5f7979f 100644
--- a/bin/varnishtest/tests/m00001.vtc
+++ b/bin/varnishtest/tests/m00001.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.foo = std.toupper(resp.http.foo);
@@ -48,12 +48,12 @@ varnish v1 -cliok "vcl.list"
varnish v1 -cliok "debug.vmod"
varnish v1 -errvcl {Module std already imported.} {
- import ${vmod_std};
- import ${vmod_std};
+ import std;
+ import std;
}
varnish v1 -errvcl {Symbol not found: 'std' (expected type BOOL):} {
- import ${vmod_std};
+ import std;
sub vcl_recv {
if (std == 2) {
diff --git a/bin/varnishtest/tests/m00002.vtc b/bin/varnishtest/tests/m00002.vtc
index bb5626d..9223f0d 100644
--- a/bin/varnishtest/tests/m00002.vtc
+++ b/bin/varnishtest/tests/m00002.vtc
@@ -9,7 +9,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.rnd1 = std.random(0, 1);
diff --git a/bin/varnishtest/tests/m00004.vtc b/bin/varnishtest/tests/m00004.vtc
index 9e1d047..bb3ba56 100644
--- a/bin/varnishtest/tests/m00004.vtc
+++ b/bin/varnishtest/tests/m00004.vtc
@@ -14,7 +14,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
if (req.url == "/one") {
@@ -51,7 +51,7 @@ client c1 {
} -run
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
if (req.url == "/one") {
diff --git a/bin/varnishtest/tests/m00005.vtc b/bin/varnishtest/tests/m00005.vtc
index d89396c..fecbe3f 100644
--- a/bin/varnishtest/tests/m00005.vtc
+++ b/bin/varnishtest/tests/m00005.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.ttl = std.duration(req.http.ttl, 1s) + 1000000s;
diff --git a/bin/varnishtest/tests/m00006.vtc b/bin/varnishtest/tests/m00006.vtc
index d002112..2afad24 100644
--- a/bin/varnishtest/tests/m00006.vtc
+++ b/bin/varnishtest/tests/m00006.vtc
@@ -8,7 +8,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_recv {
std.collect(req.http.foo);
diff --git a/bin/varnishtest/tests/m00007.vtc b/bin/varnishtest/tests/m00007.vtc
index 9a1fe39..b66fc0b 100644
--- a/bin/varnishtest/tests/m00007.vtc
+++ b/bin/varnishtest/tests/m00007.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.gtzero = (std.integer(req.http.foo, 0) > 0);
diff --git a/bin/varnishtest/tests/m00008.vtc b/bin/varnishtest/tests/m00008.vtc
index 8e93d58..5912dc5 100644
--- a/bin/varnishtest/tests/m00008.vtc
+++ b/bin/varnishtest/tests/m00008.vtc
@@ -8,7 +8,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
}
varnish v1 -cliok "param.set vcc_unsafe_path off"
diff --git a/bin/varnishtest/tests/m00011.vtc b/bin/varnishtest/tests/m00011.vtc
index 45528c9..1c51a07 100644
--- a/bin/varnishtest/tests/m00011.vtc
+++ b/bin/varnishtest/tests/m00011.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.foo0 = std.ip("8.8.8.*", client.ip);
diff --git a/bin/varnishtest/tests/m00012.vtc b/bin/varnishtest/tests/m00012.vtc
index ef07f90..de3e835 100644
--- a/bin/varnishtest/tests/m00012.vtc
+++ b/bin/varnishtest/tests/m00012.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.foo = debug.blob2hex(debug.str2blob("gunk"));
@@ -25,7 +25,7 @@ varnish v1 -errvcl {BLOBs can only be used as arguments to VMOD functions.} {
backend b1 {.host = "127.0.0.1";}
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.foo = debug.str2blob("gunk");
@@ -36,7 +36,7 @@ varnish v1 -errvcl {Wrong argument type. Expected BLOB. Got STRING.} {
backend b1 {.host = "127.0.0.1";}
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.foo = debug.blob2hex("gunk");
diff --git a/bin/varnishtest/tests/m00013.vtc b/bin/varnishtest/tests/m00013.vtc
index 6f27c57..e657fb3 100644
--- a/bin/varnishtest/tests/m00013.vtc
+++ b/bin/varnishtest/tests/m00013.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_init {
# Make sure that this doesn't cause ill effects
diff --git a/bin/varnishtest/tests/m00014.vtc b/bin/varnishtest/tests/m00014.vtc
index 28c4c79..6d60def 100644
--- a/bin/varnishtest/tests/m00014.vtc
+++ b/bin/varnishtest/tests/m00014.vtc
@@ -6,7 +6,7 @@ server s1 -repeat 6 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.url = std.querysort(req.url);
diff --git a/bin/varnishtest/tests/m00015.vtc b/bin/varnishtest/tests/m00015.vtc
index a5ec8ba..1845fa7 100644
--- a/bin/varnishtest/tests/m00015.vtc
+++ b/bin/varnishtest/tests/m00015.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.t0 = std.real(req.http.foo, 0.0);
diff --git a/bin/varnishtest/tests/m00016.vtc b/bin/varnishtest/tests/m00016.vtc
index 261f840..a216085 100644
--- a/bin/varnishtest/tests/m00016.vtc
+++ b/bin/varnishtest/tests/m00016.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.x-foo = std.integer(req.http.foo, 0);
diff --git a/bin/varnishtest/tests/m00017.vtc b/bin/varnishtest/tests/m00017.vtc
index 5622ec0..8fa38f3 100644
--- a/bin/varnishtest/tests/m00017.vtc
+++ b/bin/varnishtest/tests/m00017.vtc
@@ -23,7 +23,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_recv {
if (req.url == "/foo") {
@@ -46,7 +46,7 @@ client c1 {
} -run
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_backend_fetch {
if (bereq.url == "/baz") {
diff --git a/bin/varnishtest/tests/m00018.vtc b/bin/varnishtest/tests/m00018.vtc
index 35000ce..33d68f3 100644
--- a/bin/varnishtest/tests/m00018.vtc
+++ b/bin/varnishtest/tests/m00018.vtc
@@ -6,7 +6,7 @@ server s1 -repeat 2 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.sub = std.strstr(req.url, "b");
diff --git a/bin/varnishtest/tests/m00019.vtc b/bin/varnishtest/tests/m00019.vtc
index 89ad9b0..b640a44 100644
--- a/bin/varnishtest/tests/m00019.vtc
+++ b/bin/varnishtest/tests/m00019.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.foo1 = debug.argtest("1", 2.0, "3");
@@ -33,7 +33,7 @@ client c1 {
delay .1
varnish v1 -errvcl {Argument 'one' already used} {
- import ${vmod_debug};
+ import debug;
backend b1 {.host = "127.0.0.1";}
sub vcl_deliver {
set resp.http.foo5 = debug.argtest("1", one="1");
@@ -41,7 +41,7 @@ varnish v1 -errvcl {Argument 'one' already used} {
}
varnish v1 -errvcl {Argument 'one' missing} {
- import ${vmod_debug};
+ import debug;
backend b1 {.host = "127.0.0.1";}
sub vcl_deliver {
set resp.http.foo5 = debug.argtest(two=2.0, three="3");
@@ -49,7 +49,7 @@ varnish v1 -errvcl {Argument 'one' missing} {
}
varnish v1 -errvcl {Unknown argument 'four'} {
- import ${vmod_debug};
+ import debug;
backend b1 {.host = "127.0.0.1";}
sub vcl_deliver {
set resp.http.foo5 = debug.argtest("1", two=2.0, four="3");
diff --git a/bin/varnishtest/tests/m00020.vtc b/bin/varnishtest/tests/m00020.vtc
index 4d76b40..8fe5c83 100644
--- a/bin/varnishtest/tests/m00020.vtc
+++ b/bin/varnishtest/tests/m00020.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.x-date = std.time(
diff --git a/bin/varnishtest/tests/m00021.vtc b/bin/varnishtest/tests/m00021.vtc
index 87f6834..007728a 100644
--- a/bin/varnishtest/tests/m00021.vtc
+++ b/bin/varnishtest/tests/m00021.vtc
@@ -17,7 +17,7 @@ logexpect l1 -v v1 -g raw {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_init {
debug.register_obj_events();
diff --git a/bin/varnishtest/tests/m00022.vtc b/bin/varnishtest/tests/m00022.vtc
index 29da34e..8b3a249 100644
--- a/bin/varnishtest/tests/m00022.vtc
+++ b/bin/varnishtest/tests/m00022.vtc
@@ -9,7 +9,7 @@ varnish v1 -vcl+backend { } -start
varnish v1 -errvcl "Planned failure in vcl_init" {
- import ${vmod_debug};
+ import debug;
backend default {
.host = "${s1_addr}";
@@ -24,7 +24,7 @@ varnish v1 -cliok "param.set nuke_limit 42"
varnish v1 -errvcl "nuke_limit is not the answer." {
- import ${vmod_debug};
+ import debug;
backend default {
.host = "${s1_addr}";
diff --git a/bin/varnishtest/tests/o00000.vtc b/bin/varnishtest/tests/o00000.vtc
index ccfaa65..1bf1e1d 100644
--- a/bin/varnishtest/tests/o00000.vtc
+++ b/bin/varnishtest/tests/o00000.vtc
@@ -15,7 +15,7 @@ server s1 {
} -start
varnish v1 -proto "PROXY" -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.url = req.url;
diff --git a/bin/varnishtest/tests/o00001.vtc b/bin/varnishtest/tests/o00001.vtc
index ecf025a..c906963 100644
--- a/bin/varnishtest/tests/o00001.vtc
+++ b/bin/varnishtest/tests/o00001.vtc
@@ -15,7 +15,7 @@ server s1 {
} -start
varnish v1 -proto "PROXY" -vcl+backend {
- import ${vmod_std};
+ import std;
acl fwd_client {
"1.2.3.4";
diff --git a/bin/varnishtest/tests/r00263.vtc b/bin/varnishtest/tests/r00263.vtc
index c9036d5..5b75b6f 100644
--- a/bin/varnishtest/tests/r00263.vtc
+++ b/bin/varnishtest/tests/r00263.vtc
@@ -3,7 +3,7 @@ varnishtest "Test refcounting backends from director"
# XXX: This test is probably not relevant with VMOD.directors
varnish v1 -vcl {
- import ${vmod_directors};
+ import directors;
backend node1 { .host = "10.0.0.1"; .port = "80"; }
backend node2 { .host = "10.0.0.2"; .port = "80"; }
diff --git a/bin/varnishtest/tests/r00306.vtc b/bin/varnishtest/tests/r00306.vtc
index 0d4c465..bbed997 100644
--- a/bin/varnishtest/tests/r00306.vtc
+++ b/bin/varnishtest/tests/r00306.vtc
@@ -19,7 +19,7 @@ server s2 {
varnish v1 -vcl {
- import ${vmod_directors};
+ import directors;
backend s1 {
.host = "${s1_addr}"; .port = "${s1_port}";
diff --git a/bin/varnishtest/tests/r00722.vtc b/bin/varnishtest/tests/r00722.vtc
index 739b8f0..b6a6ff7 100644
--- a/bin/varnishtest/tests/r00722.vtc
+++ b/bin/varnishtest/tests/r00722.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
backend b2 {
.host = "${s1_addr}"; .port = "${s1_port}";
diff --git a/bin/varnishtest/tests/r00878.vtc b/bin/varnishtest/tests/r00878.vtc
index 5725393..c6bc015 100644
--- a/bin/varnishtest/tests/r00878.vtc
+++ b/bin/varnishtest/tests/r00878.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.who = debug.author(phk);
}
@@ -18,7 +18,7 @@ client c1 {
rxresp
} -run
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.who = debug.author(des);
}
@@ -30,7 +30,7 @@ client c1 {
} -run
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.who = debug.author(kristian);
}
diff --git a/bin/varnishtest/tests/r01002.vtc b/bin/varnishtest/tests/r01002.vtc
index 6e9e3fd..d9bfb52 100644
--- a/bin/varnishtest/tests/r01002.vtc
+++ b/bin/varnishtest/tests/r01002.vtc
@@ -1,7 +1,7 @@
varnishtest "Real relational comparisons"
varnish v1 -vcl {
- import ${vmod_std};
+ import std;
backend foo { .host = "${bad_ip}"; .port = "9080"; }
sub vcl_recv {
diff --git a/bin/varnishtest/tests/r01145.vtc b/bin/varnishtest/tests/r01145.vtc
index cb26a2f..ee33bb0 100644
--- a/bin/varnishtest/tests/r01145.vtc
+++ b/bin/varnishtest/tests/r01145.vtc
@@ -15,7 +15,7 @@ server s1 {
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.foo = std.fileread("${tmpdir}" + req.url);
diff --git a/bin/varnishtest/tests/r01212.vtc b/bin/varnishtest/tests/r01212.vtc
index a1e91ee..0fc2634 100644
--- a/bin/varnishtest/tests/r01212.vtc
+++ b/bin/varnishtest/tests/r01212.vtc
@@ -1,7 +1,7 @@
varnishtest "#1212 - Vmod with HEADER argument given a STRING asserts the VCL compiler"
varnish v1 -errvcl {Wrong argument type. Expected HEADER. Got STRING.} {
- import ${vmod_std};
+ import std;
backend b { .host = "127.0.0.1"; }
sub vcl_recv {
std.collect("foo");
diff --git a/bin/varnishtest/tests/r01312.vtc b/bin/varnishtest/tests/r01312.vtc
index c39dadc..762da43 100644
--- a/bin/varnishtest/tests/r01312.vtc
+++ b/bin/varnishtest/tests/r01312.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
acl foo {
"127.0.0.2";
diff --git a/bin/varnishtest/tests/r01332.vtc b/bin/varnishtest/tests/r01332.vtc
index 518c558..43ca406 100644
--- a/bin/varnishtest/tests/r01332.vtc
+++ b/bin/varnishtest/tests/r01332.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_init {
new obj = debug.obj("don't care");
diff --git a/bin/varnishtest/tests/r01406.vtc b/bin/varnishtest/tests/r01406.vtc
index 491f9e9..ee4e5e4 100644
--- a/bin/varnishtest/tests/r01406.vtc
+++ b/bin/varnishtest/tests/r01406.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -arg "-p vcc_allow_inline_c=true" -vcl+backend {
- import ${vmod_std} ;
+ import std ;
C{
static const struct gethdr_s VGC_HDR_REQ_foo =
diff --git a/bin/varnishtest/tests/r01498.vtc b/bin/varnishtest/tests/r01498.vtc
index d321448..0c81af5 100644
--- a/bin/varnishtest/tests/r01498.vtc
+++ b/bin/varnishtest/tests/r01498.vtc
@@ -2,7 +2,7 @@ varnishtest "backend name VCC crash"
varnish v1 -vcl {
vcl 4.0;
- import ${vmod_directors};
+ import directors;
backend s1 {
.host = "127.0.0.1";
.port = "80";
diff --git a/bin/varnishtest/tests/r01501.vtc b/bin/varnishtest/tests/r01501.vtc
index c7ce3b8..38f220c 100644
--- a/bin/varnishtest/tests/r01501.vtc
+++ b/bin/varnishtest/tests/r01501.vtc
@@ -7,7 +7,7 @@ server s1 {
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_recv {
set req.backend_hint = debug.no_backend();
diff --git a/bin/varnishtest/tests/r01510.vtc b/bin/varnishtest/tests/r01510.vtc
index 6b74f54..9597240 100644
--- a/bin/varnishtest/tests/r01510.vtc
+++ b/bin/varnishtest/tests/r01510.vtc
@@ -1,7 +1,7 @@
varnishtest "Duplicate object names"
varnish v1 -errvcl {Object name 'first' already used.} {
- import ${vmod_debug};
+ import debug;
sub vcl_init {
new first = debug.obj("FOO");
new first = debug.obj("BAH");
@@ -9,7 +9,7 @@ varnish v1 -errvcl {Object name 'first' already used.} {
}
varnish v1 -errvcl {Object name 'first' already used.} {
- import ${vmod_debug};
+ import debug;
backend first { .host = "${bad_ip}"; .port = "9080"; }
diff --git a/bin/varnishtest/tests/r01532.vtc b/bin/varnishtest/tests/r01532.vtc
index b1ff007..271e51e 100644
--- a/bin/varnishtest/tests/r01532.vtc
+++ b/bin/varnishtest/tests/r01532.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.x-foo = std.real2time(1140618699.00, now);
diff --git a/bin/varnishtest/tests/r01569.vtc b/bin/varnishtest/tests/r01569.vtc
index 7a05938..af3c489 100644
--- a/bin/varnishtest/tests/r01569.vtc
+++ b/bin/varnishtest/tests/r01569.vtc
@@ -2,7 +2,7 @@ varnishtest "symbol lookup order issue"
varnish v1 -vcl {
vcl 4.0;
- import ${vmod_debug};
+ import debug;
backend debug {
.host = "127.0.0.1";
diff --git a/bin/varnishtest/tests/r01575.vtc b/bin/varnishtest/tests/r01575.vtc
index 11c82c1..c74fad5 100644
--- a/bin/varnishtest/tests/r01575.vtc
+++ b/bin/varnishtest/tests/r01575.vtc
@@ -29,7 +29,7 @@ server s5 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_directors};
+ import directors;
sub vcl_init {
new rd = directors.random();
rd.add_backend(s1, 10000);
diff --git a/bin/varnishtest/tests/r01613.vtc b/bin/varnishtest/tests/r01613.vtc
index 62c7213..4fca7c4 100644
--- a/bin/varnishtest/tests/r01613.vtc
+++ b/bin/varnishtest/tests/r01613.vtc
@@ -12,7 +12,7 @@ varnish v2 -vcl+backend {
} -start
varnish v1 -vcl {
- import ${vmod_std};
+ import std;
backend b {
.host = "${v2_addr}";
diff --git a/bin/varnishtest/tests/r01644.vtc b/bin/varnishtest/tests/r01644.vtc
index 90728a0..a6e4fbf 100644
--- a/bin/varnishtest/tests/r01644.vtc
+++ b/bin/varnishtest/tests/r01644.vtc
@@ -8,7 +8,7 @@ server s1 {
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_deliver {
set resp.http.foo = debug.vre_limit();
diff --git a/bin/varnishtest/tests/r01739.vtc b/bin/varnishtest/tests/r01739.vtc
index 21398cc..dbbd04d 100644
--- a/bin/varnishtest/tests/r01739.vtc
+++ b/bin/varnishtest/tests/r01739.vtc
@@ -8,7 +8,7 @@ server s1 {
varnish v1 \
-vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_backend_response {
set beresp.do_gzip = true;
debug.workspace_allocate(backend, debug.workspace_free(backend) - 16);
diff --git a/bin/varnishtest/tests/r01801.vtc b/bin/varnishtest/tests/r01801.vtc
index 7052ead..b0ef516 100644
--- a/bin/varnishtest/tests/r01801.vtc
+++ b/bin/varnishtest/tests/r01801.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.foo1 = std.ip("..", "1.2.3.4");
@@ -42,7 +42,7 @@ client c1 {
} -run
varnish v1 -errvcl "could not be resolved to an IP address" {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.foo = std.ip("..", "::1::2");
@@ -50,7 +50,7 @@ varnish v1 -errvcl "could not be resolved to an IP address" {
}
varnish v1 -errvcl "could not be resolved to an IP address" {
- import ${vmod_std};
+ import std;
sub vcl_deliver {
set resp.http.foo = std.ip("..", "1.2.3.4::80");
diff --git a/bin/varnishtest/tests/v00010.vtc b/bin/varnishtest/tests/v00010.vtc
index 7b0d57e..7dd839c 100644
--- a/bin/varnishtest/tests/v00010.vtc
+++ b/bin/varnishtest/tests/v00010.vtc
@@ -23,7 +23,7 @@ server s1 {
varnish v1 -arg "-smalloc,1m" -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_backend_response {
if (beresp.http.panic == "fetch") {
diff --git a/bin/varnishtest/tests/v00014.vtc b/bin/varnishtest/tests/v00014.vtc
index 4a290b0..78b0288 100644
--- a/bin/varnishtest/tests/v00014.vtc
+++ b/bin/varnishtest/tests/v00014.vtc
@@ -17,7 +17,7 @@ server s1 {
varnish v1 -vcl {
- import ${vmod_std};
+ import std;
probe foo {
.url = "/";
diff --git a/bin/varnishtest/tests/v00025.vtc b/bin/varnishtest/tests/v00025.vtc
index 02788d4..44426ad 100644
--- a/bin/varnishtest/tests/v00025.vtc
+++ b/bin/varnishtest/tests/v00025.vtc
@@ -7,7 +7,7 @@ server s1 {
varnish v1 -arg "-i J.F.Nobody" -vcl+backend {
- import ${vmod_std};
+ import std;
sub vcl_recv {
set client.identity = "Samuel B. Nobody";
diff --git a/bin/varnishtest/tests/v00041.vtc b/bin/varnishtest/tests/v00041.vtc
index 9604eb2..b5c053c 100644
--- a/bin/varnishtest/tests/v00041.vtc
+++ b/bin/varnishtest/tests/v00041.vtc
@@ -8,8 +8,8 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
- import ${vmod_std};
+ import debug;
+ import std;
sub vcl_recv {
set req.http.x0 = debug.test_priv_task(req.url);
diff --git a/bin/varnishtest/tests/v00042.vtc b/bin/varnishtest/tests/v00042.vtc
index 1640f56..6b7ed9c 100644
--- a/bin/varnishtest/tests/v00042.vtc
+++ b/bin/varnishtest/tests/v00042.vtc
@@ -34,7 +34,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_recv {
set req.http.x0 = debug.test_priv_task(req.url + req.esi_level);
diff --git a/bin/varnishtest/tests/v00043.vtc b/bin/varnishtest/tests/v00043.vtc
index ae562a7..9bf7b47 100644
--- a/bin/varnishtest/tests/v00043.vtc
+++ b/bin/varnishtest/tests/v00043.vtc
@@ -36,7 +36,7 @@ server s1 {
} -start
varnish v1 -cliok "param.set debug +syncvsl" -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_recv {
set req.http.x0 = debug.test_priv_top(req.url + req.esi_level);
diff --git a/bin/varnishtest/tests/v00044.vtc b/bin/varnishtest/tests/v00044.vtc
index c056d6c..d09501b 100644
--- a/bin/varnishtest/tests/v00044.vtc
+++ b/bin/varnishtest/tests/v00044.vtc
@@ -9,7 +9,7 @@ server s1 -repeat 20 {
# The debug vmod logs temperature vcl events
varnish v1 -arg "-p vcl_cooldown=1" -vcl {
- import ${vmod_debug};
+ import debug;
backend default {
.host = "${s1_addr}";
.probe = { .interval = 1s; .initial = 1;}
diff --git a/bin/varnishtest/tests/v00045.vtc b/bin/varnishtest/tests/v00045.vtc
index dc57c74..fe23158 100644
--- a/bin/varnishtest/tests/v00045.vtc
+++ b/bin/varnishtest/tests/v00045.vtc
@@ -4,7 +4,7 @@ server s1 -start
# Load and use a VCL that will hold a reference
varnish v1 -vcl+backend {
- import ${vmod_debug};
+ import debug;
sub vcl_init {
debug.vcl_release_delay(3s);
}
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 03ced80..ecca005 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -386,7 +386,6 @@ i_mode(void)
VSB_printf(vsb, "%s%s/lib/libvmod_" #l "/.libs", \
sep, topbuild); \
sep = ":"; \
- extmacro_def("vmod_" #l, #l); \
} while (0);
#include "vmods.h"
#undef VTC_VMOD
@@ -478,11 +477,6 @@ main(int argc, char * const *argv)
char *p;
uintmax_t bufsiz;
- /* Default import spec of vmods */
-#define VTC_VMOD(l) extmacro_def("vmod_" #l, #l);
-#include "vmods.h"
-#undef VTC_VMOD
-
if (getenv("TMPDIR") != NULL)
tmppath = strdup(getenv("TMPDIR"));
else
More information about the varnish-commit
mailing list