Commit b9e7f138 authored by Geoff Simmons's avatar Geoff Simmons

modernize autocrap based on libvmod-example

References merge request !1
parent b0cc4e9f
Pipeline #327 skipped
......@@ -26,7 +26,13 @@ Makefile.in
/missing
/stamp-h1
/m4/
/test-driver
/build-aux
/src/vcc_if.c
/src/vcc_if.h
/src/vcc*_if.c
/src/vcc*_if.h
/src/vmod_*rst
/src/tests/*.log
/src/tests/*.trs
/src/test-suite.log
ACLOCAL_AMFLAGS = -I m4 -I ${LIBVARNISHAPI_DATAROOTDIR}/aclocal
ACLOCAL_AMFLAGS = -I m4 -I ${VARNISHAPI_DATAROOTDIR}/aclocal
SUBDIRS = src
......@@ -9,11 +9,6 @@ EXTRA_DIST = README.rst LICENSE COPYING
doc_DATA = README.rst LICENSE COPYING
dist_man_MANS = vmod_re2.3
MAINTAINERCLEANFILES = $(dist_man_MANS)
vmod_re2.3: README.rst
README.rst: src/vmod_re2.man.rst
cp src/vmod_re2.man.rst README.rst
......
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([libvmod-re2], [trunk])
AC_PREREQ([2.68])
AC_INIT([libvmod-re2], [trunk], [], [vmod-re2])
AC_COPYRIGHT([Copyright 2016-2017 UPLEX - Nils Goroll Systemoptimierung])
AC_CONFIG_MACRO_DIR([m4])
m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR(src/vmod_re2.vcc)
AM_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER([config.h])
AC_CANONICAL_SYSTEM
AC_LANG(C)
AC_GNU_SOURCE
AM_INIT_AUTOMAKE([foreign])
AM_INIT_AUTOMAKE([1.12 -Wall -Werror foreign parallel-tests])
AM_SILENT_RULES([yes])
AM_PROG_AR
AC_GNU_SOURCE
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CC_STDC
if test "x$ac_cv_prog_cc_c99" = xno; then
AC_MSG_ERROR([Could not find a C99 compatible compiler])
fi
AC_PROG_CPP
AC_PROG_CXXCPP
LT_PREREQ([2.2.6])
LT_INIT([dlopen disable-static])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
AC_ARG_WITH([rst2man],
AS_HELP_STRING(
[--with-rst2man=PATH],
[Location of rst2man (auto)]),
[RST2MAN="$withval"],
AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], []))
m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
PKG_CHECK_MODULES([RE2], [re2])
VARNISH_PREREQ([master])
VARNISH_VMODS([re2])
VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
AC_SUBST(VMOD_TESTS)
PKG_CHECK_VAR([LIBVARNISHAPI_LIBDIR], [varnishapi], [libdir])
AC_SUBST([VARNISH_LIBRARY_PATH],
[$LIBVARNISHAPI_LIBDIR:$LIBVARNISHAPI_LIBDIR/varnish])
AC_CONFIG_FILES([
Makefile
src/Makefile
])
# Check for rst utilities
AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
if test "x$RST2MAN" = "xno"; then
AC_MSG_WARN([rst2man not found - not building man pages])
fi
AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_CXXCPP
# Checks for C sources
AC_CHECK_FUNCS([strdup])
......@@ -49,42 +62,6 @@ AC_TYPE_SIZE_T
AC_FUNC_ERROR_AT_LINE
AC_CHECK_HEADER_STDBOOL
# backwards compat with older pkg-config
# - pull in AC_DEFUN from pkg.m4
m4_ifndef([PKG_CHECK_VAR], [
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# -------------------------------------------
# Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR
])
PKG_CHECK_MODULES([libvarnishapi], [varnishapi])
PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir])
PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir])
PKG_CHECK_VAR([LIBVARNISHAPI_SBINDIR], [varnishapi], [sbindir])
AC_SUBST([LIBVARNISHAPI_DATAROOTDIR])
# Varnish include files tree
VARNISH_VMOD_INCLUDES
VARNISH_VMOD_DIR
VARNISH_VMODTOOL
AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
[$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
AC_PATH_PROG([VARNISHD], [varnishd], [],
[$LIBVARNISHAPI_SBINDIR:$LIBVARNISHAPI_BINDIR:$PATH])
PKG_CHECK_MODULES([RE2], [re2])
# --enable-stack-protector
AC_ARG_ENABLE(stack-protector,
AS_HELP_STRING([--enable-stack-protector],[enable stack protector (default is YES)]),
......@@ -130,8 +107,4 @@ if test "x$enable_debugging" != "xno"; then
AC_LANG_POP()
fi
AC_CONFIG_FILES([
Makefile
src/Makefile
])
AC_OUTPUT
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = @VMOD_INCLUDES@ -Wall -Werror -Wextra
CFLAGS += -std=c99
AM_CFLAGS = $(VARNISHAPI_CFLAGS) -Wall -Werror -Wextra -std=c99
AM_LDFLAGS = $(VARNISHAPI_LIBS) $(VMOD_LDFLAGS)
AM_CXXFLAGS = -Wall -Werror -Wextra -std=c++11 @RE2_CFLAGS@
vmoddir = @VMOD_DIR@
vmod_LTLIBRARIES = libvmod_re2.la
libvmod_re2_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
libvmod_re2_la_SOURCES = \
vmod_re2.c \
vre2/vre2.h \
......@@ -20,27 +17,32 @@ nodist_libvmod_re2_la_SOURCES = \
vcc_if.c \
vcc_if.h
dist_man_MANS = vmod_re2.3
libvmod_re2_la_LIBADD = @RE2_LIBS@
vmod_re2.lo: vcc_if.c vcc_if.h
vcc_if.c: vcc_if.h
vmod_re2.lo: $(nodist_libvmod_re2_la_SOURCES)
vre2/vre2.cpp: vre2/vre2.h
vcc_if.h vmod_re2.rst vmod_re2.man.rst vcc_if.c: vmod_re2.vcc
$(AM_V_VMODTOOL) $(PYTHON) $(VMODTOOL) -o vcc_if $(srcdir)/vmod_re2.vcc
vre2/vre2set.cpp: vre2/vre2set.h
vmod_re2.3: vmod_re2.man.rst
$(AM_V_GEN) $(RST2MAN) vmod_re2.man.rst vmod_re2.3
vcc_if.h vmod_re2.man.rst: @VMODTOOL@ $(top_srcdir)/src/vmod_re2.vcc
@VMODTOOL@ $(top_srcdir)/src/vmod_re2.vcc
vre2/vre2.cpp: vre2/vre2.h
VMOD_TESTS = $(top_srcdir)/src/tests/*.vtc
.PHONY: $(VMOD_TESTS)
vre2/vre2set.cpp: vre2/vre2set.h
$(top_srcdir)/src/tests/*.vtc: libvmod_re2.la
PATH=@LIBVARNISHAPI_SBINDIR@:$$PATH \
@VARNISHTEST@ -Dvmod_topbuild=$(abs_top_builddir) $@
AM_TESTS_ENVIRONMENT = \
PATH="$(VMOD_TEST_PATH)" \
LD_LIBRARY_PATH="$(VARNISH_LIBRARY_PATH)"
TEST_EXTENSIONS = .vtc
VTC_LOG_COMPILER = varnishtest -v
AM_VTC_LOG_FLAGS = -Dvmod_re2="$(VMOD_RE2)"
check: $(VMOD_TESTS)
TESTS = @VMOD_TESTS@
EXTRA_DIST = \
vmod_re2.vcc \
......@@ -50,4 +52,5 @@ CLEANFILES = \
$(builddir)/vcc_if.c \
$(builddir)/vcc_if.h \
$(builddir)/vmod_re2.rst \
$(builddir)/vmod_re2.man.rst
$(builddir)/vmod_re2.man.rst \
$(builddir)/vmod_re2.3
......@@ -5,7 +5,7 @@ varnishtest "vcl.use and .discard, and version string"
server s1 {} -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
} -start
varnish v1 -vcl+backend {}
......@@ -22,7 +22,7 @@ varnish v1 -cli "vcl.discard vcl1"
varnish v1 -cli "vcl.list"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......
......@@ -9,7 +9,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_init {
new barbaz = re2.regex("(bar)(baz)");
......
......@@ -9,7 +9,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_init {
new frobnitz = re2.regex("(frob)(nitz)");
......@@ -136,7 +136,7 @@ server s1 -wait
server s1 -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_init {
new frobnitz = re2.regex("(?P<frob>frob)(?P<nitz>nitz)");
......@@ -243,7 +243,7 @@ server s1 -wait
server s1 -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_recv {
return(pass);
......@@ -315,7 +315,7 @@ server s1 -wait
server s1 -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_recv {
return(pass);
......
......@@ -3,7 +3,7 @@
varnishtest "backref limits"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -117,7 +117,7 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
} -run
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......
......@@ -5,7 +5,7 @@ varnishtest "cached compiled regexen"
# run two clients, to test caching of compiled regexen
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......
This diff is collapsed.
......@@ -7,7 +7,7 @@ varnishtest "latin1 and utf8 encoding"
# regex object and match function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -124,7 +124,7 @@ client c1 {
# set object
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -194,7 +194,7 @@ client c1 {
# sub() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -241,7 +241,7 @@ client c1 {
# suball() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -288,7 +288,7 @@ client c1 {
# extract() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......
......@@ -3,7 +3,7 @@
varnishtest "extract() method and function"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend be { .host = "${bad_ip}"; }
sub vcl_init {
......
......@@ -9,7 +9,7 @@ server s1 {
# cf. varnish b00028.vtc
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_init {
new bar = re2.regex("bar");
......@@ -71,7 +71,7 @@ client c1 {
} -run
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......
......@@ -5,7 +5,7 @@ varnishtest "max_mem option"
# regex object
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -31,7 +31,7 @@ client c1 {
} -run
varnish v1 -errvcl {vmod re2 error: Cannot compile '.{1000}x' in rep constructor: pattern too large - compile failed} {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -42,7 +42,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '.{1000}x' in rep constructor
# match() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -75,7 +75,7 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
# set object
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -103,7 +103,7 @@ client c1 {
} -run
varnish v1 -errvcl {vmod re2 error: rep.compile(): failed, possibly insufficient memory} {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -116,7 +116,7 @@ varnish v1 -errvcl {vmod re2 error: rep.compile(): failed, possibly insufficient
# sub() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -149,7 +149,7 @@ logexpect l2 -wait
# suball() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -182,7 +182,7 @@ logexpect l3 -wait
# extract() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......
......@@ -3,7 +3,7 @@
varnishtest "namedref()"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......
......@@ -8,7 +8,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_init {
new barbaz = re2.regex("(?:bar)(baz)");
......
......@@ -7,7 +7,7 @@ varnishtest "options: literal never_nl dot_nl case_sensitive one_line longest_ma
# regex object
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -125,7 +125,7 @@ client c1 {
# match() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -208,7 +208,7 @@ client c1 -run
# set object
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -344,7 +344,7 @@ client c2 {
# sub() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -435,7 +435,7 @@ client c2 {
# suball() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -523,7 +523,7 @@ client c3 {
# extract() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......
......@@ -8,7 +8,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_init {
new longregex = re2.regex("^(abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij)");
......
......@@ -8,7 +8,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
sub vcl_init {
new end = re2.regex("$");
......
......@@ -5,7 +5,7 @@ varnishtest "set objects"
# tests from re2 re2/testing/set_test.cc
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -148,7 +148,7 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
} -run
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -243,7 +243,7 @@ client c1 {
} -run
varnish v1 -errvcl {vmod re2 error: unanchored.add("("): Cannot compile '(': missing ): (} {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -256,7 +256,7 @@ varnish v1 -errvcl {vmod re2 error: unanchored.add("("): Cannot compile '(': mis
}
varnish v1 -errvcl {vmod re2 error: anchored.add("("): Cannot compile '(': missing ): (} {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -269,7 +269,7 @@ varnish v1 -errvcl {vmod re2 error: anchored.add("("): Cannot compile '(': missi
}
varnish v1 -errvcl {vmod re2 error: empty.compile(): no patterns were added} {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......
......@@ -5,7 +5,7 @@ varnishtest "legal usage of the set object interface"
varnish v1 -vcl { backend b { .host = "${bad_ip}"; } } -start
varnish v1 -errvcl {vmod re2 error: s.add("bar"): s has already been compiled} {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -17,7 +17,7 @@ varnish v1 -errvcl {vmod re2 error: s.add("bar"): s has already been compiled} {
}
varnish v1 -errvcl {vmod re2 error: s.compile(): s has already been compiled} {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -29,7 +29,7 @@ varnish v1 -errvcl {vmod re2 error: s.compile(): s has already been compiled} {
}
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -63,7 +63,7 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
# Safe to call .match() in vcl_init
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -96,7 +96,7 @@ client c1 {
} -run
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......
......@@ -3,7 +3,7 @@
varnishtest "sub() method and function"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend be { .host = "${bad_ip}"; }
sub vcl_init {
......
......@@ -3,7 +3,7 @@
varnishtest "suball() method and function"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend be { .host = "${bad_ip}"; }
sub vcl_init {
......
......@@ -3,7 +3,7 @@
varnishtest "backrefs not affected by standard VCL regex code"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -65,7 +65,7 @@ client c1 {
# match() function
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
......@@ -109,7 +109,7 @@ client c1 -run
# sub() method
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -167,7 +167,7 @@ client c2 {
# suball() method
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......@@ -217,7 +217,7 @@ client c2 -run
# extract() method
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
import ${vmod_re2};
backend b { .host = "${bad_ip}"; }
sub vcl_init {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment