]> granicus.if.org Git - pdns/commitdiff
fix tests
authorPavel Boldin <boldin.pavel@gmail.com>
Fri, 6 Sep 2013 14:41:13 +0000 (18:41 +0400)
committerPavel Boldin <boldin.pavel@gmail.com>
Fri, 6 Sep 2013 14:41:13 +0000 (18:41 +0400)
regression-tests/start-test-stop
regression-tests/verify-dnssec-zone/command
regression-tests/verify-dnssec-zone/expected_result

index 1dc6c9e0c87039eab7726fd9f8ecb98f34f3e080..1ab42f3dc69b0410c59473c21a1f62f0815bb8d5 100755 (executable)
@@ -376,7 +376,8 @@ case $context in
                                --no-shuffle --launch=bind --bind-config=./named.conf                \
                                --send-root-referral    \
                                --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
-                               --cache-ttl=$cachettl --no-config &
+                               --cache-ttl=$cachettl --no-config \
+                               --bind-ignore-broken-records=yes &
                        skipreasons="nodnssec nodyndns"
                        bindwait
                        ;;
@@ -422,7 +423,8 @@ case $context in
                                --bind-dnssec-db=./dnssec.sqlite3 \
                                --send-root-referral \
                                --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --experimental-direct-dnskey=yes \
-                               --cache-ttl=$cachettl --no-config &
+                               --cache-ttl=$cachettl --no-config \
+                               --bind-ignore-broken-records=yes &
                        bindwait
                        ;;
 
index ff2e54f4be7d7416b6b3992df652670d598f8b9f..a3761bccc0522d046dc562cffd8ba048a4c27237 100755 (executable)
@@ -1,5 +1,5 @@
 #!/bin/sh
-for zone in $(grep zone named.conf  | cut -f2 -d\" | grep -v '^example.com$')
+for zone in $(grep zone named.conf  | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$')
 do
        TFILE=$(mktemp)
        dig axfr $zone @$nameserver -p $port | ldns-read-zone -z > $TFILE
index 1cd01b5152a6cb4c0fb048050a5a2583110cd042..ce5da3377909bbbee11da021df7542e692379947 100644 (file)
@@ -46,21 +46,6 @@ zone wtest.com/IN: loaded serial 2005092501 (DNSSEC signed)
 OK
 RETVAL: 0
 
---- ldns-verify-zone -V2 nztest.com
-RETVAL: 0
-
---- validns nztest.com
-RETVAL: 0
-
---- jdnssec-verifyzone nztest.com
-zone verified.
-RETVAL: 0
-
---- named-checkzone nztest.com
-zone nztest.com/IN: loaded serial 2005092501 (DNSSEC signed)
-OK
-RETVAL: 0
-
 --- ldns-verify-zone -V2 dnssec-parent.com
 RETVAL: 0