aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2014-11-01 16:28:19 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2014-11-01 16:34:10 +0200
commitfffbbfb089847644e2b0281faba2fa892df4f8b9 (patch)
tree83899ca03d92bdb4100c413904c83385ca0c7d6c /tests
parentc16de06862f9b2106dcb7810fc20856689ef2aa6 (diff)
downloadvmod-binlog-fffbbfb089847644e2b0281faba2fa892df4f8b9.tar.gz
vmod-binlog-fffbbfb089847644e2b0281faba2fa892df4f8b9.tar.bz2
Support for VCL 4.0
* configure.ac: Version 1.0.91 Detect varnish version and set variables and conditionals accordingly. * NEWS: Update. * src/.gitignore: Update. * src/Makefile.am: Always build vcc_if.c and vcc_if.h. Don't distribute them. * src/binlog.c: Use VCL data type. Define them for VCL 3.0. (vmod_init): Fix premature memory deallocation. * src/vmod.vcc: Rewrite in VCL 4.0 syntax. * tests/atlocal.in (ret_vcl_recv): New variable. * tests/test01.at (vcl_recv): Return $ret_vcl_recv. * tests/test02.at: Likewise.
Diffstat (limited to 'tests')
-rw-r--r--tests/atlocal.in3
-rw-r--r--tests/test01.at2
-rw-r--r--tests/test02.at2
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 24a523c..2d91b77 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -4,5 +4,6 @@
PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH
VARNISHTEST="@VARNISHSRC@/bin/varnishtest/varnishtest -Dvarnishd=@VARNISHSRC@/bin/varnishd/varnishd"
-
+@VARNISH4_FALSE@ret_vcl_recv=lookup
+@VARNISH4_TRUE@ret_vcl_recv=hash
diff --git a/tests/test01.at b/tests/test01.at
index 62eb4fb..b879615 100644
--- a/tests/test01.at
+++ b/tests/test01.at
@@ -42,7 +42,7 @@ varnish v1 -vcl+backend {
binlog.pack(req.http.X-nid);
binlog.pack(req.http.X-aid);
binlog.commit();
- return (lookup);
+ return ($ret_vcl_recv);
}
} -start
diff --git a/tests/test02.at b/tests/test02.at
index f1520a8..fc9e08f 100644
--- a/tests/test02.at
+++ b/tests/test02.at
@@ -42,7 +42,7 @@ varnish v1 -vcl+backend {
binlog.pack(req.http.X-nid);
binlog.pack(req.http.X-aid);
binlog.commit();
- return (lookup);
+ return ($ret_vcl_recv);
}
} -start

Return to:

Send suggestions and report system problems to the System administrator.