rename allow_query to allow-query

(cherry picked from commit ffc3e73c3618d2eb6676ac957e2fd25f1fde9150)
(cherry picked from commit 5d9e3f9b0212a2297d2acd07a8a19d819c7ca715)

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index d3d57a7835f900f38278c8caab9f8787a03283a9..73bc2ef75d2b28b2ad81a1941738a08197f4645a 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -53,19 +53,23 @@ feature-test@EXEEXT@: feature-test.@O@
 
 # Define the tests that can be run in parallel.  This should be identical to
 # the definition of PARALLELDIRS in conf.sh. Note: long-running tests
-# such as allow_query and serve-stale are scheduled first to get more
-# benefit from parallelism.
-
-PARALLEL = allow_query rpzrecurse acl additional addzone autosign \
-          builtin cacheclean chain checkconf checknames \
-          checkzone @CHECKDS@ @COVERAGE@ cookie database \
-          digdelv dlv dlz dlzexternal dns64 dnssec dscp dsdigest \
-          ednscompliance emptyzones fetchlimit filter-aaaa \
-          formerr forward geoip glue inline integrity ixfr \
-          legacy limits logfileconfig masterfile masterformat \
-          metadata notify nslookup nsupdate pending reclimit \
-          redirect resolver rndc rpz rrchecker rrl \
-          rrsetorder rsabigexponent runtime smartsign sortlist \
+# such as rpzrecurse are scheduled first to get more benefit from parallelism.
+PARALLEL = rpzrecurse dnssec acl additional \
+          addzone allow-query autosign \
+          builtin cacheclean chain \
+          checkconf checknames checkzone \
+          @CHECKDS@ @COVERAGE@ \
+          cookie database digdelv dlv dlz dlzexternal \
+          dns64 dscp dsdigest \
+          ednscompliance emptyzones \
+          fetchlimit filter-aaaa formerr forward \
+          geoip glue inline integrity ixfr \
+          legacy limits logfileconfig \
+          masterfile masterformat metadata \
+          notify nslookup nsupdate pending \
+          reclimit redirect resolver rndc rpz \
+          rrchecker rrl rrsetorder rsabigexponent runtime \
+          smartsign sortlist \
           spf staticstub statistics statschannel stub \
           tcp tsig tsiggss unknown upforwd verify views wildcard \
           xfer xferquota zero zonechecks

diff --git a/bin/tests/system/allow_query/.gitignore b/bin/tests/system/allow-query/.gitignore
similarity index 100%
rename from bin/tests/system/allow_query/.gitignore
rename to bin/tests/system/allow-query/.gitignore

diff --git a/bin/tests/system/allow_query/clean.sh b/bin/tests/system/allow-query/clean.sh
similarity index 100%
rename from bin/tests/system/allow_query/clean.sh
rename to bin/tests/system/allow-query/clean.sh

