optionally collect drill/drillchase/q/unbound-host output while running tests

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

diff --git a/regression-tests/00dnssec-grabkeys/command b/regression-tests/00dnssec-grabkeys/command
index 45b43f88938264f2f6e80c24a6738284feb34055..97c5e4d3e8420fda6a3f914189ee5d98b888da95 100755 (executable)
--- a/regression-tests/00dnssec-grabkeys/command
+++ b/regression-tests/00dnssec-grabkeys/command
@@ -1,7 +1,15 @@
 #!/bin/sh -e
 set pipefail
 rm -f trustedkeys
+rm -f unbound-host.conf
 for zone in $(grep zone named.conf  | cut -f2 -d\")
 do
-       drill -p $port -o rd -D dnskey $zone @$nameserver | grep -v '^;' >> trustedkeys
+       drill -p $port -o rd -D dnskey $zone @$nameserver | grep -v '^;' | grep -v AwEAAarTiHhPgvD28WCN8UBXcEcf8f >> trustedkeys
+       echo "stub-zone:" >> unbound-host.conf
+       echo "  name: $zone" >> unbound-host.conf
+       echo "  stub-addr: $nameserver@$port" >> unbound-host.conf
+       echo "" >> unbound-host.conf
 done
+
+echo "server:" >> unbound-host.conf
+echo '  trust-anchor-file: "trustedkeys"' >> unbound-host.conf

diff --git a/regression-tests/cleandig b/regression-tests/cleandig
index 7f27949db862660621f49847ef3b0b197683b88b..020b21d890ad81ae559a3e4fa1bd10bccaaf57cf 100755 (executable)
--- a/regression-tests/cleandig
+++ b/regression-tests/cleandig
@@ -1,9 +1,13 @@
 #!/bin/sh
 ../pdns/sdig $nameserver $port $1 $2 $3 | sort
-if drill -p $port -o rd -D -k trustedkeys $1 $2 @$nameserver > drill.test.output
+drill -a -p $port -o rd -D -S -k trustedkeys $1 $2 @$nameserver > $testname/drillchase.out 2>&1 
+echo $? >> $testname/drillchase.out
+drill -a -p $port -o rd -D -k trustedkeys $1 $2 @$nameserver > $testname/drill.out 2>&1
+echo $? >> $testname/drill.out
+/usr/lib/go/bin/q -rd=false -check -dnssec -port=$port @$nameserver $2 $1 > $testname/q.out 2>&1
+echo $? >> $testname/q.out
+if [ ! -e $testname/skip-unboundhost ]
 then
-       rm -f drill.test.output
-else
-       cat drill.test.output >> dnssec-validation-failures
-       echo '-- MARK --' >> dnssec-validation-failures
-fi
+       unbound-host -v -C unbound-host.conf -t $2 $1 > $testname/unbound-host.out 2>&1
+       echo $? >> $testname/unbound-host.out
+fi
\ No newline at end of file

diff --git a/regression-tests/glue-referral/skip-unboundhost b/regression-tests/glue-referral/skip-unboundhost
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/internal-referral/skip-unboundhost b/regression-tests/internal-referral/skip-unboundhost
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/ns-with-identical-glue/skip-unboundhost b/regression-tests/ns-with-identical-glue/skip-unboundhost
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/runtests b/regression-tests/runtests
index 4620aa59f26cdde6d99900a547d8e688baa5f535..f68b9287d65f5be4cda01c6146f59aa84b708132 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -3,7 +3,7 @@ PATH=.:$PATH
 
 make -C ../pdns sdig || false
 
-rm -f test-results failed_tests passed_tests skipped_tests */real_result */diff dnssec-validation-failures
+rm -f test-results failed_tests passed_tests skipped_tests */real_result */diff */*.out
 
 passed=0
 failed=0
@@ -13,6 +13,8 @@ touch passed_tests failed_tests skipped_tests
 
 for a in $(find . -type d | grep -v ^.$ | sed s:^./:: | grep -v .svn | grep -v ^confdir | LC_ALL=C sort) 
 do
+       testname=$a
+       export testname
        echo  "$a: "
        cat $a/description 
 
@@ -72,9 +74,3 @@ echo -n " ("
 res=$((echo scale=2; echo 100*$passed/\($passed+$failed\)) | bc )
 echo -n "$res%) "
 echo tests passed, $skipped were skipped
-if [ -s dnssec-validation-failures ]
-then
-       echo
-       echo there appear to have been $(grep -c '^-- MARK --' dnssec-validation-failures) DNSSEC validation failures.
-       echo Please see the 'dnssec-validation-failures' file for details.
-fi