From 273ff1ab92cfc5c618f4eeccad11781eb76d1da6 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 29 Oct 2012 15:31:22 +0000
Subject: [PATCH] add bind-dnssec-nsec3-narrow test suite (Kees Monshouwer)

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2832 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 regression-tests/start-test-stop | 47 +++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 59048527e..cbdddfa7e 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -37,7 +37,7 @@ then
 Usage: ./start-test-stop <port> [<context>] [wait]
 
 context is one of:
-bind bind-dnssec bind-dnssec-nsec3
+bind bind-dnssec bind-dnssec-nsec3 bind-dnssec-nsec3-narrow
 gmysql-nodnssec gmysql gmysql-nsec3 gmysql-nsec3-narrow
 gpgsql-nodnssec gpgsql gpgsql-nsec3
 gsqlite3-nodnssec gsqlite3 gsqlite3-nsec3
@@ -48,7 +48,7 @@ remotebackend-pipe-dnssec remotebackend-unix-dnssec remotebackend-http-dnssec
 #remotebackend-pipe-nsec3 remotebackend-unix-nsec3 remotebackend-http-nsec3
 #remotebackend-pipe-nsec3-narrow remotebackend-unix-nsec3-narrow remotebackend-http-nsec3-narrow
 
-add -presigned to any gmysql test (except narrow) to test 
+add -presigned to any bind or gmysql test (except narrow) to test 
 presigned operation
 
 add 'wait' (literally) after the context to not kill 
@@ -77,25 +77,40 @@ case $context in
 			skipreasons=nodnssec
 			bindwait
 			;;
-		bind-dnssec | bind-dnssec-nsec3 )
+
+		bind-dnssec | bind-dnssec-nsec3 | bind-dnssec-nsec3-narrow)
 			./bind-dnssec-setup
-            if [ $context = bind-dnssec-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="bind dnssec nsec3"
-            else
-                extracontexts="bind dnssec"
-            fi
-			$RUNWRAPPER ../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./  \
-				--no-shuffle --launch=bind --bind-config=./named.conf       \
+			for zone in $(grep zone named.conf  | cut -f2 -d\")
+			do
+				if [ $context = bind-dnssec-nsec3 ]
+				then
+					../pdns/pdnssec --config-dir=. set-nsec3 $zone '1 1 1 abcd' 2>&1
+				elif [ $context = bind-dnssec-nsec3-narrow ]
+				then
+					../pdns/pdnssec --config-dir=. set-nsec3 $zone '1 1 1 abcd' narrow 2>&1
+				fi
+			done
+
+			if [ $context = bind-dnssec-nsec3 ]
+			then
+				extracontexts="bind dnssec nsec3"
+				skipreasons="nsec3"
+			elif [ $context = bind-dnssec-nsec3-narrow ]
+			then
+				extracontexts="bind dnssec narrow"
+				skipreasons="narrow"
+			else
+				extracontexts="bind dnssec"
+			fi
+
+			$RUNWRAPPER ../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./ \
+				--no-shuffle --launch=bind --bind-config=./named.conf \
 				--bind-dnssec-db=./dnssec.sqlite3 \
-			    --send-root-referral    \
+				--send-root-referral \
 				--cache-ttl=0 --no-config &
 			bindwait
 			;;
+
 		gmysql-nodnssec)
 			[ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest
 			[ -z "$GMYSQLUSER" ] && GMYSQLUSER=root
-- 
2.40.0