From: Peter van Dijk Date: Tue, 18 Jun 2013 09:19:06 +0000 (+0200) Subject: fix whitespace X-Git-Tag: rec-3.6.0-rc1~650 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ede4134ebd21a9184614be9b15d8b68a3d6c4ff;p=thirdparty%2Fpdns.git fix whitespace --- diff --git a/regression-tests.nobackend/edns-packet-cache/command b/regression-tests.nobackend/edns-packet-cache/command index cc3363eca4..eaba0ecb48 100755 --- a/regression-tests.nobackend/edns-packet-cache/command +++ b/regression-tests.nobackend/edns-packet-cache/command @@ -4,19 +4,19 @@ bindwait () { configname=$1 domcount=1 - loopcount=0 + loopcount=0 while [ $loopcount -lt 20 ]; do - sleep 1 + sleep 1 done=$( (../pdns/pdns_control --config-name=$configname --socket-dir=. --no-config bind-domain-status || true) | grep -c 'parsed into memory' || true ) if [ $done = $domcount ] - then + then return fi let loopcount=loopcount+1 - done - if [ $done != $domcount ]; then - echo "Domain parsing failed" >> failed_tests - fi + done + if [ $done != $domcount ]; then + echo "Domain parsing failed" >> failed_tests + fi } port=5501 diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index 6f62d459b0..250343310c 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -15,11 +15,11 @@ bindwait () check_process configname=$1 domcount=$(grep -c zone named.conf) - if [ ! -x ../pdns/pdns_control ]; then - echo "No pdns_control found" - exit 1 - fi - loopcount=0 + if [ ! -x ../pdns/pdns_control ]; then + echo "No pdns_control found" + exit 1 + fi + loopcount=0 while [ $loopcount -lt 20 ]; do sleep 10 @@ -27,11 +27,12 @@ bindwait () if [ $done = $domcount ]; then return fi - let loopcount=loopcount+1 + let loopcount=loopcount+1 done - if [ $done != $domcount ]; then - echo "Domain parsing failed" >> failed_tests - fi + + if [ $done != $domcount ]; then + echo "Domain parsing failed" >> failed_tests + fi } securezone () @@ -61,13 +62,13 @@ check_process () set +e pids=$(cat pdns*.pid 2>/dev/null) if [ -z "$pids" ]; then - echo "PowerDNS did not start" - exit 1 + echo "PowerDNS did not start" + exit 1 fi kill -0 $pids >/dev/null 2>&1 if [ $? -ne 0 ]; then - echo "PowerDNS did not start" - exit 1 + echo "PowerDNS did not start" + exit 1 fi set -e } @@ -494,10 +495,10 @@ __EOF__ remotetype=$(echo $context | cut -d- -f 2) remotesec=$(echo $context | cut -d- -f 3) narrow=$(echo $context | cut -d- -f 4) - testsdir=../modules/remotebackend/regression-tests/ + testsdir=../modules/remotebackend/regression-tests/ - # cleanup unbound-host.conf to avoid failures - rm -f unbound-host.conf + # cleanup unbound-host.conf to avoid failures + rm -f unbound-host.conf case $remotetype in http) @@ -528,14 +529,14 @@ __EOF__ if [ "$remotesec" = "nsec3" ]; then remotedosec="yes" if [ "$narrow" = "narrow" ]; then - extracontexts="dnssec nsec3 narrow" + extracontexts="dnssec nsec3 narrow" skipreasons="narrow nsec3" - else + else extracontexts="dnssec nsec3" skipreasons="nsec3" fi - remote_add_param="--remote-dnssec=yes" - else + remote_add_param="--remote-dnssec=yes" + else if [ "$remotesec" = "dnssec" ]; then remotedosec="yes" remote_add_param="--remote-dnssec=yes" @@ -555,31 +556,31 @@ EOF --query-logging --loglevel=9 --cache-ttl=0 --no-config \ --send-root-referral \ --remote-connection-string="$connstr" $remote_add_param & - + echo "Setting up test database..." # setup test database rm -f $testsdir/remote.sqlite3 sqlite3 $testsdir/remote.sqlite3 < $testsdir/test-schema.sql chmod 0666 $testsdir/remote.sqlite3 if [ "$remotedosec" = "yes" ]; then - echo "remote-dnssec=yes" >> pdns-remote.conf - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.ksk ksk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.1 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.2 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 1 - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 2 - ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 3 - - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.ksk ksk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.1 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.2 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 4 - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 5 - ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 6 + echo "remote-dnssec=yes" >> pdns-remote.conf + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.ksk ksk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.1 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.2 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 1 + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 2 + ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 3 + + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.ksk ksk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.1 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.2 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 4 + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 5 + ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 6 if [ "$remotesec" = "nsec3" ]; then ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 example.com - ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 up.example.com + ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 up.example.com fi fi @@ -638,7 +639,7 @@ then --gmysql-password="$GMYSQL2PASSWD" \ --config-name=gmysql2 |& egrep -v "update records set ordername|insert into records" & echo 'waiting for zones to be slaved' - loopcount=0 + loopcount=0 while [ $loopcount -lt 20 ] do sleep 10 @@ -648,11 +649,11 @@ then then break fi - let loopcount=loopcount+1 + let loopcount=loopcount+1 done if [ $todo -ne 0 ]; then - echo "AXFR FAILED" >> failed_tests - fi + echo "AXFR FAILED" >> failed_tests + fi elif [ ${context:0:8} = gsqlite3 ] then context=${context}-presigned @@ -674,7 +675,7 @@ then --gsqlite3-database=pdns.sqlite31 --gsqlite3-pragma-synchronous=0 |& egrep -v "update records set ordername|insert into records" & echo 'waiting for zones to be slaved' set +e - loopcount=0 + loopcount=0 while [ $loopcount -lt 20 ] do sleep 10 @@ -686,11 +687,11 @@ then break fi fi - let loopcount=loopcount+1 + let loopcount=loopcount+1 done - if [ $todo -ne 0 ]; then - echo "AXFR FAILED" >> failed_tests - fi + if [ $todo -ne 0 ]; then + echo "AXFR FAILED" >> failed_tests + fi set -e sqlite3 pdns.sqlite31 ANALYZE; elif [ ${context:0:4} = bind ]