auth: fix regression tests for --with-dynmodules

Signed-off-by: Kees Monshouwer <mind04@monshouwer.org>

diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index cd6ab907ad3745231b3146267b77b1880a5bf2c5..80a7ad1a1778b5d973602c8a465f9534742a0895 100644 (file)
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -2,7 +2,7 @@ case $context in
     bind)
         backend=bind
         cat > pdns-bind.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=bind
 bind-config=./named.conf
 bind-ignore-broken-records=yes
@@ -20,7 +20,7 @@ __EOF__
         rm -f dnssec.sqlite3
         backend=bind
         cat > pdns-bind.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=bind
 bind-config=./named.conf
 bind-ignore-broken-records=yes

diff --git a/regression-tests/backends/bind-slave b/regression-tests/backends/bind-slave
index ba10778a8e8f651b787872d557b081e9039e8a05..427a5121e6a0f20502ecdc0d25a09ee036816f8f 100644 (file)
--- a/regression-tests/backends/bind-slave
+++ b/regression-tests/backends/bind-slave
@@ -37,6 +37,6 @@
                --retrieval-threads=1  --config-name=bind-slave \
                --dnsupdate=yes \
                --cache-ttl=$cachettl --no-config --dname-processing --bind-dnssec-db=./dnssec-slave.sqlite3 \
-               --module-dir=./modules &
+               --module-dir="$PDNS_MODULE_PATH" &
        echo 'waiting for zones to be loaded'
        bindwait bind-slave

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index 93f8acecaa717daa39b90634a00edfe0f3d27494..68147922451be5d58c838eb5619295f7fa76fa74 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -118,7 +118,7 @@ EOF
                # generate pdns.conf for pdnsutil
                backend=geoip
                cat > pdns-geoip.conf <<EOF
-module-dir=./modules
+module-dir=$PDNS_MODULE_PATH
 launch=geoip
 geoip-zones-file=$testsdir/geo.yaml
 geoip-database-files=$geoipdatabase
@@ -138,7 +138,7 @@ EOF
                        --cache-ttl=$cachettl --dname-processing --no-config \
                        --distributor-threads=1 \
                         --geoip-zones-file=$testsdir/geo.yaml --geoip-database-files="$geoipdatabase" \
-                        --module-dir="$PDNS_BUILD_PATH/modules" --edns-subnet-processing=yes \
+                        --edns-subnet-processing=yes \
                        $geoipkeydir &
                ;;
 

diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master
index 1721e7faf1ef8a007d82e23f2e170f76e64732a5..dcafb9cab5b4cd108b54ce90025839f2d132217f 100644 (file)
--- a/regression-tests/backends/gmysql-master
+++ b/regression-tests/backends/gmysql-master
@@ -17,7 +17,7 @@ case $context in
                        "$GMYSQLDB"
 
                cat > pdns-gmysql.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=gmysql
 gmysql-dbname=$GMYSQLDB
 gmysql-user=$GMYSQLUSER

diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave
index 9f652f517b8e0b6e89c1f91d22f6eeb56601507b..c793b514507a4e09f65b6e0665154a0e4e7ae425 100644 (file)
--- a/regression-tests/backends/gmysql-slave
+++ b/regression-tests/backends/gmysql-slave
@@ -13,7 +13,7 @@
 
        backend=gmysql2
        cat > pdns-gmysql2.conf << __EOF__
-module-dir=./modules
+module-dir=$PDNS_MODULE_PATH
 launch=gmysql
 gmysql-dbname=$GMYSQL2DB
 gmysql-user=$GMYSQL2USER

diff --git a/regression-tests/backends/godbc_mssql-master b/regression-tests/backends/godbc_mssql-master
index 739fad50c169edbb3bf7b4e36b91ce8d8050e9cd..a9a0d1ee44f3a33aa9d815b24adbdf33bdfe8cff 100644 (file)
--- a/regression-tests/backends/godbc_mssql-master
+++ b/regression-tests/backends/godbc_mssql-master
@@ -17,7 +17,7 @@ case $context in
                # actually terminates
                tosql gsqlite | grep -v -E '(COMMIT|TRANSACTION)' | awk '1;!(NR%98){print "go"}' | cat - <(echo go) /dev/null | $BSQLODBC
                cat > pdns-godbc_mssql.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=godbc
 godbc-datasource=$GODBC_MSSQL_DSN
 godbc-username=$GODBC_MSSQL_USERNAME

diff --git a/regression-tests/backends/godbc_mssql-slave b/regression-tests/backends/godbc_mssql-slave
index 4f57e95084942fd2e491ff2b97c7e26003ad89e4..1bd6ace972673cf2d81a0e955789b32d487af725 100644 (file)
--- a/regression-tests/backends/godbc_mssql-slave
+++ b/regression-tests/backends/godbc_mssql-slave
@@ -7,7 +7,7 @@
        $ISQL < ../modules/godbcbackend/schema.mssql.sql
        backend=godbc2
        cat > pdns-godbc2.conf << __EOF__
