Update tests

diff --git a/.travis.yml b/.travis.yml
index 2642919155404152d14392fd1b9411ed7c72cb50..0c3407ddf13dea285a13b0bcd181bc66bf0df117 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,7 +144,7 @@ script:
  - touch tests/verify-dnssec-zone/allow-missing
  - touch tests/verify-dnssec-zone/skip.nsec3 # some (travis) tools in this test are unable to handle nsec3 zones
  - touch tests/verify-dnssec-zone/skip.optout
- - export geoipregion=aus geoipregionip=1.2.3.4
+ - export geoipregion=oc geoipregionip=1.2.3.4
  - ./timestamp ./start-test-stop 5300 bind-both
  - ./timestamp ./start-test-stop 5300 bind-dnssec-both
  - ./timestamp ./start-test-stop 5300 bind-dnssec-pkcs11

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index cd8b6df824ff018bc9530eee8d1c214bb9a01f09..c59e487fab2c8f0fce89dff1e2bdea96b5ec62b4 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -60,6 +60,7 @@ EOF
 module-dir=./modules
 launch=geoip
 geoip-zones-file=$testsdir/geo.yaml
+geoip-database-files=/usr/share/GeoIP/GeoIP.dat
 EOF
 
                if [ "$geoipdosec" = "yes" ]
@@ -73,7 +74,8 @@ EOF
                        --no-shuffle --launch=geoip \
                        --cache-ttl=$cachettl --experimental-dname-processing --no-config \
                        --distributor-threads=1 \
-                        --geoip-zones-file=$testsdir/geo.yaml --module-dir=./modules \
+                        --geoip-zones-file=$testsdir/geo.yaml --geoip-database-files=/usr/share/GeoIP/GeoIP.dat \
+                        --module-dir=./modules \
                        $geoipkeydir &
                ;;