diff --git a/bin/tests/system/allow_query/ns2/aclallow.db b/bin/tests/system/allow-query/ns2/aclallow.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/aclallow.db
rename to bin/tests/system/allow-query/ns2/aclallow.db
index 119483e5930d43b9835bb0eec365910650cd989f..b7cca0755abf8808e8e8f67b3880a0d4495372f0 100644 (file)
--- a/bin/tests/system/allow_query/ns2/aclallow.db
+++ b/bin/tests/system/allow-query/ns2/aclallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: aclallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN aclallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/acldisallow.db b/bin/tests/system/allow-query/ns2/acldisallow.db
similarity index 94%
rename from bin/tests/system/allow_query/ns2/acldisallow.db
rename to bin/tests/system/allow-query/ns2/acldisallow.db
index cbde2e5a08a7d8e0d363e4c4cb7e5adda8e954df..018f36d433551b0206fa8a6639dbc0294332b46a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/acldisallow.db
+++ b/bin/tests/system/allow-query/ns2/acldisallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: acldisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN acldisallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/aclnotallow.db b/bin/tests/system/allow-query/ns2/aclnotallow.db
similarity index 94%
rename from bin/tests/system/allow_query/ns2/aclnotallow.db
rename to bin/tests/system/allow-query/ns2/aclnotallow.db
index 9699145f65581203fbd8e78b1707b72863b82961..39ef2f9ef248bec5fff37b4acc2f498fa4b34c80 100644 (file)
--- a/bin/tests/system/allow_query/ns2/aclnotallow.db
+++ b/bin/tests/system/allow-query/ns2/aclnotallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: aclnotallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN aclnotallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/added.db b/bin/tests/system/allow-query/ns2/added.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/added.db
rename to bin/tests/system/allow-query/ns2/added.db
index e559c154e6349e5712317d6c03402ed85489be74..0c931e4f37d53035a2a3d40ccdd6bbb2e9709df0 100644 (file)
--- a/bin/tests/system/allow_query/ns2/added.db
+++ b/bin/tests/system/allow-query/ns2/added.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: added.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN added.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/addrallow.db b/bin/tests/system/allow-query/ns2/addrallow.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/addrallow.db
rename to bin/tests/system/allow-query/ns2/addrallow.db
index babd6ed678c6a85a261baa0175ea6a22a78ecd10..fbf04694e11188125ae8ac15fe2ee04cf8f8e5e9 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrallow.db
+++ b/bin/tests/system/allow-query/ns2/addrallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: addrallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/addrdisallow.db b/bin/tests/system/allow-query/ns2/addrdisallow.db
similarity index 94%
rename from bin/tests/system/allow_query/ns2/addrdisallow.db
rename to bin/tests/system/allow-query/ns2/addrdisallow.db
index 29ee5bac00b712a7b595ea8093f5a0f35ea6b97c..c36ca9a5a589c44a7693b1dd36010fbb4498cd88 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrdisallow.db
+++ b/bin/tests/system/allow-query/ns2/addrdisallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: addrdisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrdisallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (
@@ -29,4 +27,3 @@ ns2                   A       10.53.0.2
 
 a                      A       10.0.6.1
 mail                   A       10.0.6.2
-

diff --git a/bin/tests/system/allow_query/ns2/addrnotallow.db b/bin/tests/system/allow-query/ns2/addrnotallow.db
similarity index 94%
rename from bin/tests/system/allow_query/ns2/addrnotallow.db
rename to bin/tests/system/allow-query/ns2/addrnotallow.db
index c0d7b4d9e912010ab1035fd319d4060c42c67575..28d7b0fc071b91568ae01ccf943a95dc8f8985aa 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrnotallow.db
+++ b/bin/tests/system/allow-query/ns2/addrnotallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: addrnotallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrnotallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/any.db b/bin/tests/system/allow-query/ns2/any.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/any.db
rename to bin/tests/system/allow-query/ns2/any.db
index ac540cc03e49352787bffc09a8ba325cd050488f..a3c0b3290232fe0a58102eab75c4fc87420cc713 100644 (file)
--- a/bin/tests/system/allow_query/ns2/any.db
+++ b/bin/tests/system/allow-query/ns2/any.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: any.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN any.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/keyallow.db b/bin/tests/system/allow-query/ns2/keyallow.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/keyallow.db
rename to bin/tests/system/allow-query/ns2/keyallow.db
index 311c4950eaab12c423b9fc2c90bdcfc40a86e0cf..1dcab860d8c24d5943d9100375f6d0af523b3968 100644 (file)
--- a/bin/tests/system/allow_query/ns2/keyallow.db
+++ b/bin/tests/system/allow-query/ns2/keyallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: keyallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN keyallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/keydisallow.db b/bin/tests/system/allow-query/ns2/keydisallow.db
similarity index 94%
rename from bin/tests/system/allow_query/ns2/keydisallow.db
rename to bin/tests/system/allow-query/ns2/keydisallow.db
index d88f89a432906a9bc942aade7ede25332675cc46..0c7c30cfa8d453a8b1cf3180861015cb5cab9082 100644 (file)
--- a/bin/tests/system/allow_query/ns2/keydisallow.db
+++ b/bin/tests/system/allow-query/ns2/keydisallow.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: keydisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN keydisallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/named01.conf.in b/bin/tests/system/allow-query/ns2/named01.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named01.conf.in
rename to bin/tests/system/allow-query/ns2/named01.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named02.conf.in b/bin/tests/system/allow-query/ns2/named02.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named02.conf.in
rename to bin/tests/system/allow-query/ns2/named02.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named03.conf.in b/bin/tests/system/allow-query/ns2/named03.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named03.conf.in
rename to bin/tests/system/allow-query/ns2/named03.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named04.conf.in b/bin/tests/system/allow-query/ns2/named04.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named04.conf.in
rename to bin/tests/system/allow-query/ns2/named04.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named05.conf.in b/bin/tests/system/allow-query/ns2/named05.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named05.conf.in
rename to bin/tests/system/allow-query/ns2/named05.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named06.conf.in b/bin/tests/system/allow-query/ns2/named06.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named06.conf.in
rename to bin/tests/system/allow-query/ns2/named06.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named07.conf.in b/bin/tests/system/allow-query/ns2/named07.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named07.conf.in
rename to bin/tests/system/allow-query/ns2/named07.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named08.conf.in b/bin/tests/system/allow-query/ns2/named08.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named08.conf.in
rename to bin/tests/system/allow-query/ns2/named08.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named09.conf.in b/bin/tests/system/allow-query/ns2/named09.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named09.conf.in
rename to bin/tests/system/allow-query/ns2/named09.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named10.conf.in
rename to bin/tests/system/allow-query/ns2/named10.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named11.conf.in
rename to bin/tests/system/allow-query/ns2/named11.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named12.conf.in
rename to bin/tests/system/allow-query/ns2/named12.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named21.conf.in b/bin/tests/system/allow-query/ns2/named21.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named21.conf.in
rename to bin/tests/system/allow-query/ns2/named21.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named22.conf.in b/bin/tests/system/allow-query/ns2/named22.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named22.conf.in
rename to bin/tests/system/allow-query/ns2/named22.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named23.conf.in b/bin/tests/system/allow-query/ns2/named23.conf.in
similarity index 99%
rename from bin/tests/system/allow_query/ns2/named23.conf.in
rename to bin/tests/system/allow-query/ns2/named23.conf.in
index 4e66eaa4fd415adcce5cfda76cc2ac83a5b6248e..44aab0d7599e3fcf9d804670d4b620cc178d6b6a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named23.conf.in
+++ b/bin/tests/system/allow-query/ns2/named23.conf.in
@@ -38,4 +38,3 @@ view "internal" {
                file "normal.db";
        };
 };
