include full zone content on failing ldns-verify-zone; also canonicalize zone using...

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

diff --git a/regression-tests/ldns-verify-zone/command b/regression-tests/ldns-verify-zone/command
index 8a206e6dd26365dc1dedc207deea8255316cb807..5357a5161bd6039ab2177e623c242d0b15c7dca7 100755 (executable)
--- a/regression-tests/ldns-verify-zone/command
+++ b/regression-tests/ldns-verify-zone/command
@@ -3,9 +3,17 @@ ldns-verify-zone -h | head -n 1
 for zone in $(grep zone named.conf  | cut -f2 -d\" | grep -v '^example.com$')
 do
        TFILE=$(mktemp)
-       dig axfr $zone @$nameserver -p $port > $TFILE
+       dig axfr $zone @$nameserver -p $port | ldns-read-zone > $TFILE
        echo --- ldns-verify-zone $zone
        ldns-verify-zone -V2 $TFILE 2>&1
-       echo RETVAL: $?
+       RETVAL=$?
+       echo RETVAL: $RETVAL
+       if [ $RETVAL -gt 0 ]
+       then
+               echo ldns-verify-zone reported error, full zone content:
+               echo ---
+               cat $TFILE
+               echo --- end of zone content
+       fi
        rm -f $TFILE
 done