From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 6 Sep 2013 15:15:56 +0000 (+0200)
Subject: optinonal, allow missing tools for verify-dnssec-zone test
X-Git-Tag: rec-3.6.0-rc1~453^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55b3da69fb1ccc6b9f5b1eae9a71b345ee873c2e;p=pdns

optinonal, allow missing tools for verify-dnssec-zone test
---

diff --git a/.travis.yml b/.travis.yml
index 82793813d..9e72265b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ compiler:
   - clang
 before_script:
  - sudo apt-get update
- - sudo apt-get install libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl unbound-host ldnsutils dnsutils libtool libcdb-dev xmlto dblatex links asciidoc ruby-json ruby-sqlite3 rubygems libcurl4-openssl-dev ruby1.9.1 socat
+ - sudo apt-get install libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl unbound-host ldnsutils dnsutils bind9utils libtool libcdb-dev xmlto dblatex links asciidoc ruby-json ruby-sqlite3 rubygems libcurl4-openssl-dev ruby1.9.1 socat
  - sudo sed -i '0,/\[mysqld\]/s//[mysqld]\nskip-character-set-client-handshake/' /etc/mysql/my.cnf
  - sudo restart mysql
 script:
@@ -17,7 +17,7 @@ script:
  - cd docs
  - make
  - cd ../../regression-tests
- - touch verify-dnssec-zone/skip
+ - touch verify-dnssec-zone/allow-missing
  - ./start-test-stop 5300 bind-both
  - ./start-test-stop 5300 bind-dnssec-both
  - ./start-test-stop 5300 bind-dnssec-nsec3-both
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 75e776805..740dcde51 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -1047,7 +1047,7 @@ export optout
 
 if [ $presigned = no ] || [ $both = yes ]
 then
-	dotests $RETVAL
+	dotests RETVAL
 fi
 
 if [ $presigned = yes ] || [ $both = yes ]
@@ -1058,7 +1058,7 @@ then
 	export context
 	export skipreasons
 
-	dotests $RETVAL
+	dotests RETVAL
 fi
 
 if [ "$wait" = "wait" ]
diff --git a/regression-tests/verify-dnssec-zone/command b/regression-tests/verify-dnssec-zone/command
index a3761bccc..2e470497b 100755
--- a/regression-tests/verify-dnssec-zone/command
+++ b/regression-tests/verify-dnssec-zone/command
@@ -10,7 +10,16 @@ do
 		then
 			named-checkzone -i local $zone $TFILE 2>&1 | grep -v 'addnode: NSEC node already exists'
 		else
-			$validator $TFILE 2>&1
+			if [ ! -e ${testsdir}/${testname}/allow-missing ] || [[ $(type -P "$validator") ]]
+			then
+				$validator $TFILE 2>&1
+			else
+				#fake output for missing validators
+				if [ "$validator" = "jdnssec-verifyzone" ]
+				then
+					echo zone verified.
+				fi
+			fi
 		fi
 		RETVAL=$?
 		echo RETVAL: $RETVAL