rename allow_query to allow-query

(cherry picked from commit ffc3e73c3618d2eb6676ac957e2fd25f1fde9150)

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 1a9d1f69d1c6bc5376d4c6c335603589d56a224b..2b25f72e3172cbf75940c094dc88c72711f8d144 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -45,12 +45,11 @@ 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
+# such as serve-stale and rpzrecurse are scheduled first to get more
 # benefit from parallelism.
-
-PARALLEL = allow_query rpzrecurse \
+PARALLEL = allow-query rpzrecurse \
           acl additional addzone autosign \
-          builtin cacheclean case catz chain \
+          builtin cacheclean case catz cds chain \
           checkconf checknames checkzone \
           @CHECKDS@ @COVERAGE@ @KEYMGR@ \
           cookie database digdelv dlv dlz dlzexternal \

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 89%
rename from bin/tests/system/allow_query/clean.sh
rename to bin/tests/system/allow-query/clean.sh
index 6b42373d1e77b8bed2ddb683e0d41e06c7d9366b..2be4c01e737516bb21372e57af5257db36a9b5b9 100644 (file)
--- a/bin/tests/system/allow_query/clean.sh
+++ b/bin/tests/system/allow-query/clean.sh
@@ -6,8 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: clean.sh,v 1.2 2010/11/16 01:37:36 sar Exp $
-
 #
 # Clean up after allow query tests.
 #

