From: Evan Hunt <each@isc.org>
Date: Tue, 27 Feb 2018 00:44:57 +0000 (-0800)
Subject: rename allow_query to allow-query
X-Git-Tag: v9.13.0~115^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffc3e73c3618d2eb6676ac957e2fd25f1fde9150;p=thirdparty%2Fbind9.git

rename allow_query to allow-query
---

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 4589f2603a1..ff46210752c 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 21e9f07dfcc..5ef2dd608a7 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 b831346a413..27794cb14de 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 0d6792dac48..aefb1d033d2 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 29773c5f403..8a047a919a0 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 5532b23c518..62b9249bf66 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 585acb72300..492a1ec4d8d 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 31a6acc7096..9f53ff76641 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 f9d5a554e92..c067e4c4f0c 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 298d84feafa..81d96a7d119 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 698d60bb7a5..d4acc257e85 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 86baa766c24..95dea47e3e3 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 626818d387e..91818e8dbb9 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 ba4269f9bdd..22a4865604b 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 33d91e6140d..50450928e96 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 fb2029aa8c5..7fe55176187 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 79acb41aba1..3c606def886 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 974ec1b1c93..32cec849d95 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@ \