rename allow_query to allow-query

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 4589f2603a1f48f6ee0c7a9c62348c9fd1563791..ff46210752cfd1628b92ac3f757e21069e9ab043 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -51,7 +51,7 @@ feature-test@EXEEXT@: feature-test.@O@
 # such as allow_query and serve-stale are scheduled first to get more
 # benefit from parallelism.
 
-PARALLEL = allow_query rpzrecurse serve-stale \
+PARALLEL = allow-query rpzrecurse serve-stale \
           acl additional addzone auth autosign \
           builtin cacheclean case catz cds chain \
           checkconf checknames checkzone \

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 92%
rename from bin/tests/system/allow_query/ns2/aclallow.db
rename to bin/tests/system/allow-query/ns2/aclallow.db
index 21e9f07dfcc16d0af68d9a86f795ee7ec067ad26..5ef2dd608a792df2309ca1adc86d66c1a0c81117 100644 (file)
--- a/bin/tests/system/allow_query/ns2/aclallow.db
+++ b/bin/tests/system/allow-query/ns2/aclallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/acldisallow.db
rename to bin/tests/system/allow-query/ns2/acldisallow.db
index b831346a41310f6321cd0f33468efa1bcce05763..27794cb14dea6a4bffc1f26e982093f8ef58e77d 100644 (file)
--- a/bin/tests/system/allow_query/ns2/acldisallow.db
+++ b/bin/tests/system/allow-query/ns2/acldisallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/aclnotallow.db
rename to bin/tests/system/allow-query/ns2/aclnotallow.db
index 0d6792dac481e6df32a167bf71aeb48aca258748..aefb1d033d202172ef4b8778da1ab6636367c37c 100644 (file)
--- a/bin/tests/system/allow_query/ns2/aclnotallow.db
+++ b/bin/tests/system/allow-query/ns2/aclnotallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 93%
rename from bin/tests/system/allow_query/ns2/added.db
rename to bin/tests/system/allow-query/ns2/added.db
index 29773c5f4038b785868fe23899cfd7233dbe88ff..8a047a919a00e43d2dc3848548a8f1afb7e155a2 100644 (file)
--- a/bin/tests/system/allow_query/ns2/added.db
+++ b/bin/tests/system/allow-query/ns2/added.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/addrallow.db
rename to bin/tests/system/allow-query/ns2/addrallow.db
index 5532b23c518dca85508cdf4a90e502e4f5a8c90a..62b9249bf6604ba00d81b9eb982c915d0c565170 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrallow.db
+++ b/bin/tests/system/allow-query/ns2/addrallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/addrdisallow.db
rename to bin/tests/system/allow-query/ns2/addrdisallow.db
index 585acb72300521473c15fbf36774061913b17aeb..492a1ec4d8dd964dc9d4b59ed7c7e96cab8d1c24 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrdisallow.db
+++ b/bin/tests/system/allow-query/ns2/addrdisallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: addrdisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrdisallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (
@@ -24,4 +22,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 92%
rename from bin/tests/system/allow_query/ns2/addrnotallow.db
rename to bin/tests/system/allow-query/ns2/addrnotallow.db
index 31a6acc70967b606894091af86082dcbed0a8c53..9f53ff76641d226213308e6463d4433ec9d706b8 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrnotallow.db
+++ b/bin/tests/system/allow-query/ns2/addrnotallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 93%
rename from bin/tests/system/allow_query/ns2/any.db
rename to bin/tests/system/allow-query/ns2/any.db
index f9d5a554e9217220fa42a9a03a434079604783ca..c067e4c4f0c24d5b1ca9635ad988c1358b4a0965 100644 (file)
--- a/bin/tests/system/allow_query/ns2/any.db
+++ b/bin/tests/system/allow-query/ns2/any.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/keyallow.db
rename to bin/tests/system/allow-query/ns2/keyallow.db
index 298d84feafa44928d8c1013838e38946e7da2c0f..81d96a7d11969a2203386b3fed5964b035d575c7 100644 (file)
--- a/bin/tests/system/allow_query/ns2/keyallow.db
+++ b/bin/tests/system/allow-query/ns2/keyallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/keydisallow.db
rename to bin/tests/system/allow-query/ns2/keydisallow.db
index 698d60bb7a5d91de4c94ef52df769b810eda871a..d4acc257e854d4c35d9fab4a6314acda6d4393e1 100644 (file)
--- a/bin/tests/system/allow_query/ns2/keydisallow.db
+++ b/bin/tests/system/allow-query/ns2/keydisallow.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 86baa766c249b88aebba820d537fd9ced2ebfd03..95dea47e3e3549b62a33c01727005bf3bb42f001 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named23.conf.in
+++ b/bin/tests/system/allow-query/ns2/named23.conf.in
@@ -33,4 +33,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 626818d387e2a7a95ccd4d725978e37e4417ba51..91818e8dbb96c4e35ce3e90c7f28b2caa18aefc3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named40.conf.in
+++ b/bin/tests/system/allow-query/ns2/named40.conf.in
@@ -103,5 +103,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 93%
rename from bin/tests/system/allow_query/ns2/none.db
rename to bin/tests/system/allow-query/ns2/none.db
index ba4269f9bdd713ef4912f2238d12b038dedcb6fe..22a4865604b225c8ab5c397a71aa03f7c7e24988 100644 (file)
--- a/bin/tests/system/allow_query/ns2/none.db
+++ b/bin/tests/system/allow-query/ns2/none.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/normal.db
rename to bin/tests/system/allow-query/ns2/normal.db
index 33d91e6140d64c64f991eddc97672b40e9a955d6..50450928e968e6451bc5457d7885088fbcdb8e60 100644 (file)
--- a/bin/tests/system/allow_query/ns2/normal.db
+++ b/bin/tests/system/allow-query/ns2/normal.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/previous.db
rename to bin/tests/system/allow-query/ns2/previous.db
index fb2029aa8c59b3473a9dbed756fd4667aad9351f..7fe5517618759e22e9c74682d66748e880e4ef64 100644 (file)
--- a/bin/tests/system/allow_query/ns2/previous.db
+++ b/bin/tests/system/allow-query/ns2/previous.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $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 79acb41aba15fc4b89dbe3a10e53d7f471a0513a..3c606def886540cc23f7d5b60e27eaf420845922 100644 (file)
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@@ -17,29 +17,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
@@ -47,7 +47,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 974ec1b1c9330a4cad7d0b28bb46b28d3d315ec6..32cec849d95ad2e96933625d71a38dfeff47f25a 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -86,7 +86,7 @@ SEQUENTIALDIRS="ecdsa eddsa gost @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="acl additional addzone allow_query auth autosign \
+PARALLELDIRS="acl additional addzone allow-query auth autosign \
        builtin cacheclean case catz cds chain \
        checkconf checknames checkzone \
        @CHECKDS@ @COVERAGE@ @KEYMGR@ \