From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 23 Jul 2013 21:56:25 +0000 (+0200)
Subject: skip unsupported test for ext-nsd
X-Git-Tag: rec-3.6.0-rc1~458^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b1914ff2989a6306959cbb3e5898a560d604b10;p=thirdparty%2Fpdns.git

skip unsupported test for ext-nsd
---

diff --git a/regression-tests/.gitignore b/regression-tests/.gitignore
index 76ce46dbd9..3032e4ad6b 100644
--- a/regression-tests/.gitignore
+++ b/regression-tests/.gitignore
@@ -27,3 +27,4 @@ real_result
 /recursor.log
 /top-1m.csv
 /report.json
+/*.nsd
diff --git a/regression-tests/basic-eui48/skip.nsd b/regression-tests/basic-eui48/skip.nsd
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/regression-tests/basic-eui64/skip.nsd b/regression-tests/basic-eui64/skip.nsd
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/regression-tests/example.com b/regression-tests/example.com
index 31e7343bb0..4e18d38490 100644
--- a/regression-tests/example.com
+++ b/regression-tests/example.com
@@ -20183,5 +20183,5 @@ host-19999	IN	A	192.168.1.31
 ;
 double			IN	A	192.168.5.1
 
-;host-0          IN   EUI48      00-50-56-9b-00-e7
-;host-1          IN   EUI64      00-50-56-9b-00-e7-7e-57
+host-0          IN   EUI48      00-50-56-9b-00-e7
+host-1          IN   EUI64      00-50-56-9b-00-e7-7e-57
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 88d6f3e2ef..5cee21ebbf 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -3,9 +3,10 @@
 PDNS=${PDNS:-../pdns/pdns_server}
 PDNS2=${PDNS2:-../pdns/pdns_server}
 
-cleanlongtxt ()
+nsdfix ()
 {
-	sed -e 's/"A very .*"/"shorter"/' < test.com > test.com.shorttxt
+	sed -e 's/"A very .*"/"shorter"/' < test.com > test.com.nsd
+	sed '/EUI/s/^/;/g' < example.com > example.com.nsd
 }
 
 tonsd ()
@@ -18,7 +19,7 @@ server:
 	username: ""
 __EOF__
 
-	cleanlongtxt
+	nsdfix
 	rm -f K*
 	for zone in $(grep zone named.conf  | cut -f2 -d\")
 	do
@@ -29,9 +30,9 @@ __EOF__
 			ksk="secure-delegated.dnssec-parent.com"
 		fi
 		zsk=$(ldns-keygen -r /dev/urandom -a RSASHA256 $zone)
-		if [ $zone = test.com ]
+		if [ -f $zone.nsd ]
 		then
-			zonefile=test.com.shorttxt
+			zonefile=${zone}.nsd
 		else
 			zonefile=${zone}
 		fi
@@ -232,22 +233,22 @@ case $context in
 				ext-nsd)
 					tonsd unsigned
 					extracontexts="extnsd"
-					skipreasons="nodnssec nodyndns"
+					skipreasons="nsd nodnssec nodyndns"
 					;;
 				ext-nsd-nsec)
 					tonsd nsec
 					extracontexts="extnsd dnssec"
-					skipreasons=nodyndns
+					skipreasons="nsd nodyndns"
 					;;
 				ext-nsd-nsec3)
 					tonsd nsec3
 					extracontexts="extnsd dnssec nsec3"
-					skipreasons="nsec3 nodyndns"
+					skipreasons="nsd nsec3 nodyndns"
 					;;
 				ext-nsd-nsec3-optout)
 					tonsd nsec3-optout
 					extracontexts="extnsd dnssec nsec3 nsec3-optout"
-					skipreasons="optout nodyndns"
+					skipreasons="nsd optout nodyndns"
 					;;
 			esac
 			nsd -c nsd.conf -P pdns.pid -d &
diff --git a/regression-tests/very-long-txt/skip.nsd b/regression-tests/very-long-txt/skip.nsd
new file mode 100644
index 0000000000..e69de29bb2