diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-04 17:38:17 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-04 17:39:46 +0300 |
commit | e2e9e4647ae1baf3de116bc52f1f73b8cf221c76 (patch) | |
tree | 4c7f88a92aed8ebe28d1e0584737bbe9ec1d2689 /tests | |
parent | 9d9f34d1ef0483fc012ea283e649d507ff410638 (diff) | |
download | vmod-variable-e2e9e4647ae1baf3de116bc52f1f73b8cf221c76.tar.gz vmod-variable-e2e9e4647ae1baf3de116bc52f1f73b8cf221c76.tar.bz2 |
Switch to new acvmod
Diffstat (limited to 'tests')
-rw-r--r-- | tests/atlocal.in | 7 | ||||
-rw-r--r-- | tests/clear.at | 4 | ||||
-rw-r--r-- | tests/complex.at | 4 | ||||
-rw-r--r-- | tests/defined.at | 4 | ||||
-rw-r--r-- | tests/duration.at | 4 | ||||
-rw-r--r-- | tests/gstring.at | 4 | ||||
-rw-r--r-- | tests/int.at | 4 | ||||
-rw-r--r-- | tests/queryset00.at | 4 | ||||
-rw-r--r-- | tests/queryset01.at | 4 | ||||
-rw-r--r-- | tests/real.at | 4 | ||||
-rw-r--r-- | tests/regset.at | 4 | ||||
-rw-r--r-- | tests/string.at | 4 | ||||
-rw-r--r-- | tests/testsuite.at | 42 | ||||
-rw-r--r-- | tests/type_of.at | 4 | ||||
-rw-r--r-- | tests/unset.at | 4 |
15 files changed, 36 insertions, 65 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in index 6cae626..f229f09 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -2,9 +2,8 @@ # Configurable variable values for vmod-variable test suite. -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH +VARNISHTEST=@VARNISHTEST@ +VARNISHD=@VARNISHD@ INITFILE=@abs_builddir@/.TESTINIT FAILFILE=@abs_builddir@/FAILURE -VARNISHTEST="@VARNISHSRC@/bin/varnishtest/varnishtest -Dvarnishd=@VARNISHSRC@/bin/varnishd/varnishd" -VARNISHVERSION=@VARNISHVERSION@ - diff --git a/tests/clear.at b/tests/clear.at index a3c602f..3705c64 100644 --- a/tests/clear.at +++ b/tests/clear.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(clear) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/complex.at b/tests/complex.at index 77a7903..16fe573 100644 --- a/tests/complex.at +++ b/tests/complex.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(complex) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/defined.at b/tests/defined.at index 36fbe7f..3d0d071 100644 --- a/tests/defined.at +++ b/tests/defined.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(defined) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/duration.at b/tests/duration.at index 5368145..0a3f1b7 100644 --- a/tests/duration.at +++ b/tests/duration.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(duration) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/gstring.at b/tests/gstring.at index 8a93dfe..bcf7beb 100644 --- a/tests/gstring.at +++ b/tests/gstring.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(global string gstring) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/int.at b/tests/int.at index 7b193cf..1a7a50b 100644 --- a/tests/int.at +++ b/tests/int.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(int) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/queryset00.at b/tests/queryset00.at index f56e19a..230f0a5 100644 --- a/tests/queryset00.at +++ b/tests/queryset00.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(queryset queryset00) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/queryset01.at b/tests/queryset01.at index 4f70ae2..3a9b7fb 100644 --- a/tests/queryset01.at +++ b/tests/queryset01.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(queryset queryset01) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/real.at b/tests/real.at index 3500480..6692991 100644 --- a/tests/real.at +++ b/tests/real.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(real) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/regset.at b/tests/regset.at index cc92578..d942ad2 100644 --- a/tests/regset.at +++ b/tests/regset.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(regset) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/string.at b/tests/string.at index 698ca4a..8d9c82e 100644 --- a/tests/string.at +++ b/tests/string.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(string) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/testsuite.at b/tests/testsuite.at index 4f39be9..6b6c14f 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,5 +1,5 @@ -# This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# This file is part of vmod_variable. +# Copyright (C) 2017 Sergey Poznyakoff # -# Vmod-variable is free software; you can redistribute it and/or modify +# Vmod_variable is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -8,3 +8,3 @@ # -# Vmod-variable is distributed in the hope that it will be useful, +# Vmod_variable is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,35 +14,7 @@ # You should have received a copy of the GNU General Public License -# along with vmod-variable. If not, see <http://www.gnu.org/licenses/>. - -m4_version_prereq([2.52g]) - -m4_define([AT_SKIP_TEST],[exit 77]) - -dnl AT_VARNISHTEST(VCL, CLT[, SRV]) -m4_define([AT_VARNISHTEST],[ -AT_CHECK([ -cat > test.vtc <<EOT -server s1 { -m4_if($3,,[dnl - rxreq - txresp],[$3]) -} -start - -varnish v1 -vcl+backend { - import std; - import variable from "$abs_top_builddir/src/.libs/libvmod_variable.so"; -$1 -} -start - -client c1 { -$2 -} -run -EOT -$VARNISHTEST test.vtc | sed 's/^#.*TEST test.vtc passed.*/OK/' -], -[0], -[OK -])]) +# along with vmod_variable. If not, see <http://www.gnu.org/licenses/>. +m4_include([../acvmod/testsuite.inc]) AT_INIT +# Include your tests here m4_include([string.at]) diff --git a/tests/type_of.at b/tests/type_of.at index 8d8b7e8..a67507e 100644 --- a/tests/type_of.at +++ b/tests/type_of.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(type_of) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { diff --git a/tests/unset.at b/tests/unset.at index 5d88e06..330b852 100644 --- a/tests/unset.at +++ b/tests/unset.at @@ -1,3 +1,3 @@ # This file is part of vmod-variable -*- autotest -*- -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2017 Sergey Poznyakoff # @@ -19,3 +19,3 @@ AT_KEYWORDS(unset) -AT_VARNISHTEST([ +AT_VARNISHTEST([variable],[ sub vcl_recv { |