From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sat, 8 Mar 2014 01:15:46 +0000 (+0100)
Subject: add skipreason nometa for backends without metadata storage
X-Git-Tag: rec-3.6.0-rc1~75^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6249e49680e0270e1dd13b8afb2a8a5fa9f2f07d;p=thirdparty%2Fpdns.git

add skipreason nometa for backends without metadata storage
---

diff --git a/.travis.yml b/.travis.yml
index d5122d30e3..f67ed825b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
  - cd pdns
  - make -j 4 pdns_recursor
  - ./dist-recursor
-# - make -C docs html/index.html manpages
+ - make -C docs html/index.html manpages
  - cd ../regression-tests.recursor
  - cp vars.sample vars
  - ./config.sh
@@ -42,17 +42,17 @@ script:
  - sleep 3
  - ./clean.sh
  - cd ../regression-tests.api
-# - ./runtests authoritative
-# - ./runtests recursor
+ - ./runtests authoritative
+ - ./runtests recursor
  - cd ../regression-tests
  - touch tests/verify-dnssec-zone/allow-missing
  - touch tests/verify-dnssec-zone/skip.nsec3 # some (travis) tools in this test are unable to handle nsec3 zones
  - touch tests/verify-dnssec-zone/skip.optout
-# - ./start-test-stop 5300 bind-both
-# - ./start-test-stop 5300 bind-dnssec-both
-# - ./start-test-stop 5300 bind-dnssec-nsec3-both
-# - ./start-test-stop 5300 bind-dnssec-nsec3-optout-both
-# - ./start-test-stop 5300 bind-dnssec-nsec3-narrow
+ - ./start-test-stop 5300 bind-both
+ - ./start-test-stop 5300 bind-dnssec-both
+ - ./start-test-stop 5300 bind-dnssec-nsec3-both
+ - ./start-test-stop 5300 bind-dnssec-nsec3-optout-both
+ - ./start-test-stop 5300 bind-dnssec-nsec3-narrow
  - ./start-test-stop 5300 gmysql-nodnssec-both
  - ./start-test-stop 5300 gmysql-both
  - ./start-test-stop 5300 gmysql-nsec3-both
@@ -61,20 +61,20 @@ script:
  - ./start-test-stop 5300 gpgsql-nodnssec
  - ./start-test-stop 5300 gpgsql
  - ./start-test-stop 5300 gpgsql-nsec3
-# - travis_retry ./start-test-stop 5300 remotebackend-pipe # Workaround for remotebackend failures on travis-ci
-# - travis_retry ./start-test-stop 5300 remotebackend-pipe-dnssec
-# - travis_retry ./start-test-stop 5300 remotebackend-unix
-# - travis_retry ./start-test-stop 5300 remotebackend-unix-dnssec
-# - travis_retry ./start-test-stop 5300 remotebackend-http
-# - travis_retry ./start-test-stop 5300 remotebackend-http-dnssec
-# - travis_retry ./start-test-stop 5300 remotebackend-zeromq
-# - travis_retry ./start-test-stop 5300 remotebackend-zeromq-dnssec
+ - travis_retry ./start-test-stop 5300 remotebackend-pipe # Workaround for remotebackend failures on travis-ci
+ - travis_retry ./start-test-stop 5300 remotebackend-pipe-dnssec
+ - travis_retry ./start-test-stop 5300 remotebackend-unix
+ - travis_retry ./start-test-stop 5300 remotebackend-unix-dnssec
+ - travis_retry ./start-test-stop 5300 remotebackend-http
+ - travis_retry ./start-test-stop 5300 remotebackend-http-dnssec
+ - travis_retry ./start-test-stop 5300 remotebackend-zeromq
+ - travis_retry ./start-test-stop 5300 remotebackend-zeromq-dnssec
  - ./start-test-stop 5300 gsqlite3-nodnssec-both
  - ./start-test-stop 5300 gsqlite3-both
  - ./start-test-stop 5300 gsqlite3-nsec3-both
-# - ./start-test-stop 5300 mydns
-# - ./start-test-stop 5300 tinydns
-# - ./start-test-stop 5300 opendbx-sqlite3
+ - ./start-test-stop 5300 mydns
+ - ./start-test-stop 5300 tinydns
+ - ./start-test-stop 5300 opendbx-sqlite3
  - THRESHOLD=90 TRACE=no ./recursor-test 5300
  - cd ../regression-tests.nobackend/
  - ./runtests
diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index 9081fc37e6..38acff18e0 100644
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -6,7 +6,7 @@ case $context in
 			--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
 			--cache-ttl=$cachettl --no-config \
 			--bind-ignore-broken-records=yes &
-		skipreasons="nodnssec nodyndns"
+		skipreasons="nodnssec nodyndns nometa"
 		bindwait
 		;;
 
diff --git a/regression-tests/backends/mydns-master b/regression-tests/backends/mydns-master
index 3636e0bcf2..e45490591e 100644
--- a/regression-tests/backends/mydns-master
+++ b/regression-tests/backends/mydns-master
@@ -30,7 +30,7 @@ __EOF__
 			--mydns-user="$MYDNSUSER" \
 			--mydns-host="$MYDNSHOST" \
 			--mydns-password="$MYDNSPASSWD" &
-		skipreasons="nodnssec noent nodyndns noaxfr"
+		skipreasons="nodnssec noent nodyndns nometa noaxfr"
 		;;
 
 		*)
diff --git a/regression-tests/backends/opendbx-master b/regression-tests/backends/opendbx-master
index a8a53487ef..15ac61272c 100644
--- a/regression-tests/backends/opendbx-master
+++ b/regression-tests/backends/opendbx-master
@@ -13,7 +13,7 @@ case $context in
 			--cache-ttl=$cachettl --no-config \
 			--opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \
 			--opendbx-database=pdns-opendbx.sqlite3 &
-		skipreasons="nodnssec noent nodyndns"
+		skipreasons="nodnssec noent nodyndns nometa"
 		;;
 
 	*)
diff --git a/regression-tests/backends/tinydns-master b/regression-tests/backends/tinydns-master
index 76bdfd14eb..20e34bd301 100644
--- a/regression-tests/backends/tinydns-master
+++ b/regression-tests/backends/tinydns-master
@@ -6,7 +6,7 @@ case $context in
 			--send-root-referral \
 			--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
 			--tinydns-dbfile=../modules/tinydnsbackend/data.cdb & 
-		skipreasons="nodnssec noent nodyndns noaxfr"
+		skipreasons="nodnssec noent nodyndns nometa noaxfr"
 		;;
 
 	*)
diff --git a/regression-tests/tests/tsig-axfr/skip.nometa b/regression-tests/tests/tsig-axfr/skip.nometa
new file mode 100644
index 0000000000..e69de29bb2