From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 5 Mar 2012 07:42:55 +0000 (+0000)
Subject: make regression-tests more robust against configuration race condition in bindbackend
X-Git-Tag: auth-3.1-rc1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a25db03b829e14ec294e1090fe8a9c8d55843637;p=pdns

make regression-tests more robust against configuration race condition in bindbackend

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2466 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 1846cc20f..5b4e1beef 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -40,21 +40,21 @@ case $context in
 			;;
 		bind-dnssec | bind-dnssec-nsec3 )
 			./bind-dnssec-setup
+            if [ $context = bind-dnssec-nsec3 ]
+            then
+                for zone in $(grep zone named.conf  | cut -f2 -d\")
+                do
+                    ../pdns/pdnssec --config-dir=. set-nsec3 $zone '1 1 1 abcd' 2>&1
+                done
+                extracontexts="nsec3 bind"
+            else
+                extracontexts="bind"
+            fi
 			../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./  \
 				--no-shuffle --launch=bind --bind-config=./named.conf       \
 				--bind-dnssec-db=./dnssec.sqlite3 \
 				--query-logging --send-root-referral --loglevel=9    \
 				--cache-ttl=0 --no-config &
-			if [ $context = bind-dnssec-nsec3 ]
-			then
-				for zone in $(grep zone named.conf  | cut -f2 -d\")
-				do
-					../pdns/pdnssec --config-dir=. set-nsec3 $zone '1 1 1 abcd' 2>&1
-				done
-				extracontexts="nsec3 bind"
-			else
-				extracontexts="bind"
-			fi
 			;;
 		gmysql-nodnssec)
 			[ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest