modernize autocrap based on libvmod-example

References merge request !1

.gitignore

@@ -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

Makefile.am

-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
 

configure.ac

-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

src/Makefile.am

 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

src/tests/00basic.vtc

@@ -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 {

src/tests/backref_basic.vtc

@@ -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)");

src/tests/backref_fail.vtc

@@ -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);

src/tests/backref_limit.vtc

@@ -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 {

src/tests/cached.vtc

@@ -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 {

src/tests/compile_fail.vtc

@@ -7,7 +7,7 @@ varnish v1 -vcl { backend b { .host="${bad_ip}"; } } -start
 # regex object
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(' in bad constructor: missing ): (} {
-	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: Cannot compile '(' in bad constructor: missi
 
 # From re2_test.cc, 'Rejects'
 varnish v1 -errvcl {vmod re2 error: Cannot compile 'a\1' in bad constructor: invalid escape sequence: \1} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -26,7 +26,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile 'a\1' in bad constructor: inv
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile 'a[x' in bad constructor: missing ]: [x} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -35,7 +35,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile 'a[x' in bad constructor: mis
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile 'a[z-a]' in bad constructor: invalid character class range: z-a} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -44,7 +44,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile 'a[z-a]' in bad constructor:
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile 'a[[:foobar:]]' in bad constructor: invalid character class range: [:foobar:]} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -53,7 +53,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile 'a[[:foobar:]]' in bad constr
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile 'a(b' in bad constructor: missing ): a(b} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -62,7 +62,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile 'a(b' in bad constructor: mis
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile 'a\' in bad constructor: trailing \} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -73,7 +73,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile 'a\' in bad constructor: trai
 # Tests from re2 testing/parse_test.cc, first regexen that are valid in
 # Perl syntax but not in POSIX.
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -82,7 +82,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '[a-b-c]' in bad constructor: invalid character class range: -c} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -91,7 +91,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '[a-b-c]' in bad constructor:
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -100,7 +100,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '\Qabc\E' in bad constructor: invalid escape sequence: \Q} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -109,7 +109,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '\Qabc\E' in bad constructor:
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -118,7 +118,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(?:a)' in bad constructor: no argument for repetition operator: ?} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -127,7 +127,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '(?:a)' in bad constructor: n
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -136,7 +136,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(?P<name>a)' in bad constructor: no argument for repetition operator: ?} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -146,7 +146,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '(?P<name>a)' in bad construc
 
 # Now regex that are valid in POSIX syntax but not in Perl.
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -155,7 +155,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(a++)' in bad constructor: bad repetition operator: ++} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -164,7 +164,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '(a++)' in bad constructor: b
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -173,7 +173,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(a**)' in bad constructor: bad repetition operator: **} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -182,7 +182,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '(a**)' in bad constructor: b
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -191,7 +191,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(a?*)' in bad constructor: bad repetition operator: ?*} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -200,7 +200,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '(a?*)' in bad constructor: b
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -209,7 +209,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(a+*)' in bad constructor: bad repetition operator: +*} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -218,7 +218,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '(a+*)' in bad constructor: b
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -227,7 +227,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '(a{1}*)' in bad constructor: bad repetition operator: {1}*} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -239,7 +239,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '(a{1}*)' in bad constructor:
 # word_boundary
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '\d \s \w \D \S \W' in bad constructor: invalid escape sequence: \d} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -248,7 +248,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '\d \s \w \D \S \W' in bad co
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -258,7 +258,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: Cannot compile '\b \B' in bad constructor: invalid escape sequence: \b} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -267,7 +267,7 @@ varnish v1 -errvcl {vmod re2 error: Cannot compile '\b \B' in bad constructor: i
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -279,7 +279,7 @@ varnish v1 -vcl {
 # set object
 
 varnish v1 -errvcl {vmod re2 error: bad.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 {
@@ -289,7 +289,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("("): Cannot compile '(': missing ):
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("a\1"): Cannot compile 'a\1': invalid escape sequence: \1} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -299,7 +299,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("a\1"): Cannot compile 'a\1': invali
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("a[x"): Cannot compile 'a[x': missing ]: [x} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -309,7 +309,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("a[x"): Cannot compile 'a[x': missin
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("a[z-a]"): Cannot compile 'a[z-a]': invalid character class range: z-a} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -319,7 +319,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("a[z-a]"): Cannot compile 'a[z-a]':
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("a[[:foobar:]]"): Cannot compile 'a[[:foobar:]]': invalid character class range: [:foobar:]} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -329,7 +329,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("a[[:foobar:]]"): Cannot compile 'a[
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("a(b"): Cannot compile 'a(b': missing ): a(b} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -340,7 +340,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("a(b"): Cannot compile 'a(b': missin
 
 varnish v1 -errvcl {vmod re2 error: bad.add("a\"): Cannot compile 'a\': trailing \} {
 #"
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -350,7 +350,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("a\"): Cannot compile 'a\': trailing
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -361,7 +361,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("[a-b-c]"): Cannot compile '[a-b-c]': invalid character class range: -c} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -371,7 +371,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("[a-b-c]"): Cannot compile '[a-b-c]'
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -382,7 +382,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("\Qabc\E"): Cannot compile '\Qabc\E': invalid escape sequence: \Q} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -392,7 +392,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("\Qabc\E"): Cannot compile '\Qabc\E'
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -403,7 +403,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("(?:a)"): Cannot compile '(?:a)': no argument for repetition operator: ?} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -413,7 +413,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("(?:a)"): Cannot compile '(?:a)': no
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -424,7 +424,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("(?P<name>a)"): Cannot compile '(?P<name>a)': no argument for repetition operator: ?} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -434,7 +434,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("(?P<name>a)"): Cannot compile '(?P<
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -445,7 +445,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("(a++)"): Cannot compile '(a++)': bad repetition operator: ++} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -455,7 +455,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("(a++)"): Cannot compile '(a++)': ba
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -466,7 +466,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("(a**)"): Cannot compile '(a**)': bad repetition operator: **} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -476,7 +476,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("(a**)"): Cannot compile '(a**)': ba
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -487,7 +487,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("(a?*)"): Cannot compile '(a?*)': bad repetition operator: ?*} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -497,7 +497,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("(a?*)"): Cannot compile '(a?*)': ba
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -508,7 +508,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("(a+*)"): Cannot compile '(a+*)': bad repetition operator: +*} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -518,7 +518,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("(a+*)"): Cannot compile '(a+*)': ba
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -529,7 +529,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("(a{1}*)"): Cannot compile '(a{1}*)': bad repetition operator: {1}*} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -539,7 +539,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("(a{1}*)"): Cannot compile '(a{1}*)'
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("\d \s \w \D \S \W"): Cannot compile '\d \s \w \D \S \W': invalid escape sequence: \d} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -549,7 +549,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("\d \s \w \D \S \W"): Cannot compile
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -560,7 +560,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {vmod re2 error: bad.add("\b \B"): Cannot compile '\b \B': invalid escape sequence: \b} {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -570,7 +570,7 @@ varnish v1 -errvcl {vmod re2 error: bad.add("\b \B"): Cannot compile '\b \B': in
 }
 
 varnish v1 -vcl {
-	import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
+	import ${vmod_re2};
 	backend b { .host = "${bad_ip}"; }
 
 	sub vcl_init {
@@ -583,7 +583,7 @@ varnish v1 -vcl {
 # 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 {
@@ -745,7 +745,7 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
 # 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 {
@@ -869,7 +869,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 {
@@ -1009,7 +1009,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 {

src/tests/encoding.vtc

@@ -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 {

src/tests/extract.vtc

@@ -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 {

src/tests/match.vtc

@@ -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 {

src/tests/max_mem.vtc

@@ -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 {

src/tests/namedref.vtc

@@ -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 {

src/tests/non_capture_paren.vtc

@@ -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)");

src/tests/options.vtc

@@ -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 {

src/tests/r00896.vtc

@@ -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)");

src/tests/r00913.vtc

@@ -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("$");

src/tests/set.vtc

@@ -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 {

src/tests/set_usage.vtc

@@ -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 {

src/tests/sub.vtc

@@ -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 {

src/tests/suball.vtc

@@ -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 {

src/tests/vcl_regex.vtc

@@ -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 {