-module-dir=./modules
+module-dir=$PDNS_MODULE_PATH
 launch=godbc
 godbc-datasource=$GODBC_MSSQL2_DSN
 godbc-username=$GODBC_MSSQL2_USERNAME

diff --git a/regression-tests/backends/godbc_sqlite3-master b/regression-tests/backends/godbc_sqlite3-master
index 1f609b36edb1989d3fe78af344b183b652e51f67..7dafec7a7b9de07500cd0d57001668cf6b27be01 100644 (file)
--- a/regression-tests/backends/godbc_sqlite3-master
+++ b/regression-tests/backends/godbc_sqlite3-master
@@ -7,12 +7,12 @@ case $context in
                echo 'ANALYZE; PRAGMA journal_mode=WAL;' | sqlite3 pdns.sqlite3
 
                cat > pdns-godbc_sqlite3.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=godbc
 godbc-datasource=$GODBC_SQLITE3_DSN
 
 __EOF__
-               ${PDNSSERVER:-../pdns/pdns_server} --module-dir=./modules/ --launch=gsqlite3 --config | grep query= | perl -pe 's/^# gsqlite3/godbc/; s/:\w+/?/g' >> pdns-godbc_sqlite3.conf
+               ${PDNSSERVER:-../pdns/pdns_server} --launch=gsqlite3 --config | grep query= | perl -pe 's/^# gsqlite3/godbc/; s/:\w+/?/g' >> pdns-godbc_sqlite3.conf
 
                gsql_master godbc_sqlite3 nodyndns
                ;;

diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master
index 9741599c211daef34071ab58ed7a2e6a2f36405d..52784b7a856f455084279570d4f162ecdeb93b10 100644 (file)
--- a/regression-tests/backends/gpgsql-master
+++ b/regression-tests/backends/gpgsql-master
@@ -12,7 +12,7 @@ case $context in
                 psql --user="$GPGSQLUSER" -c "ANALYZE" "$GPGSQLDB"
 
                cat > pdns-gpgsql.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=gpgsql
 gpgsql-dbname=$GPGSQLDB
 gpgsql-user=$GPGSQLUSER

diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index 96da67174eeeb541fa593758f55992ccbdd2e7f9..71c4fce64698f7a96fccbe5519843d9a94a106ad 100644 (file)
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -8,7 +8,7 @@
 
        backend=gpgsql2
        cat > pdns-gpgsql2.conf << __EOF__
-module-dir=./modules
+module-dir=$PDNS_MODULE_PATH
 launch=gpgsql
 gpgsql-dbname=$GPGSQL2DB
 gpgsql-user=$GPGSQL2USER

diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master
index 4f3b532e130ac2b92fc1b8bf697d1d7e68f1be79..57ce50d09903a950777e3518e66cf54091a3720f 100644 (file)
--- a/regression-tests/backends/gsqlite3-master
+++ b/regression-tests/backends/gsqlite3-master
@@ -8,7 +8,7 @@ case $context in
                echo ANALYZE\; | sqlite3 pdns.sqlite3
 
                cat > pdns-gsqlite3.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=gsqlite3
 gsqlite3-database=pdns.sqlite3
 consistent-backends

diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave
index 5b094a54c1e0507fe601368678f9c355de240ac5..05f73d906a11b0602c443e498202d81111f70638 100644 (file)
--- a/regression-tests/backends/gsqlite3-slave
+++ b/regression-tests/backends/gsqlite3-slave
@@ -4,7 +4,7 @@
 
        backend=gsqlite32
        cat > pdns-gsqlite32.conf << __EOF__
-module-dir=./modules
+module-dir=$PDNS_MODULE_PATH
 launch=gsqlite3
 gsqlite3-database=pdns.sqlite32
 gsqlite3-pragma-synchronous=0

diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index f96e5843c0775fbd37f0879a8fcea2a319d59fbd..a50ac11349b79b48d7be62ae2b91e3924ffc883f 100644 (file)
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -18,7 +18,7 @@ __EOF__
 
                backend=ldap
                cat > pdns-ldap.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=ldap
 ldap-basedn=$LDAPBASEDN
 ldap-binddn=$LDAPUSER

diff --git a/regression-tests/backends/lmdb-master b/regression-tests/backends/lmdb-master
index 98197c50f0a2ee219afdd7382e22f36ba22b9100..9943d841b99f69cba196f32a47c69ba61f894023 100644 (file)
--- a/regression-tests/backends/lmdb-master
+++ b/regression-tests/backends/lmdb-master
@@ -12,7 +12,7 @@ case $_context in
     lmdb | lmdb-nodnssec | lmdb-nsec3 | lmdb-nsec3-optout | lmdb-nsec3-narrow)
         backend=lmdb
         cat > pdns-lmdb.conf << __EOF__
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=lmdb
 lmdb-filename=./pdns.lmdb
 lmdb-random-ids=yes

