Make runtests slightly more robust; impose testing order; update testing README for...

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

diff --git a/regression-tests/README b/regression-tests/README
index 6c05283fef727197b460db7b9d1454a288a5873d..907ef399117a528126b37612f88f77d744646cf0 100644 (file)
--- a/regression-tests/README
+++ b/regression-tests/README
@@ -29,29 +29,37 @@ How to run
 
 First make sure PowerDNS has access to the testing zone, which is in the
 file 'testzone'. Use the 'zone2sql' tool to create sql and feed it to your
-database. 
+database if you want to test one of the sql backends.
 
-Set the 'nameserver' variable to the IP address of the nameserver you want
-to test:
-
-$ nameserver=127.0.0.1 ./runtests
-
-Run PowerDNS as:
+Run PowerDNS as (to test gmysql):
 
 $ ../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./  \
 --no-shuffle --launch=gmysql --gmysql-dbname=pdnstest --gmysql-user=root \
 --fancy-records --query-logging --send-root-referral --loglevel=9 \
 --cache-ttl=0 --no-config
 
-or:
-
+or (to test bind, without DNSSEC):
 $ ../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./  \
 --no-shuffle --launch=bind --bind-config=./named.conf                \
 --fancy-records --query-logging --send-root-referral --loglevel=9    \
 --cache-ttl=0 --no-config
 
+or (to test bind,gsqlite3):
+
+$ ./bind-gsqlite3-setup
+$ ../pdns/pdns_server --daemon=no --local-port=5300 --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
+
+Set the 'nameserver' and 'port' variables to point to your pdns_server
+instance:
+
+$ nameserver=127.0.0.1 port=5300 ./runtests
 
-The BIND backend can't do MBOXFW
+The BIND backend can't do MBOXFW. The 'any-query' test is known to fail
+with bind,gsqlite3.
 
 Analysing results
 -----------------

diff --git a/regression-tests/bind-gsqlite3-setup b/regression-tests/bind-gsqlite3-setup
new file mode 100755 (executable)
index 0000000..2df5eb4
--- /dev/null
+++ b/regression-tests/bind-gsqlite3-setup
@@ -0,0 +1,9 @@
+#!/bin/sh
+rm -f powerdns.sqlite3
+sqlite3 powerdns.sqlite3 < ../pdns/no-dnssec.schema.sqlite3.sql
+sqlite3 powerdns.sqlite3 < ../pdns/dnssec.schema.sqlite3.sql
+for zone in $(grep zone named.conf  | cut -f2 -d\")
+do
+       sqlite3 powerdns.sqlite3 "INSERT INTO DOMAINS (name, type) VALUES('$zone','NATIVE');"   
+       pdnssec --config-dir=. secure-zone $zone 2>&1
+done

diff --git a/regression-tests/dnssec-00grabkeys/command b/regression-tests/dnssec-00grabkeys/command
new file mode 100755 (executable)
index 0000000..5e7e124
--- /dev/null
+++ b/regression-tests/dnssec-00grabkeys/command
@@ -0,0 +1,6 @@
+#!/bin/sh
+rm -f trustedkeys
+for zone in $(grep zone named.conf  | cut -f2 -d\")
+do
+       drill -p $port -o rd -D dnskey $zone @$nameserver | grep -v '^;' >> trustedkeys
+done

diff --git a/regression-tests/dnssec-00grabkeys/description b/regression-tests/dnssec-00grabkeys/description
new file mode 100644 (file)
index 0000000..4315650
--- /dev/null
+++ b/regression-tests/dnssec-00grabkeys/description
@@ -0,0 +1 @@
+Grab DNSKEY records for validation testing.

diff --git a/regression-tests/dnssec-00grabkeys/expected_result b/regression-tests/dnssec-00grabkeys/expected_result
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/naptr/real_result b/regression-tests/naptr/real_result
deleted file mode 100644 (file)
index f6961e2..0000000
--- a/regression-tests/naptr/real_result
+++ /dev/null
@@ -1,3 +0,0 @@
-0      enum.test.com.  IN      NAPTR   3600    100 50 "u" "e2u+sip" "" testuser@domain.com.
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='enum.test.com.', qtype=NAPTR

diff --git a/regression-tests/pdns.conf b/regression-tests/pdns.conf
new file mode 100644 (file)
index 0000000..95a1cd8
--- /dev/null
+++ b/regression-tests/pdns.conf
@@ -0,0 +1,4 @@
+socket-dir=./
+launch=bind,gsqlite3
+gsqlite3-database=./powerdns.sqlite3
+gsqlite3-dnssec

diff --git a/regression-tests/runtests b/regression-tests/runtests
index dc9b52e440e013611952a93d8fc56d4d33d39783..5f9dbfe2b838e0ed324dff378363553e0bd6babc 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -1,13 +1,15 @@
 #!/bin/bash
 PATH=.:$PATH
 
-rm -f test-results failed_tests passed_tests
+make -C ../pdns sdig || false
+
+rm -f test-results failed_tests passed_tests skipped_tests */real_result */diff
 
 passed=0
 failed=0
 skipped=0
 
-for a in $(find . -type d | grep -v ^.$ | sed s:^./:: | grep -v .svn) 
+for a in $(find . -type d | grep -v ^.$ | sed s:^./:: | grep -v .svn | grep -v ^confdir | LC_ALL=C sort) 
 do
        echo  "$a: "
        cat $a/description