From ef2e64112b2110d502a00b753c9eddb2b4e4d2bb Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Wed, 3 Oct 2012 18:50:58 +0000
Subject: [PATCH] fix testrunner for non-DNSSEC ENT testing

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2738 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 regression-tests/ent-any/skip.noent           |  0
 regression-tests/ent-axfr/skip.noent          |  0
 .../ent-rr-enclosed-in-ent/skip.nodnssec      |  0
 .../ent-rr-enclosed-in-ent/skip.noent         |  0
 regression-tests/ent-soa/skip.noent           |  0
 .../ent-wildcard-below-ent/skip.noent         |  0
 regression-tests/ent/skip.noent               |  0
 regression-tests/runtests                     |  2 +-
 regression-tests/start-test-stop              | 32 +++++++++++++++++--
 9 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 regression-tests/ent-any/skip.noent
 create mode 100644 regression-tests/ent-axfr/skip.noent
 create mode 100644 regression-tests/ent-rr-enclosed-in-ent/skip.nodnssec
 create mode 100644 regression-tests/ent-rr-enclosed-in-ent/skip.noent
 create mode 100644 regression-tests/ent-soa/skip.noent
 create mode 100644 regression-tests/ent-wildcard-below-ent/skip.noent
 create mode 100644 regression-tests/ent/skip.noent

diff --git a/regression-tests/ent-any/skip.noent b/regression-tests/ent-any/skip.noent
new file mode 100644
index 000000000..e69de29bb
diff --git a/regression-tests/ent-axfr/skip.noent b/regression-tests/ent-axfr/skip.noent
new file mode 100644
index 000000000..e69de29bb
diff --git a/regression-tests/ent-rr-enclosed-in-ent/skip.nodnssec b/regression-tests/ent-rr-enclosed-in-ent/skip.nodnssec
new file mode 100644
index 000000000..e69de29bb
diff --git a/regression-tests/ent-rr-enclosed-in-ent/skip.noent b/regression-tests/ent-rr-enclosed-in-ent/skip.noent
new file mode 100644
index 000000000..e69de29bb
diff --git a/regression-tests/ent-soa/skip.noent b/regression-tests/ent-soa/skip.noent
new file mode 100644
index 000000000..e69de29bb
diff --git a/regression-tests/ent-wildcard-below-ent/skip.noent b/regression-tests/ent-wildcard-below-ent/skip.noent
new file mode 100644
index 000000000..e69de29bb
diff --git a/regression-tests/ent/skip.noent b/regression-tests/ent/skip.noent
new file mode 100644
index 000000000..e69de29bb
diff --git a/regression-tests/runtests b/regression-tests/runtests
index bbb8ed8d8..e3835b6ed 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -31,7 +31,7 @@ do
 		SKIPIT=1
 		result="	Skipped test $a"
 	else
-		for reason in "$skipreasons" "$context"
+		for reason in $skipreasons "$context"
 		do
 			if [ -e $a/skip.$reason ]
 			then
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index bf1fce0ec..8672843ec 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -104,6 +104,19 @@ case $context in
 			tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \
 				"$GMYSQLDB"
 
+			cat > pdns-gmysql.conf << __EOF__
+launch=gmysql
+gmysql-dbname=$GMYSQLDB
+gmysql-user=$GMYSQLUSER
+gmysql-host=$GMYSQLHOST
+gmysql-password=$GMYSQLPASSWD
+__EOF__
+
+			for zone in $(grep zone named.conf  | cut -f2 -d\")
+			do
+				../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1
+			done
+
 			$RUNWRAPPER ../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./  \
 				--no-shuffle --launch=gmysql \
 				--fancy-records --send-root-referral \
@@ -236,6 +249,12 @@ launch=gpgsql
 gpgsql-dbname=$GPGSQLDB
 gpgsql-user=$GPGSQLUSER
 __EOF__
+
+			for zone in $(grep zone named.conf  | cut -f2 -d\")
+			do
+				../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1
+			done
+
 			$RUNWRAPPER ../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./  \
 				--no-shuffle --launch=gpgsql \
 				--fancy-records --send-root-referral \
@@ -252,6 +271,15 @@ __EOF__
 			tosql gsqlite | sqlite3 pdns.sqlite3
 			echo ANALYZE\; | sqlite3 pdns.sqlite3
 
+			cat > pdns-gsqlite3.conf << __EOF__
+launch=gsqlite3
+gsqlite3-database=pdns.sqlite3
+__EOF__
+			for zone in $(grep zone named.conf  | cut -f2 -d\")
+			do
+				../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1
+			done
+
 			$RUNWRAPPER ../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./  \
 				--no-shuffle --launch=gsqlite3 \
 				--fancy-records --send-root-referral \
@@ -274,7 +302,7 @@ __EOF__
 				--cache-ttl=0 --no-config \
 				--opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \
 				--opendbx-database=pdns-opendbx.sqlite3 &
-			skipreasons=nodnssec
+			skipreasons="nodnssec noent"
 
 			;;									
 		gsqlite3 | gsqlite3-nsec3)
@@ -317,7 +345,7 @@ __EOF__
 			 --cache-ttl=0 --no-config \
 				--send-root-referral \
 				--tinydns-dbfile=../modules/tinydnsbackend/data.cdb & 
-			skipreasons=nodnssec
+			skipreasons="nodnssec noent"
 			;;
 		*)
 			echo unknown context $context
-- 
2.49.0