diff --git a/regression-tests/backends/lmdb-slave b/regression-tests/backends/lmdb-slave
index fb1e0d5a70a0e020286b4d03e45a1ac6e010d7bf..03d9ac52f61762518528bf138c5436194f63160e 100644 (file)
--- a/regression-tests/backends/lmdb-slave
+++ b/regression-tests/backends/lmdb-slave
@@ -1,7 +1,7 @@
         context=${context}-presigned-lmdb
         backend=lmdb2
         cat > pdns-lmdb2.conf << __EOF__
-module-dir=./modules
+module-dir=$PDNS_MODULE_PATH
 launch=lmdb
 lmdb-filename=./pdns2.lmdb
 __EOF__

diff --git a/regression-tests/backends/lua2-master b/regression-tests/backends/lua2-master
index b6d805bea748731104afa6281302667908521b28..972c7e0b9a46483265b04de94245a0fc72c0828f 100644 (file)
--- a/regression-tests/backends/lua2-master
+++ b/regression-tests/backends/lua2-master
@@ -24,7 +24,7 @@ case $context in
                # generate pdns.conf for pdnsutil
                backend=lua2
                cat > pdns-lua2.conf <<EOF
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=lua2
 lua2-filename=$testsdir/$luascript
 lua2-api=2
@@ -36,7 +36,7 @@ EOF
                        --cache-ttl=$cachettl --dname-processing --no-config \
                        --distributor-threads=1 --zone-cache-refresh-interval=$interval \
                        --allow-axfr-ips=0.0.0.0/0,::/0 \
-                       --lua2-filename=$testsdir/$luascript --lua2-api=2 --module-dir=./modules &
+                       --lua2-filename=$testsdir/$luascript --lua2-api=2 &
                ;;
 
        *)

diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 7982697e87eb36f202268d7903f97feaf646263c..a011c17eab79e301e0eac4ecb41fb01f716fa283 100644 (file)
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -90,7 +90,7 @@ case $context in
                # generate pdns.conf for pdnsutil
                backend=remote
                cat > pdns-remote.conf <<EOF
-module-dir=$PDNS_BUILD_PATH/modules
+module-dir=$PDNS_MODULE_PATH
 launch=remote
 remote-connection-string=$connstr,timeout=10000
 EOF
@@ -123,7 +123,7 @@ EOF
                        --cache-ttl=$cachettl --dname-processing --no-config \
                        --distributor-threads=1 \
                        --dnsupdate=yes --zone-cache-refresh-interval=0 \
-                       --remote-connection-string="$connstr" $remote_add_param --module-dir="$PDNS_BUILD_PATH/modules" &
+                       --remote-connection-string="$connstr" $remote_add_param &
                ;;
 
        *)

diff --git a/regression-tests/backends/tinydns-master b/regression-tests/backends/tinydns-master
index dd35a3dce55fb6c24a6a425025d967b2ddc528ad..bf6c988eaf416c22db2c82c213b1876a43cf209f 100644 (file)
--- a/regression-tests/backends/tinydns-master
+++ b/regression-tests/backends/tinydns-master
@@ -4,7 +4,7 @@ case $context in
                        --no-shuffle --launch=tinydns \
                 --cache-ttl=$cachettl --dname-processing --no-config \
                        --dnsupdate=yes \
-                       --tinydns-dbfile=../modules/tinydnsbackend/data.cdb --module-dir="$PDNS_BUILD_PATH/modules" &
+                       --tinydns-dbfile=../modules/tinydnsbackend/data.cdb --module-dir="$PDNS_MODULE_PATH" &
                skipreasons="nodnssec noent nodyndns nometa noaxfr noalias"
                ;;
 

diff --git a/regression-tests/runtests b/regression-tests/runtests
index 2ae5492048269bd29246fe38673dcd801732dc45..f36ce6eb79bbc69e48b106d9980c5f5242d67b7a 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -10,6 +10,9 @@ MAKE=${MAKE:-make}
 if [ -z "$PDNS_BUILD_PATH" ]; then
   # PDNS_BUILD_PATH is unset or empty. Assume an autotools build.
   PDNS_BUILD_PATH=${PWD}/../pdns
+  PDNS_MODULE_PATH=${PDNS_MODULE_PATH:-$PWD/modules}
+else
+  PDNS_MODULE_PATH=${PDNS_MODULE_PATH:-$PDNS_BUILD_PATH/modules}
 fi
 
 export PDNS=${PDNS:-$PDNS_BUILD_PATH/pdns_server}

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 71aeab7a02740b8dc36b54d53036ddb7fd56660c..e8d05d61d58f20609940d817342a4a7acb595d51 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -7,6 +7,9 @@ fi
 if [ -z "$PDNS_BUILD_PATH" ]; then
   # PDNS_BUILD_PATH is unset or empty. Assume an autotools build.
   PDNS_BUILD_PATH=${PWD}/../pdns
+  PDNS_MODULE_PATH=${PDNS_MODULE_PATH:-$PWD/modules}
+else
+  PDNS_MODULE_PATH=${PDNS_MODULE_PATH:-$PDNS_BUILD_PATH/modules}
 fi
 
 export PDNS=${PDNS:-$PDNS_BUILD_PATH/pdns_server}