recursor regression tests: have the socket live in /tmp

diff --git a/regression-tests.recursor/config.sh b/regression-tests.recursor/config.sh
index 0ef53acbcb840c2ef7c698d0fe2e05623b98b927..e4200c095f0cacc46270b5ab7166d3ab384e1a5e 100755 (executable)
--- a/regression-tests.recursor/config.sh
+++ b/regression-tests.recursor/config.sh
@@ -46,6 +46,7 @@ fi
 cd configs
 
 for dir in recursor-service recursor-service2 recursor-service3; do
+  mkdir /tmp/$dir
   mkdir $dir
   cd $dir
 
@@ -528,7 +529,7 @@ api-key=secret
 api-readonly=yes
 forward-zones-file=$(pwd)/recursor-service/forward-zones-file
 
-socket-dir=$(pwd)/recursor-service
+socket-dir=/tmp/recursor-service
 auth-zones=global.box.answer-cname-in-local.example.net=$(pwd)/recursor-service/global.box.answer-cname-in-local.example.net.zone,auth-zone.example.net=$(pwd)/recursor-service/auth-zone.example.net.zone,another-auth-zone.example.net=$(pwd)/recursor-service/another-auth-zone.example.net.zone
 loglevel=9
 
@@ -536,14 +537,14 @@ EOF
 
 cat > recursor-service2/recursor.conf <<EOF
 local-port=5300
-socket-dir=$(pwd)/recursor-service2S
+socket-dir=/tmp/recursor-service2
 lowercase-outgoing=yes
 
 EOF
 
 cat > recursor-service3/recursor.conf << EOF
 local-port=5301
-socket-dir=$(pwd)/recursor-service3S
+socket-dir=/tmp/recursor-service3
 lua-config-file=$(pwd)/recursor-service3/config.lua
 lua-dns-script=$(pwd)/recursor-service3/script.lua
 

diff --git a/regression-tests.recursor/rec_control-manpage/command b/regression-tests.recursor/rec_control-manpage/command
index bbcaa9e7707b671341f24f2c9f3f50958e02927c..5ac292c8406e32058a04d82eb716c8dacd68b0cc 100755 (executable)
--- a/regression-tests.recursor/rec_control-manpage/command
+++ b/regression-tests.recursor/rec_control-manpage/command
@@ -1,5 +1,5 @@
 #!/bin/sh
-elements="$($RECCONTROL --config-dir=./configs/recursor-service help | grep -v -e '^ ' | awk '{print $1}')"
+elements="$($RECCONTROL --config-dir=/tmp/recursor-service help | grep -v -e '^ ' | awk '{print $1}')"
 
 num_elems="$( echo $elements | wc -l)"
 

diff --git a/regression-tests.recursor/vars.sample b/regression-tests.recursor/vars.sample
index 8de2909b47e0d531c6d575e1986272088ba41de0..2d257233189d3d622b9730265e22bcd738c0ac22 100644 (file)
--- a/regression-tests.recursor/vars.sample
+++ b/regression-tests.recursor/vars.sample
@@ -2,4 +2,4 @@ PREFIX=10.0.3
 # PDNSRECURSOR=    # set to override default location
 # PDNS=            # set to override default location   
 AUTHRUN="exec authbind ${PDNS} --config-dir=. > logfile 2>&1"
-RECRUN="exec authbind ${PDNSRECURSOR} --config-dir=. --socket-dir=. --daemon=no --trace=yes --dont-query= --local-address=$PREFIX.9 --hint-file=hintfile --packetcache-ttl=0 --max-cache-ttl=15 --threads=1 > logfile 2>&1"
+RECRUN="exec authbind ${PDNSRECURSOR} --config-dir=. --daemon=no --trace=yes --dont-query= --local-address=$PREFIX.9 --hint-file=hintfile --packetcache-ttl=0 --max-cache-ttl=15 --threads=1 > logfile 2>&1"