add NSEC3 test for bind+gsqlite3; fix a bug in runtests

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

diff --git a/regression-tests/runtests b/regression-tests/runtests
index f68b9287d65f5be4cda01c6146f59aa84b708132..9a62ef83c3d086798c7a44dd4aa0c433beddac64 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -46,7 +46,7 @@ do
                $a/command > /dev/null
                $a/command > $a/real_result
                expected=$a/expected_result
-               for extracontext in "$extracontexts"
+               for extracontext in $extracontexts
                do
                        [ -e "$a/expected_result.$extracontext" ] && expected=$a/expected_result.$extracontext
                done

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index cb916ebe5fa791577788f35af727dc217b4e884a..c9964670608e5c708415da3ab5f8c603993b1c81 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -21,13 +21,23 @@ case $context in
                                --cache-ttl=0 --no-config &
                        skipreasons=nodnssec
                        ;;
-               bind-gsqlite3)
+               bind-gsqlite3 | bind-gsqlite3-nsec3 )
                        ./bind-gsqlite3-setup
                        ../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./  \
                                --no-shuffle --launch=bind,gsqlite3 --bind-config=./named.conf       \
                                --gsqlite3-database=./powerdns.sqlite3 --gsqlite3-dnssec             \
                                --fancy-records --query-logging --send-root-referral --loglevel=9    \
                                --cache-ttl=0 --no-config &
+                       if [ $context = bind-gsqlite3-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

diff --git a/regression-tests/too-big-for-udp-query-no-truncate-additional/expected_result.bind-gsqlite3 b/regression-tests/too-big-for-udp-query-no-truncate-additional/expected_result.bind-gsqlite3
deleted file mode 100644 (file)
index 5f9f313..0000000
--- a/regression-tests/too-big-for-udp-query-no-truncate-additional/expected_result.bind-gsqlite3
+++ /dev/null
@@ -1,28 +0,0 @@
-0      together-too-much.example.com.  IN      MX      120     25 toomuchinfo-a.example.com.
-0      together-too-much.example.com.  IN      MX      120     25 toomuchinfo-b.example.com.
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.1
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.10
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.11
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.12
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.13
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.14
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.15
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.16
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.17
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.18
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.19
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.2
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.20
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.21
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.22
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.23
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.24
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.25
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.3
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.4
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.5
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.6
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.7
-2      toomuchinfo-a.example.com.      IN      A       120     192.168.99.8
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='together-too-much.example.com.', qtype=MX