From ffc3e73c3618d2eb6676ac957e2fd25f1fde9150 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 26 Feb 2018 16:44:57 -0800 Subject: [PATCH] rename allow_query to allow-query --- bin/tests/system/Makefile.in | 2 +- .../{allow_query => allow-query}/.gitignore | 0 .../{allow_query => allow-query}/clean.sh | 0 .../ns2/aclallow.db | 2 -- .../ns2/acldisallow.db | 2 -- .../ns2/aclnotallow.db | 2 -- .../{allow_query => allow-query}/ns2/added.db | 2 -- .../ns2/addrallow.db | 2 -- .../ns2/addrdisallow.db | 3 --- .../ns2/addrnotallow.db | 2 -- .../{allow_query => allow-query}/ns2/any.db | 2 -- .../ns2/keyallow.db | 2 -- .../ns2/keydisallow.db | 2 -- .../ns2/named01.conf.in | 0 .../ns2/named02.conf.in | 0 .../ns2/named03.conf.in | 0 .../ns2/named04.conf.in | 0 .../ns2/named05.conf.in | 0 .../ns2/named06.conf.in | 0 .../ns2/named07.conf.in | 0 .../ns2/named08.conf.in | 0 .../ns2/named09.conf.in | 0 .../ns2/named10.conf.in | 0 .../ns2/named11.conf.in | 0 .../ns2/named12.conf.in | 0 .../ns2/named21.conf.in | 0 .../ns2/named22.conf.in | 0 .../ns2/named23.conf.in | 1 - .../ns2/named24.conf.in | 0 .../ns2/named25.conf.in | 0 .../ns2/named26.conf.in | 0 .../ns2/named27.conf.in | 0 .../ns2/named28.conf.in | 0 .../ns2/named29.conf.in | 0 .../ns2/named30.conf.in | 0 .../ns2/named31.conf.in | 0 .../ns2/named32.conf.in | 0 .../ns2/named33.conf.in | 0 .../ns2/named34.conf.in | 0 .../ns2/named40.conf.in | 2 -- .../ns2/named53.conf.in | 0 .../ns2/named54.conf.in | 0 .../ns2/named55.conf.in | 0 .../ns2/named56.conf.in | 0 .../ns2/named57.conf.in | 0 .../{allow_query => allow-query}/ns2/none.db | 2 -- .../ns2/normal.db | 2 -- .../ns2/previous.db | 2 -- .../{allow_query => allow-query}/setup.sh | 0 .../{allow_query => allow-query}/tests.sh | 20 +++++++++---------- bin/tests/system/conf.sh.in | 2 +- 51 files changed, 12 insertions(+), 42 deletions(-) rename bin/tests/system/{allow_query => allow-query}/.gitignore (100%) rename bin/tests/system/{allow_query => allow-query}/clean.sh (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/aclallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/acldisallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/aclnotallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/added.db (93%) rename bin/tests/system/{allow_query => allow-query}/ns2/addrallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/addrdisallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/addrnotallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/any.db (93%) rename bin/tests/system/{allow_query => allow-query}/ns2/keyallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/keydisallow.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/named01.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named02.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named03.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named04.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named05.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named06.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named07.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named08.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named09.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named10.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named11.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named12.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named21.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named22.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named23.conf.in (99%) rename bin/tests/system/{allow_query => allow-query}/ns2/named24.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named25.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named26.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named27.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named28.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named29.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named30.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named31.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named32.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named33.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named34.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named40.conf.in (99%) rename bin/tests/system/{allow_query => allow-query}/ns2/named53.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named54.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named55.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named56.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/named57.conf.in (100%) rename bin/tests/system/{allow_query => allow-query}/ns2/none.db (93%) rename bin/tests/system/{allow_query => allow-query}/ns2/normal.db (92%) rename bin/tests/system/{allow_query => allow-query}/ns2/previous.db (92%) rename bin/tests/system/{allow_query => allow-query}/setup.sh (100%) rename bin/tests/system/{allow_query => allow-query}/tests.sh (98%) diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 4589f2603a..ff46210752 100644 --- 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 21e9f07dfc..5ef2dd608a 100644 --- 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 b831346a41..27794cb14d 100644 --- 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 0d6792dac4..aefb1d033d 100644 --- 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 29773c5f40..8a047a919a 100644 --- 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 5532b23c51..62b9249bf6 100644 --- 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 585acb7230..492a1ec4d8 100644 --- 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 31a6acc709..9f53ff7664 100644 --- 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 f9d5a554e9..c067e4c4f0 100644 --- 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 298d84feaf..81d96a7d11 100644 --- 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 698d60bb7a..d4acc257e8 100644 --- 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 86baa766c2..95dea47e3e 100644 --- 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 626818d387..91818e8dbb 100644 --- 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 ba4269f9bd..22a4865604 100644 --- 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 33d91e6140..50450928e9 100644 --- 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 fb2029aa8c..7fe5517618 100644 --- 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 79acb41aba..3c606def88 100644 --- 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 974ec1b1c9..32cec849d9 100644 --- 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@ \