diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 31 | ||||
| -rw-r--r-- | tests/test00.vti (renamed from tests/test00.vtc) | 6 | ||||
| -rw-r--r-- | tests/test02.vti (renamed from tests/test02.vtc) | 6 |
4 files changed, 36 insertions, 9 deletions
diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..6f6760a --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,2 @@ +test00.vtc +test02.vtc diff --git a/tests/Makefile.am b/tests/Makefile.am index 4790115..0f90aa7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,17 +1,38 @@ +VMOD_VTC = \ + test01.vtc\ + test03.vtc\ + time00.vtc + +VMOD_VTI = \ + test00.vti\ + test02.vti + +BUILT_TESTS = $(VMOD_VTI:.vti=.vtc) + VMOD_TESTS = \ - test00.vtc\ + test00.vti\ test01.vtc\ - test02.vtc\ + test02.vti\ test03.vtc\ time00.vtc -EXTRA_DIST=$(VMOD_TESTS) +.vti.vtc: + sed 's/^#VARNISH$(VARNISHVERSION)#//' $< > $@ + +EXTRA_DIST=$(VMOD_VTC) $(VMOD_VTI) +CLEANFILES=$(BUILT_TESTS) + distclean-local: rm -fr tbf -check: - cd $(abs_srcdir); \ +check: $(BUILT_TESTS) for t in $(VMOD_TESTS); do \ + n=$${t%%.vti}; \ + if [ $$n != $$t ]; then \ + t=$(abs_builddir)/$${n}.vtc;\ + else \ + t=$(abs_srcdir)/$$t;\ + fi; \ $(VARNISHSRC)/bin/varnishtest/varnishtest \ -Dvarnishd=$(VARNISHSRC)/bin/varnishd/varnishd \ -Dvmod_topsrc=$(abs_top_srcdir) \ diff --git a/tests/test00.vtc b/tests/test00.vti index f69f5ed..05084c7 100644 --- a/tests/test00.vtc +++ b/tests/test00.vti @@ -15,9 +15,11 @@ varnish v1 -vcl+backend { } sub vcl_recv { if (!tbf.rate("url:"+req.url, 1, 20 s, 5)) { - error 420 "Overlimit"; +#VARNISH3# error 420 "Overlimit"; +#VARNISH4# return (synth(420, "Overlimit")); } - return (lookup); +#VARNISH3# return (lookup); +#VARNISH4# return (hash); } } -start diff --git a/tests/test02.vtc b/tests/test02.vti index 8df6730..1b5e6b3 100644 --- a/tests/test02.vtc +++ b/tests/test02.vti @@ -15,9 +15,11 @@ varnish v1 -vcl+backend { } sub vcl_recv { if (!tbf.check("url:"+req.url, "4 req/s")) { - error 420 "Overlimit"; +#VARNISH3# error 420 "Overlimit"; +#VARNISH4# return (synth(420, "Overlimit")); } - return (lookup); +#VARNISH3# return (lookup); +#VARNISH4# return (hash); } } -start |