Merge pull request #5583 from tcely/issue-2835

listen on 127.0.0.1 during regression tests

diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index 7a0088776cd0076cca16cedf61fdcf9ae32a161f..f051d0d1e3c78d5788d4e1659e981c15b00b53b8 100644 (file)
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -7,7 +7,7 @@ bind-config=./named.conf
 bind-ignore-broken-records=yes
 __EOF__
 
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
                        --config-name=bind --socket-dir=./ --no-shuffle \
                        --cache-ttl=$cachettl --dname-processing \
                        --disable-axfr-rectify=yes &
@@ -88,7 +88,7 @@ __EOF__
                        skipreasons="nodyndns noalias nsec"
                fi
 
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
                        --config-name=bind --socket-dir=./ --no-shuffle \
                        --cache-ttl=$cachettl --dname-processing \
                        --disable-axfr-rectify=yes $lua_prequery &

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index 72ea6416ae22aa8bcbc31060ae02ca307a181fd0..a5eeffe65f42cc620d9ca27df4222ee5bd8148df 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -85,7 +85,7 @@ EOF
 
                base64 -d < $testsdir/GeoLiteCity.dat.b64 > $testsdir/GeoLiteCity.dat
 
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
                        --no-shuffle --launch=geoip \
                        --cache-ttl=$cachettl --dname-processing --no-config \
                        --distributor-threads=1 \

diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index 5ccdc85e8b725a5d617e4d860793cd7dac5e6e1c..af1a10f55274e64a383550e99457a9a64bfef30c 100644 (file)
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -35,7 +35,7 @@ gsql_master()
        done
 
 
-       $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+       $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
                --config-name=$backend --socket-dir=./ --no-shuffle \
                --dnsupdate=yes --resolver=8.8.8.8 --outgoing-axfr-expand-alias=yes \
                --expand-alias=yes \

diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index a4fbc8329bdbf43bd1e04bc334253dd68d6fa904..25138b9b212d8e198222336ae2a8cc1cd0754246 100644 (file)
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -24,7 +24,7 @@ ldap-secret=$LDAPPASSWD
 ldap-method=$layout
 __EOF__
 
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
                        --config-name=ldap --socket-dir=./ --no-shuffle \
                        --query-logging \
                        --cache-ttl=$cachettl --dname-processing $lua_prequery &

diff --git a/regression-tests/backends/mydns-master b/regression-tests/backends/mydns-master
index d141a9bbd0fc34621bc264e995e06b1ded27981a..4bf6cbe659dcef0288afb509a058e3f9237c0d58 100644 (file)
--- a/regression-tests/backends/mydns-master
+++ b/regression-tests/backends/mydns-master
@@ -22,7 +22,7 @@ mydns-user=$MYDNSUSER
 mydns-host=$MYDNSHOST
 mydns-password=$MYDNSPASSWD
 __EOF__
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
                        --config-dir=. --config-name=mydns \
                        --no-shuffle --master \
                        --cache-ttl=0 --dname-processing \

diff --git a/regression-tests/backends/opendbx-master b/regression-tests/backends/opendbx-master
index 23c8dc7e3634fddf8289843b73d85f8f9f7d2256..e19dd7868df85116dc2f9c9d383003825f30ac1c 100644 (file)
--- a/regression-tests/backends/opendbx-master
+++ b/regression-tests/backends/opendbx-master
@@ -7,7 +7,7 @@ case $context in
                        ALTER TABLE domains ADD auto_serial INTEGER DEFAULT 0;"
                echo ANALYZE\; | sqlite3 pdns-opendbx.sqlite3
 
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./  \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./  \
                        --no-shuffle --launch=opendbx \
                        --cache-ttl=$cachettl --dname-processing --no-config \
                        --opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \

diff --git a/regression-tests/backends/oracle-master b/regression-tests/backends/oracle-master
index 8b77d278b7edfcba1e3a0d5e30b9435798e2c0be..141f0f37ba6960942a279b23e601833518004d08 100644 (file)
--- a/regression-tests/backends/oracle-master
+++ b/regression-tests/backends/oracle-master
@@ -46,7 +46,7 @@ __EOF__
                $PDNSUTIL --config-dir=. --config-name=oracle import-tsig-key test $ALGORITHM $KEY
                $PDNSUTIL --config-dir=. --config-name=oracle activate-tsig-key tsig.com test master
 
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
                        --config-name=oracle --socket-dir=./ --no-shuffle \
                        --query-logging \
                        --cache-ttl=$cachettl --dname-processing $lua_prequery &

diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 69a20076c4f37990b079c82b24f734fbe331786d..3aeecf9f2ed0b6da97d436b49cc2721f77dfcbdb 100644 (file)
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -109,7 +109,7 @@ EOF
                        cp -f $testsdir/list-all-records/expected_result.dnssec $testsdir/list-all-records/expected_result.nsec3
                fi
 
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
                        --no-shuffle --launch=remote \
                        --cache-ttl=$cachettl --dname-processing --no-config \
                        --distributor-threads=1 \

diff --git a/regression-tests/backends/tinydns-master b/regression-tests/backends/tinydns-master
index 0fd842b4004d2f1e35d1bc128d1b2ba5784f905f..3ebafbf74ed82dc86751e8569cdb18615fd233be 100644 (file)
--- a/regression-tests/backends/tinydns-master
+++ b/regression-tests/backends/tinydns-master
@@ -1,6 +1,6 @@
 case $context in
        tinydns)
-               $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+               $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
                        --no-shuffle --launch=tinydns \
                 --cache-ttl=$cachettl --dname-processing --no-config \
                        --dnsupdate=yes \

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 5155d56fea51d2c8c59d92bf1417d902acc1272b..a83bcf60b38d023d98357af67133efa57fc45990 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -151,6 +151,7 @@ then
        exit
 fi
 
+address="${PDNS_LISTEN_ADDR:-127.0.0.1}"
 port=$1
 [ -z "$port" ] && port=5300
 context=$2
@@ -307,6 +308,7 @@ dotests () {
 
 RETVAL=0
 
+export address
 export port
 export context
 export extracontexts