1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,9 @@ nodist_libvmod_geoip2_la_SOURCES = \
dist_man_MANS = vmod_geoip2.3
VTC_LOG_COMPILER = $(VARNISHTEST) -v \
- -Dvmod_topbuild=$(abs_top_builddir) -Dvmod_topsrc=$(abs_top_srcdir)
+ -Dvmod_topsrc=$(abs_top_srcdir) \
+ -p vcl_path="$(abs_top_srcdir)/vcl:$(VARNISHAPI_VCLDIR)" \
+ -p vmod_path="$(abs_builddir)/.libs:$(vmoddir):$(VARNISHAPI_VMODDIR)"
TEST_EXTENSIONS = .vtc
TESTS = @VMOD_TESTS@
--- a/src/tests/b00000.vtc
+++ b/src/tests/b00000.vtc
@@ -8,7 +8,7 @@ server s1 {
shell "cp ${vmod_topsrc}/src/tests/libvmod-geoip2.mmdb ${tmpdir}"
varnish v1 -vcl+backend {
- import geoip2 from "${vmod_topbuild}/src/.libs/libvmod_geoip2.so";
+ import geoip2;
import std;
sub vcl_init {
--- a/src/tests/b00001.vtc
+++ b/src/tests/b00001.vtc
@@ -8,7 +8,7 @@ server s1 {
shell "cp ${vmod_topsrc}/src/tests/libvmod-geoip2.mmdb ${tmpdir}"
varnish v1 -vcl+backend {
- import geoip2 from "${vmod_topbuild}/src/.libs/libvmod_geoip2.so";
+ import geoip2;
import std;
sub vcl_init {
--- a/src/tests/b00002.vtc
+++ b/src/tests/b00002.vtc
@@ -10,7 +10,7 @@ shell "cp ${vmod_topsrc}/src/tests/libvm
varnish v1 -arg "-p thread_pools=1" -vcl+backend { } -start
varnish v1 -errvcl "Error opening the specified MaxMind DB file" {
- import geoip2 from "${vmod_topbuild}/src/.libs/libvmod_geoip2.so";
+ import geoip2;
backend default {
.host = "127.0.0.1";
}
@@ -21,7 +21,7 @@ varnish v1 -errvcl "Error opening the sp
}
varnish v1 -vcl+backend {
- import geoip2 from "${vmod_topbuild}/src/.libs/libvmod_geoip2.so";
+ import geoip2;
import std;
sub vcl_init {
--- a/src/tests/b00003.vtc
+++ b/src/tests/b00003.vtc
@@ -8,7 +8,7 @@ server s1 {
shell "cp ${vmod_topsrc}/src/tests/libvmod-geoip2.mmdb ${tmpdir}"
varnish v1 -vcl+backend {
- import geoip2 from "${vmod_topbuild}/src/.libs/libvmod_geoip2.so";
+ import geoip2;
import vtc;
sub vcl_init {
--- a/src/tests/b00004.vtc
+++ b/src/tests/b00004.vtc
@@ -8,7 +8,7 @@ server s1 {
shell "cp ${vmod_topsrc}/src/tests/libvmod-geoip2.mmdb ${tmpdir}"
varnish v1 -vcl+backend {
- import geoip2 from "${vmod_topbuild}/src/.libs/libvmod_geoip2.so";
+ import geoip2;
import std;
sub vcl_init {
--- a/src/tests/b00005.vtc
+++ b/src/tests/b00005.vtc
@@ -8,7 +8,7 @@ server s1 {
shell "cp ${vmod_topsrc}/src/tests/libvmod-geoip2.mmdb ${tmpdir}"
varnish v1 -vcl+backend {
- import geoip2 from "${vmod_topbuild}/src/.libs/libvmod_geoip2.so";
+ import geoip2;
import std;
import vtc;
|