-

diff --git a/bin/tests/system/allow_query/ns2/named24.conf.in b/bin/tests/system/allow-query/ns2/named24.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named24.conf.in
rename to bin/tests/system/allow-query/ns2/named24.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named25.conf.in b/bin/tests/system/allow-query/ns2/named25.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named25.conf.in
rename to bin/tests/system/allow-query/ns2/named25.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named26.conf.in b/bin/tests/system/allow-query/ns2/named26.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named26.conf.in
rename to bin/tests/system/allow-query/ns2/named26.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named27.conf.in b/bin/tests/system/allow-query/ns2/named27.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named27.conf.in
rename to bin/tests/system/allow-query/ns2/named27.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named28.conf.in b/bin/tests/system/allow-query/ns2/named28.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named28.conf.in
rename to bin/tests/system/allow-query/ns2/named28.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named29.conf.in b/bin/tests/system/allow-query/ns2/named29.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named29.conf.in
rename to bin/tests/system/allow-query/ns2/named29.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named30.conf.in
rename to bin/tests/system/allow-query/ns2/named30.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named31.conf.in
rename to bin/tests/system/allow-query/ns2/named31.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named32.conf.in
rename to bin/tests/system/allow-query/ns2/named32.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named33.conf.in b/bin/tests/system/allow-query/ns2/named33.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named33.conf.in
rename to bin/tests/system/allow-query/ns2/named33.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named34.conf.in b/bin/tests/system/allow-query/ns2/named34.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named34.conf.in
rename to bin/tests/system/allow-query/ns2/named34.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
similarity index 99%
rename from bin/tests/system/allow_query/ns2/named40.conf.in
rename to bin/tests/system/allow-query/ns2/named40.conf.in
index 1ba1e4865ab4611004885536675a52e531de6284..3ed8646290bfffd940b3b7b9299263462a4e547c 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named40.conf.in
+++ b/bin/tests/system/allow-query/ns2/named40.conf.in
@@ -108,5 +108,3 @@ zone "keydisallow.example" {
        file "keydisallow.db";
        allow-query { ! key one; };
 };
-
-

diff --git a/bin/tests/system/allow_query/ns2/named53.conf.in b/bin/tests/system/allow-query/ns2/named53.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named53.conf.in
rename to bin/tests/system/allow-query/ns2/named53.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named54.conf.in b/bin/tests/system/allow-query/ns2/named54.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named54.conf.in
rename to bin/tests/system/allow-query/ns2/named54.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named55.conf.in b/bin/tests/system/allow-query/ns2/named55.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named55.conf.in
rename to bin/tests/system/allow-query/ns2/named55.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named56.conf.in b/bin/tests/system/allow-query/ns2/named56.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named56.conf.in
rename to bin/tests/system/allow-query/ns2/named56.conf.in

diff --git a/bin/tests/system/allow_query/ns2/named57.conf.in b/bin/tests/system/allow-query/ns2/named57.conf.in
similarity index 100%
rename from bin/tests/system/allow_query/ns2/named57.conf.in
rename to bin/tests/system/allow-query/ns2/named57.conf.in

diff --git a/bin/tests/system/allow_query/ns2/none.db b/bin/tests/system/allow-query/ns2/none.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/none.db
rename to bin/tests/system/allow-query/ns2/none.db
index 4ff448e81e9940244b4ceed8a36fc224228008f6..6ecb4a0929fcd306dc9dad4ec97028261f240124 100644 (file)
--- a/bin/tests/system/allow_query/ns2/none.db
+++ b/bin/tests/system/allow-query/ns2/none.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: none.db,v 1.2 2010/11/16 01:37:39 sar Exp $
-
 $ORIGIN none.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/normal.db b/bin/tests/system/allow-query/ns2/normal.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/normal.db
rename to bin/tests/system/allow-query/ns2/normal.db
index 8ed4d8445845fcbfadff38aff185f27b44b16405..52deb05eacc95ce54f762be802e9dcd7273c09f1 100644 (file)
--- a/bin/tests/system/allow_query/ns2/normal.db
+++ b/bin/tests/system/allow-query/ns2/normal.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: normal.db,v 1.2 2010/11/16 01:37:39 sar Exp $
-
 $ORIGIN normal.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/ns2/previous.db b/bin/tests/system/allow-query/ns2/previous.db
similarity index 95%
rename from bin/tests/system/allow_query/ns2/previous.db
rename to bin/tests/system/allow-query/ns2/previous.db
index d03531e0ac400c3d8f3b6c5c129f6d8e37711fbf..6bf2d38f187f4d885ef552e2647d202811fb63f1 100644 (file)
--- a/bin/tests/system/allow_query/ns2/previous.db
+++ b/bin/tests/system/allow-query/ns2/previous.db
@@ -12,8 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: previous.db,v 1.2 2010/11/16 01:37:39 sar Exp $
-
 $ORIGIN previous.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (

diff --git a/bin/tests/system/allow_query/setup.sh b/bin/tests/system/allow-query/setup.sh
similarity index 100%
rename from bin/tests/system/allow_query/setup.sh
rename to bin/tests/system/allow-query/setup.sh

diff --git a/bin/tests/system/allow_query/tests.sh b/bin/tests/system/allow-query/tests.sh
similarity index 98%
rename from bin/tests/system/allow_query/tests.sh
rename to bin/tests/system/allow-query/tests.sh
index 308b97e51a5a6ba65ddf71436a4f8b37ee7287dc..9f5c80091f8a72d77605cb4fc2601f3961f62f5c 100644 (file)
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@@ -22,29 +22,29 @@
 # expected match.
 # Test list:
 # In options:
-# default (any), any, none, [localhost, localnets], 
+# default (any), any, none, [localhost, localnets],
 # allowed address, not allowed address, denied address,
-# allowed key, not allowed key, denied key 
-# allowed acl, not allowed acl, denied acl (acls pointing to addresses) 
+# allowed key, not allowed key, denied key
+# allowed acl, not allowed acl, denied acl (acls pointing to addresses)
 #
 # Each of these tests requires changing to a new configuration
 # file and using rndc to update the server
 #
 # In view, with nothing in options (default to any)
-# default (any), any, none, [localhost, localnets], 
+# default (any), any, none, [localhost, localnets],
 # allowed address, not allowed address, denied address,
-# allowed key, not allowed key, denied key 
-# allowed acl, not allowed acl, denied acl (acls pointing to addresses) 
+# allowed key, not allowed key, denied key
+# allowed acl, not allowed acl, denied acl (acls pointing to addresses)
 #
 # In view, with options set to none, view set to any
 # In view, with options set to any, view set to none
 #
 # In zone, with nothing in options (default to any)
-# any, none, [localhost, localnets], 
-# allowed address, denied address, 
+# any, none, [localhost, localnets],
+# allowed address, denied address,
 # allowed key, not allowed key, denied key
 # allowed acl, not allowed acl, denied acl (acls pointing to addresses),
-# 
+#
 # In zone, with options set to none, zone set to any
 # In zone, with options set to any, zone set to none
 # In zone, with view set to none, zone set to any
@@ -52,7 +52,7 @@
 #
 # zone types of master, slave and stub can be tested in parallel by using
 # multiple instances (ns2 as master, ns3 as slave, ns4 as stub) and querying
-# as necessary. 
+# as necessary.
 #
 
 SYSTEMTESTTOP=..

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index a68a96097746781a0933ac7fe1e2986ec8577533..5f91fcc5fbe0e3e6618a20a107fb4231aa8d1e3e 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -87,9 +87,8 @@ SEQUENTIALDIRS="dlzredir ecdsa eddsa gost lwresd @PKCS11_TEST@ tkey"
 # test, these tests can be run in parallel.
 #
 # This symbol must be kept in step with the PARALLEL macro in Makefile.in
-PARALLELDIRS="allow_query rpzrecurse \
-        acl additional addzone autosign
-        builtin cacheclean chain
+PARALLELDIRS="rpzrecurse acl additional addzone
+        allow-query autosign builtin cacheclean chain
         checkconf checknames checkzone
         @CHECKDS@ @COVERAGE@
         cookie database digdelv dlv dlz dlzexternal