diff --git a/bin/tests/system/allow_query/ns2/aclallow.db b/bin/tests/system/allow-query/ns2/aclallow.db
similarity index 91%
rename from bin/tests/system/allow_query/ns2/aclallow.db
rename to bin/tests/system/allow-query/ns2/aclallow.db
index c389f8bb281f5f2b01617c9a043ff172e6d4dd28..9e75a5be08097c4c1d96c531cdcf975f370bdfd9 100644 (file)
--- a/bin/tests/system/allow_query/ns2/aclallow.db
+++ b/bin/tests/system/allow-query/ns2/aclallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/acldisallow.db
rename to bin/tests/system/allow-query/ns2/acldisallow.db
index eeb956f220893e0311fae380df1c91158c3dbdb5..d6a65b47b727fe3d337c60c8356225fd3c41299c 100644 (file)
--- a/bin/tests/system/allow_query/ns2/acldisallow.db
+++ b/bin/tests/system/allow-query/ns2/acldisallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/aclnotallow.db
rename to bin/tests/system/allow-query/ns2/aclnotallow.db
index 4cc4eef76deca29d9277b46db3fadc57976ab09d..603971e2663d6caf65f6b9bdbf64eb387921a3e0 100644 (file)
--- a/bin/tests/system/allow_query/ns2/aclnotallow.db
+++ b/bin/tests/system/allow-query/ns2/aclnotallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/added.db
rename to bin/tests/system/allow-query/ns2/added.db
index 24ba37fba499f233916b7ece159856e43622a8df..3c4ec53f3d570f0baeafecfc8d13f1ef77701278 100644 (file)
--- a/bin/tests/system/allow_query/ns2/added.db
+++ b/bin/tests/system/allow-query/ns2/added.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/addrallow.db
rename to bin/tests/system/allow-query/ns2/addrallow.db
index a7e6785a46387d8048a77d2639247f3a51232f1c..b7f46f6ab12f841335c59d448918ca787f94fc2e 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrallow.db
+++ b/bin/tests/system/allow-query/ns2/addrallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 90%
rename from bin/tests/system/allow_query/ns2/addrdisallow.db
rename to bin/tests/system/allow-query/ns2/addrdisallow.db
index 490cf765fc94c1d170abcddca2baab0c21b7823c..8e0979c04c41023f3a35b9e002ee3a8d74701d4c 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrdisallow.db
+++ b/bin/tests/system/allow-query/ns2/addrdisallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $Id: addrdisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrdisallow.example.
 $TTL 300       ; 5 minutes
 @                       IN SOA mname1. . (
@@ -21,4 +19,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 91%
rename from bin/tests/system/allow_query/ns2/addrnotallow.db
rename to bin/tests/system/allow-query/ns2/addrnotallow.db
index b9401a3a0600a5fae880fbbe9787022eb435689c..f5fd6498ba6a667e241e6769e00d2260f97e4932 100644 (file)
--- a/bin/tests/system/allow_query/ns2/addrnotallow.db
+++ b/bin/tests/system/allow-query/ns2/addrnotallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 92%
rename from bin/tests/system/allow_query/ns2/any.db
rename to bin/tests/system/allow-query/ns2/any.db
index 82063ba676136470e5c85b4afb3bfef811a82ef8..53ce123c400d8a5eefae11d61e9cf46e0ed681fb 100644 (file)
--- a/bin/tests/system/allow_query/ns2/any.db
+++ b/bin/tests/system/allow-query/ns2/any.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/keyallow.db
rename to bin/tests/system/allow-query/ns2/keyallow.db
index fd4f07503fde044f68320e665956be9b1a5e1ba1..76f89640417b1e45db0003c2054ab3655c38614c 100644 (file)
--- a/bin/tests/system/allow_query/ns2/keyallow.db
+++ b/bin/tests/system/allow-query/ns2/keyallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/keydisallow.db
rename to bin/tests/system/allow-query/ns2/keydisallow.db
index b45eba7fc77ce3bf0c421542ee1787d910e020ce..160f1404ed2808c54d1af66815758427714e4518 100644 (file)
--- a/bin/tests/system/allow_query/ns2/keydisallow.db
+++ b/bin/tests/system/allow-query/ns2/keydisallow.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 90%
rename from bin/tests/system/allow_query/ns2/named01.conf.in
rename to bin/tests/system/allow-query/ns2/named01.conf.in
index 7c26a7296c41f480fcb2726da168344e54581d27..7ad333cdb95c9d36266f7ed54472d860fec4281b 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named01.conf.in
+++ b/bin/tests/system/allow-query/ns2/named01.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named01.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named02.conf.in b/bin/tests/system/allow-query/ns2/named02.conf.in
similarity index 90%
rename from bin/tests/system/allow_query/ns2/named02.conf.in
rename to bin/tests/system/allow-query/ns2/named02.conf.in
index 80c14392070bf7c716ecda12f0ea81f7aed1ab57..e73d5c8a2f8d0b9635bda8349af6b92411856f42 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named02.conf.in
+++ b/bin/tests/system/allow-query/ns2/named02.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named02.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named03.conf.in b/bin/tests/system/allow-query/ns2/named03.conf.in
similarity index 90%
rename from bin/tests/system/allow_query/ns2/named03.conf.in
rename to bin/tests/system/allow-query/ns2/named03.conf.in
index bc1f4ca27fd58f6c5ea0f74524064386e112dd4a..ec8b7f2fdeca0ce6978d87307be4270097493938 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named03.conf.in
+++ b/bin/tests/system/allow-query/ns2/named03.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named03.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named04.conf.in b/bin/tests/system/allow-query/ns2/named04.conf.in
similarity index 90%
rename from bin/tests/system/allow_query/ns2/named04.conf.in
rename to bin/tests/system/allow-query/ns2/named04.conf.in
index 66d04780a1ffc737758a979dba6d9e94cc2b5766..69e1df63a8fa40de95995d4b7bc6e60c9355b14c 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named04.conf.in
+++ b/bin/tests/system/allow-query/ns2/named04.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named04.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named05.conf.in b/bin/tests/system/allow-query/ns2/named05.conf.in
similarity index 90%
rename from bin/tests/system/allow_query/ns2/named05.conf.in
rename to bin/tests/system/allow-query/ns2/named05.conf.in
index 4f26e6665e687344e5a86a613724a485e817a8dd..6430bb550dc6eff3c24c5616088d92e2f27f50d4 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named05.conf.in
+++ b/bin/tests/system/allow-query/ns2/named05.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named05.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named06.conf.in b/bin/tests/system/allow-query/ns2/named06.conf.in
similarity index 90%
rename from bin/tests/system/allow_query/ns2/named06.conf.in
rename to bin/tests/system/allow-query/ns2/named06.conf.in
index 39f9979139c50321c675f92bf112d76ca1b7f7d3..10f12ce43b649069d9d06ef8ec3aaa05135ed585 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named06.conf.in
+++ b/bin/tests/system/allow-query/ns2/named06.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named06.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named07.conf.in b/bin/tests/system/allow-query/ns2/named07.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named07.conf.in
rename to bin/tests/system/allow-query/ns2/named07.conf.in
index 72be48c989ce2a368acc2f8283db55a917ffcd94..b08dc7a0597c189e96b98f542898f74054d89765 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named07.conf.in
+++ b/bin/tests/system/allow-query/ns2/named07.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named07.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 acl accept { 10.53.0.2; };

diff --git a/bin/tests/system/allow_query/ns2/named08.conf.in b/bin/tests/system/allow-query/ns2/named08.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named08.conf.in
rename to bin/tests/system/allow-query/ns2/named08.conf.in
index cc003d5bb69a5edf5fa2d017530bed4b44d04795..09ad849ee7f37209b973b785768353effd65290d 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named08.conf.in
+++ b/bin/tests/system/allow-query/ns2/named08.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named08.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 acl accept { 10.53.0.1; };

diff --git a/bin/tests/system/allow_query/ns2/named09.conf.in b/bin/tests/system/allow-query/ns2/named09.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named09.conf.in
rename to bin/tests/system/allow-query/ns2/named09.conf.in
index 33f4b2f0a466c664e56722220fa65e052169483d..6f828a9c475bc44ca60a4d105803b76a4d31eb30 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named09.conf.in
+++ b/bin/tests/system/allow-query/ns2/named09.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named09.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 acl accept { 10.53.0.2; };

diff --git a/bin/tests/system/allow_query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named10.conf.in
rename to bin/tests/system/allow-query/ns2/named10.conf.in
index 43704b09249723eebaad40ae75ad90ceaf1b61d4..3e6e560eb7b1197fa9640375833c121d92f2623d 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named10.conf.in
+++ b/bin/tests/system/allow-query/ns2/named10.conf.in
@@ -6,9 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named10.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-
 controls { /* empty */ };
 
 key one {

diff --git a/bin/tests/system/allow_query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named11.conf.in
rename to bin/tests/system/allow-query/ns2/named11.conf.in
index c0504ed12889f174d64eb401cc9dc5d4f04c7998..a5d0becb9fd517681fbe0b2065494e5e2d3577a3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named11.conf.in
+++ b/bin/tests/system/allow-query/ns2/named11.conf.in
@@ -6,9 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named11.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-
 controls { /* empty */ };
 
 key one {

diff --git a/bin/tests/system/allow_query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named12.conf.in
rename to bin/tests/system/allow-query/ns2/named12.conf.in
index f376ee7eb663d2fff3cd1c2eb885b851fe07b580..ee3a6da7face4547925287eb86d1f63e12c5e14b 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named12.conf.in
+++ b/bin/tests/system/allow-query/ns2/named12.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named12.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 key one {

diff --git a/bin/tests/system/allow_query/ns2/named21.conf.in b/bin/tests/system/allow-query/ns2/named21.conf.in
similarity index 90%
rename from bin/tests/system/allow_query/ns2/named21.conf.in
rename to bin/tests/system/allow-query/ns2/named21.conf.in
index c28a52a795c28ab78e472cc814f4ca62cff71111..6a5ec2406c3e8cef7bdc35045bf6288de4fc599b 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named21.conf.in
+++ b/bin/tests/system/allow-query/ns2/named21.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named21.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named22.conf.in b/bin/tests/system/allow-query/ns2/named22.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named22.conf.in
rename to bin/tests/system/allow-query/ns2/named22.conf.in
index f668f0294e0fe6d8425770e5c1444a77878059f5..781af58a71b053e45a5165f987baa6600764c591 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named22.conf.in
+++ b/bin/tests/system/allow-query/ns2/named22.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named22.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named23.conf.in b/bin/tests/system/allow-query/ns2/named23.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named23.conf.in
rename to bin/tests/system/allow-query/ns2/named23.conf.in
index a5045382172d2e811c89cab6131cfebbde7645c9..6ede4dcd8602804d1d9dcd21f40afa7800be96e5 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named23.conf.in
+++ b/bin/tests/system/allow-query/ns2/named23.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named23.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {
@@ -34,4 +32,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 91%
rename from bin/tests/system/allow_query/ns2/named24.conf.in
rename to bin/tests/system/allow-query/ns2/named24.conf.in
index eac68fbc544e2862f7f1d9ac1c75af2a998ecd48..22c0decc3fb35adbbba19c90819b1b91f994de32 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named24.conf.in
+++ b/bin/tests/system/allow-query/ns2/named24.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named24.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named25.conf.in b/bin/tests/system/allow-query/ns2/named25.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named25.conf.in
rename to bin/tests/system/allow-query/ns2/named25.conf.in
index 829350ad31a07466acd77e8b4c24d7ce570ab9f3..6133f3590da7028f756843c7c5b4baf103c594f3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named25.conf.in
+++ b/bin/tests/system/allow-query/ns2/named25.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named25.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named26.conf.in b/bin/tests/system/allow-query/ns2/named26.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named26.conf.in
rename to bin/tests/system/allow-query/ns2/named26.conf.in
index 6ba62295280f168583f504197f4a06b6d5114267..bcc43d4f22233a6e3dde95b6f411ea082ce60096 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named26.conf.in
+++ b/bin/tests/system/allow-query/ns2/named26.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named26.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named27.conf.in b/bin/tests/system/allow-query/ns2/named27.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named27.conf.in
rename to bin/tests/system/allow-query/ns2/named27.conf.in
index 8092a59dea7090da6f9d6f13c6e7a161fa133b53..bd380c8a5272278243f5f4daa7c8fdcfcd5f910b 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named27.conf.in
+++ b/bin/tests/system/allow-query/ns2/named27.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named27.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 acl accept { 10.53.0.2; };

diff --git a/bin/tests/system/allow_query/ns2/named28.conf.in b/bin/tests/system/allow-query/ns2/named28.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named28.conf.in
rename to bin/tests/system/allow-query/ns2/named28.conf.in
index a3327367ddcd5223887337ff2a0f69f2fca06fe2..fbe613d30e98d3ee4b538f5caa1ccf18be8a9035 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named28.conf.in
+++ b/bin/tests/system/allow-query/ns2/named28.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named28.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
 controls { /* empty */ };
 
 acl accept { 10.53.0.1; };

diff --git a/bin/tests/system/allow_query/ns2/named29.conf.in b/bin/tests/system/allow-query/ns2/named29.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named29.conf.in
rename to bin/tests/system/allow-query/ns2/named29.conf.in
index dddf4043a0345eea245f6f599b0d49ce2fb006ad..266fa1c28be0c846cee5bad3d29cf16f96aae4a9 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named29.conf.in
+++ b/bin/tests/system/allow-query/ns2/named29.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named29.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 acl accept { 10.53.0.2; };

diff --git a/bin/tests/system/allow_query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named30.conf.in
rename to bin/tests/system/allow-query/ns2/named30.conf.in
index cf1cad459dcc44a75d7d4d42b7f9760219d5afe6..25aabe3df441cfa3944a410ef1ed6f5d22b21302 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named30.conf.in
+++ b/bin/tests/system/allow-query/ns2/named30.conf.in
@@ -6,9 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named30.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-
 controls { /* empty */ };
 
 key one {

diff --git a/bin/tests/system/allow_query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named31.conf.in
rename to bin/tests/system/allow-query/ns2/named31.conf.in
index bf2da6f662db8e954ef516e843b4a7a1226e67f1..3282b2ee36a6a896d5b70864a16a937b9214e3a2 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named31.conf.in
+++ b/bin/tests/system/allow-query/ns2/named31.conf.in
@@ -6,9 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named31.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-
 controls { /* empty */ };
 
 key one {

diff --git a/bin/tests/system/allow_query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named32.conf.in
rename to bin/tests/system/allow-query/ns2/named32.conf.in
index c6b3b2e54562216a8c58f0f45120d671b72591fe..c6759bd47f42864a663b47898d83156538d53591 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named32.conf.in
+++ b/bin/tests/system/allow-query/ns2/named32.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named32.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 key one {

diff --git a/bin/tests/system/allow_query/ns2/named33.conf.in b/bin/tests/system/allow-query/ns2/named33.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named33.conf.in
rename to bin/tests/system/allow-query/ns2/named33.conf.in
index 3316d27dcee152cd9dea10f52864fc5fc0bc4324..e21bbd59de009b6341b9d7b8f0047472db658786 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named33.conf.in
+++ b/bin/tests/system/allow-query/ns2/named33.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named33.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named34.conf.in b/bin/tests/system/allow-query/ns2/named34.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named34.conf.in
rename to bin/tests/system/allow-query/ns2/named34.conf.in
index 2b0ce0811420c8704a447fe20e0a69224fb0549d..8c050e5619ff277af94fa346c462fec6eed7e83f 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named34.conf.in
+++ b/bin/tests/system/allow-query/ns2/named34.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named34.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
similarity index 96%
rename from bin/tests/system/allow_query/ns2/named40.conf.in
rename to bin/tests/system/allow-query/ns2/named40.conf.in
index 8388f109bba71c161e1a1add751757d1e8efcaba..fdad8791a35705f5167c738beb4385aa9421e0b2 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named40.conf.in
+++ b/bin/tests/system/allow-query/ns2/named40.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named40.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 acl accept { 10.53.0.2; };
@@ -104,5 +102,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 91%
rename from bin/tests/system/allow_query/ns2/named53.conf.in
rename to bin/tests/system/allow-query/ns2/named53.conf.in
index 0fed5846ce302b352d50c613d70a329be8fd5143..9e6b0aebc130ef0b145aaf9e35c9266e8344c469 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named53.conf.in
+++ b/bin/tests/system/allow-query/ns2/named53.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named53.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named54.conf.in b/bin/tests/system/allow-query/ns2/named54.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named54.conf.in
rename to bin/tests/system/allow-query/ns2/named54.conf.in
index f8a922d3876bf29e791a34c959e5c720e27e6424..093d04edfe02557abfe3a8f77de9077de22c3b0a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named54.conf.in
+++ b/bin/tests/system/allow-query/ns2/named54.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named54.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named55.conf.in b/bin/tests/system/allow-query/ns2/named55.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named55.conf.in
rename to bin/tests/system/allow-query/ns2/named55.conf.in
index e577ec6a3d25e6c1a81fa05d0a67ee62338d3fc5..3ce0c39cf3d70b193504feb06669ab2bd55aaea3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named55.conf.in
+++ b/bin/tests/system/allow-query/ns2/named55.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named55.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

diff --git a/bin/tests/system/allow_query/ns2/named56.conf.in b/bin/tests/system/allow-query/ns2/named56.conf.in
similarity index 91%
rename from bin/tests/system/allow_query/ns2/named56.conf.in
rename to bin/tests/system/allow-query/ns2/named56.conf.in
index 05daff6a527bb4cb8692745a9b0d9b17f3e7b565..03b171c329046716508387de366e2ce30f6d884a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named56.conf.in
+++ b/bin/tests/system/allow-query/ns2/named56.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named56.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
 controls { /* empty */ };
 
 options {

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 92%
rename from bin/tests/system/allow_query/ns2/none.db
rename to bin/tests/system/allow-query/ns2/none.db
index 4f6a90d7ac43cf493230e415d48b5eb2afd55126..3d090d5401ce666a9ddc2e3d997f78e99eca84f6 100644 (file)
--- a/bin/tests/system/allow_query/ns2/none.db
+++ b/bin/tests/system/allow-query/ns2/none.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/normal.db
rename to bin/tests/system/allow-query/ns2/normal.db
index 8ef16ab6bd50ade343edaa563be4b2e61e622146..3dc22b9ead13d0b807451d87ba944b200dc7d6ed 100644 (file)
--- a/bin/tests/system/allow_query/ns2/normal.db
+++ b/bin/tests/system/allow-query/ns2/normal.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 91%
rename from bin/tests/system/allow_query/ns2/previous.db
rename to bin/tests/system/allow-query/ns2/previous.db
index 09e5d27df877795c3b27727c5d6c8a7f63c0bb0b..5ef317d880eb1ad6a8cfe88f2a807ea820c92bdf 100644 (file)
--- a/bin/tests/system/allow_query/ns2/previous.db
+++ b/bin/tests/system/allow-query/ns2/previous.db
@@ -4,8 +4,6 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; $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 9027277712698b482ee9df374d9bc822cf54f410..4135399cfe6c6349c9c6883bb01a9b78f3a27eda 100644 (file)
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@@ -6,8 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: tests.sh,v 1.3 2010/12/02 23:22:41 marka Exp $
-
 # Test of allow-query statement.
 # allow-query takes an address match list and can be included in either the
 # options statement or in the zone statement.  This test assumes that the
@@ -16,29 +14,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
@@ -46,7 +44,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 e95c934217519ec3aaf679e5f1bf81b4712d5b67..bb5b0de86bd39661d009cfee916f97f5d6c84e9f 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -84,7 +84,7 @@ SEQUENTIALDIRS="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="acl additional addzone allow_query autosign \
+PARALLELDIRS="acl additional addzone allow-query autosign \
        builtin cacheclean case catz chain \
        checkconf checknames checkzone \
        @CHECKDS@ @COVERAGE@ @KEYMGR@ \