add skip-drill 'button' and ignore drill in secure-delagtion test #1005

diff --git a/regression-tests/cleandig b/regression-tests/cleandig
index c41f06899e398998ccbbf88664cb088d75371dc2..d2fa971137cb588bad1663cc5e9db72010f4cd33 100755 (executable)
--- a/regression-tests/cleandig
+++ b/regression-tests/cleandig
@@ -1,13 +1,16 @@
 #!/bin/sh
 if [ ! -e ${testsdir}/${testname}/use.drill ]
 then
-../pdns/sdig $nameserver $port "$1" $2 $3 $4 $5 | LC_ALL=C sort
+       ../pdns/sdig $nameserver $port "$1" $2 $3 $4 $5 | LC_ALL=C sort
+fi
+if [ ! -e ${testsdir}/${testname}/skip-drill ]
+then
+       ../pdns/nsec3dig $nameserver $port "$1" $2 > ${testsdir}/${testname}/nsec3dig.out 2>&1
+       drill -a -p $port -o rd -D -S -k trustedkeys "$1" $2 @$nameserver > ${testsdir}/${testname}/drillchase.out 2>&1
+       echo RETVAL: $? >> ${testsdir}/${testname}/drillchase.out
+       drill -a -p $port -o rd -D -k trustedkeys "$1" $2 @$nameserver > ${testsdir}/${testname}/drill.out 2>&1
+       echo RETVAL: $? >> ${testsdir}/${testname}/drill.out
 fi
-../pdns/nsec3dig $nameserver $port "$1" $2 > ${testsdir}/${testname}/nsec3dig.out 2>&1
-drill -a -p $port -o rd -D -S -k trustedkeys "$1" $2 @$nameserver > ${testsdir}/${testname}/drillchase.out 2>&1 
-echo RETVAL: $? >> ${testsdir}/${testname}/drillchase.out
-drill -a -p $port -o rd -D -k trustedkeys "$1" $2 @$nameserver > ${testsdir}/${testname}/drill.out 2>&1
-echo RETVAL: $? >> ${testsdir}/${testname}/drill.out
 if [ ! -e ${testsdir}/${testname}/skip-q ]
 then
        /usr/lib/go/bin/q -tcp=true -short=true -rd=false -check -dnssec -port=$port @$nameserver $2 "$1" > ${testsdir}/${testname}/q.out 2>&1

diff --git a/regression-tests/secure-delegation/skip-drill b/regression-tests/secure-delegation/skip-drill
new file mode 100644 (file)
index 0000000..e69de29