]> granicus.if.org Git - pdns/commitdiff
make regression-tests more robust against configuration race condition in bindbackend
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 5 Mar 2012 07:42:55 +0000 (07:42 +0000)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 5 Mar 2012 07:42:55 +0000 (07:42 +0000)
git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2466 d19b8d6e-7fed-0310-83ef-9ca221ded41b

regression-tests/start-test-stop

index 1846cc20f2e591cc8e924dcb3f867aeb4f667a7d..5b4e1beef049ef7192522648dfba588a2aa00265 100755 (executable)
@@ -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