Rename system test directory with common files to _common

The old name "common" clashes with the convention of system test
directory naming. It appears as a system test directory, but it only
contains helper files.

To reduce confusion and to allow automatic detection of issues with
possibly missing test files, rename the helper directory to "_common".
The leading underscore indicates the directory is different and the its
name can no longer be confused with regular system test directories.

(cherry picked from commit 168dba163c266a46a969a87d9020f03a221bf2a5)

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 265a9ef2132f31b7259042b754d56b788bb42a5f..aba1acc56b0808f591dcb78a8622bb5d6a2bace3 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -14,10 +14,9 @@ Introduction
 This directory holds a simple test environment for running bind9 system tests
 involving multiple name servers.
 
-With the exception of "common" (which holds configuration information common to
-multiple tests), each directory holds a set of scripts and configuration
-files to test different parts of BIND.  The directories are named for the
-aspect of BIND they test, for example:
+Each system test directory holds a set of scripts and configuration files to
+test different parts of BIND.  The directories are named for the aspect of BIND
+they test, for example:
 
   dnssec/       DNSSEC tests
   forward/      Forwarding tests
@@ -25,6 +24,9 @@ aspect of BIND they test, for example:
 
 etc.
 
+A system test directory must start with an alphabetic character and may not
+contain any special characters. Only hyphen may be used as a word separator.
+
 Typically each set of tests sets up 2-5 name servers and then performs one or
 more tests against them.  Within the test subdirectory, each name server has a
 separate subdirectory containing its configuration data.  These subdirectories

diff --git a/bin/tests/system/common/controls.conf.in b/bin/tests/system/_common/controls.conf.in
similarity index 100%
rename from bin/tests/system/common/controls.conf.in
rename to bin/tests/system/_common/controls.conf.in

diff --git a/bin/tests/system/common/rndc.conf b/bin/tests/system/_common/rndc.conf
similarity index 100%
rename from bin/tests/system/common/rndc.conf
rename to bin/tests/system/_common/rndc.conf

diff --git a/bin/tests/system/common/rndc.key b/bin/tests/system/_common/rndc.key
similarity index 100%
rename from bin/tests/system/common/rndc.key
rename to bin/tests/system/_common/rndc.key

diff --git a/bin/tests/system/common/root.hint b/bin/tests/system/_common/root.hint
similarity index 100%
rename from bin/tests/system/common/root.hint
rename to bin/tests/system/_common/root.hint

diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
index c3343a33a6be954efdbf00a7e6fcc7958de54ce2..d87b1a77633ce66ce8e578d34dc4afddd42b10f1 100644 (file)
--- a/bin/tests/system/acl/ns2/named1.conf.in
+++ b/bin/tests/system/acl/ns2/named1.conf.in
@@ -47,7 +47,7 @@ key two {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in
index ac9ac843ab658a645b0d1827e17b4de406068869..2456e996007315e229a2d7a2b45f2c81723bbdac 100644 (file)
--- a/bin/tests/system/acl/ns2/named2.conf.in
+++ b/bin/tests/system/acl/ns2/named2.conf.in
@@ -47,7 +47,7 @@ key two {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in
index efa73fa9d104e6202ff0999e9512edca66753e16..99320a7fed31390d070aaac3285aa4265ceb38b4 100644 (file)
--- a/bin/tests/system/acl/ns2/named3.conf.in
+++ b/bin/tests/system/acl/ns2/named3.conf.in
@@ -60,7 +60,7 @@ acl accept {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in
index 54c0da30f6faec07611037c79ee8f14781f9b450..08bd80cfe39d26c130de54d43ed8914f8e0655e1 100644 (file)
--- a/bin/tests/system/acl/ns2/named4.conf.in
+++ b/bin/tests/system/acl/ns2/named4.conf.in
@@ -59,7 +59,7 @@ acl check2 { !key two; 10.53.0.2; };
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
index e5b57f0f497dc01def966cd3d7b567b8d393c7a1..94371d0e9b00c7c6e7bd279ffab34a47751d6a4a 100644 (file)
--- a/bin/tests/system/acl/ns2/named5.conf.in
+++ b/bin/tests/system/acl/ns2/named5.conf.in
@@ -49,7 +49,7 @@ key two {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index 48536dafbc4963432c7381a0cb73b91721c1201b..2e76048d7f6e0f50083c34d4373d210b1c167c6d 100644 (file)
--- a/bin/tests/system/acl/tests.sh
+++ b/bin/tests/system/acl/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 t=0

diff --git a/bin/tests/system/additional/ns1/named1.conf.in b/bin/tests/system/additional/ns1/named1.conf.in
index d058d1e65c86749f3e72196237dcd6ac88e08129..0d07e5451e809f8081ce489658f4451725c9ab0a 100644 (file)
--- a/bin/tests/system/additional/ns1/named1.conf.in
+++ b/bin/tests/system/additional/ns1/named1.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses yes;
 };
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/additional/ns1/named2.conf.in b/bin/tests/system/additional/ns1/named2.conf.in
index 56c6d4b70e93ed6b1ba5565d966329a0af983991..efed639527add368286fe31423d9d6179fc3a09f 100644 (file)
--- a/bin/tests/system/additional/ns1/named2.conf.in
+++ b/bin/tests/system/additional/ns1/named2.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no;
 };
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/additional/ns1/named3.conf.in b/bin/tests/system/additional/ns1/named3.conf.in
index ad453a3fa481c57b499c5a781a31533346eaa159..0ff71256b9e0b7b82fde589ac81a0e51cfb7ed6d 100644 (file)
--- a/bin/tests/system/additional/ns1/named3.conf.in
+++ b/bin/tests/system/additional/ns1/named3.conf.in
@@ -26,7 +26,7 @@ options {
        minimal-responses no-auth;
 };
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/additional/ns1/named4.conf.in b/bin/tests/system/additional/ns1/named4.conf.in
index 69479b9f4c11e0b84213aeb325a03dc440d5bff1..8c530865460df1b2e6a31d961edb47c793499222 100644 (file)
--- a/bin/tests/system/additional/ns1/named4.conf.in
+++ b/bin/tests/system/additional/ns1/named4.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no-auth-recursive;
 };
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index a50004c5c8c55c86d49c758a99630cf74aa77f7e..68e232f692a2d72fe94e825a290fd1990dc1a404 100644 (file)
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 n=0

diff --git a/bin/tests/system/addzone/ns1/named.conf.in b/bin/tests/system/addzone/ns1/named.conf.in
index 9015e1b9d97252d93cc181a0b7ace016262f0018..8c94791c8a22db7d9daf3de33fd8dbc7146b41bd 100644 (file)
--- a/bin/tests/system/addzone/ns1/named.conf.in
+++ b/bin/tests/system/addzone/ns1/named.conf.in
@@ -33,7 +33,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "inlinesec.example" {

diff --git a/bin/tests/system/addzone/ns2/named1.conf.in b/bin/tests/system/addzone/ns2/named1.conf.in
index 23be60ef7013033725f62e12290eb381c377068a..bd94f6e75108f6f2fafb588eb426680f274c454f 100644 (file)
--- a/bin/tests/system/addzone/ns2/named1.conf.in
+++ b/bin/tests/system/addzone/ns2/named1.conf.in
@@ -22,7 +22,7 @@ options {
        dnssec-validation no;
 };
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -30,7 +30,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/addzone/ns2/named2.conf.in b/bin/tests/system/addzone/ns2/named2.conf.in
index 8b0f23de2c1d5256022c24452fd599c9febc376b..ef9adeb22f9b0d0b10b952da8aa928f44ab4f6e5 100644 (file)
--- a/bin/tests/system/addzone/ns2/named2.conf.in
+++ b/bin/tests/system/addzone/ns2/named2.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -36,7 +36,7 @@ view internal {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "policy" {
@@ -51,7 +51,7 @@ view external {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 };
 

diff --git a/bin/tests/system/addzone/ns2/named3.conf.in b/bin/tests/system/addzone/ns2/named3.conf.in
index 7078ce989e4c186f5a9cdee1262df3283b82d5c4..ca934c4671d9c703b184d1ce7865a9dca0bbfadf 100644 (file)
--- a/bin/tests/system/addzone/ns2/named3.conf.in
+++ b/bin/tests/system/addzone/ns2/named3.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -36,7 +36,7 @@ view internal {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "policy" {
@@ -51,7 +51,7 @@ view directory {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 };
 
@@ -61,7 +61,7 @@ view external {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 };
 

diff --git a/bin/tests/system/addzone/ns3/named1.conf.in b/bin/tests/system/addzone/ns3/named1.conf.in
index 6c512a670c3d64e08e17adde1eb74fd6142bf29f..0202b8e328fe931e25c16856e1026b13b8bed5ee 100644 (file)
--- a/bin/tests/system/addzone/ns3/named1.conf.in
+++ b/bin/tests/system/addzone/ns3/named1.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/addzone/ns3/named2.conf.in b/bin/tests/system/addzone/ns3/named2.conf.in
index 6ca25f1a195ee86decf3bb9240d86aad0950a3d2..2e95b4c257725ce527cdd5027dd229b69d9140a6 100644 (file)
--- a/bin/tests/system/addzone/ns3/named2.conf.in
+++ b/bin/tests/system/addzone/ns3/named2.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index 2937e79ea359d9179326ce13d07fd163708587e9..b9e85a18c2f30688541d88c4645a273f0c21ab60 100755 (executable)
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 check_zonestatus() (
     $RNDCCMD "10.53.0.$1" zonestatus -redirect > "zonestatus.out.ns$1.$n" &&

diff --git a/bin/tests/system/addzone/tests_rndc_deadlock.py b/bin/tests/system/addzone/tests_rndc_deadlock.py
index bd21d62a90e8077c1c166f65ae72d7c7781a8273..fefcc2dc8bb52a0e3e14ba5dc5d93fc0d4ea15b9 100755 (executable)
--- a/bin/tests/system/addzone/tests_rndc_deadlock.py
+++ b/bin/tests/system/addzone/tests_rndc_deadlock.py
@@ -22,7 +22,7 @@ def run_rndc(server, rndc_command):
     rndc = os.getenv("RNDC")
     port = os.getenv("CONTROLPORT")
 
-    cmdline = [rndc, "-c", "../common/rndc.conf", "-p", port, "-s", server]
+    cmdline = [rndc, "-c", "../_common/rndc.conf", "-p", port, "-s", server]
     cmdline.extend(rndc_command)
 
     subprocess.check_output(cmdline, stderr=subprocess.STDOUT, timeout=10)

diff --git a/bin/tests/system/allow-query/ns2/named01.conf.in b/bin/tests/system/allow-query/ns2/named01.conf.in
index 3069010dfb1e55ce9a5c2cdb62650abaadac790d..fec3ddd66f4df7d587f2d3a794af4a406900288c 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named01.conf.in
+++ b/bin/tests/system/allow-query/ns2/named01.conf.in
@@ -24,7 +24,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named02.conf.in b/bin/tests/system/allow-query/ns2/named02.conf.in
index 678c41779c04487147f857e09a46959dfcde8440..95a78b2ff05160a86d1f7702c90549e4306cca27 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named02.conf.in
+++ b/bin/tests/system/allow-query/ns2/named02.conf.in
@@ -25,7 +25,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named03.conf.in b/bin/tests/system/allow-query/ns2/named03.conf.in
index cdc64ff98fdf01f159ce596d291751cc433710c5..fd6add2b19f7762702915c4d2b36f466c6b0107b 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named03.conf.in
+++ b/bin/tests/system/allow-query/ns2/named03.conf.in
@@ -25,7 +25,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named04.conf.in b/bin/tests/system/allow-query/ns2/named04.conf.in
index 05446627d6b573a994bbb9895af0545aae42d5c0..f6d231dc6af717e3ea2d4693ac277a57218ce596 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named04.conf.in
+++ b/bin/tests/system/allow-query/ns2/named04.conf.in
@@ -25,7 +25,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named05.conf.in b/bin/tests/system/allow-query/ns2/named05.conf.in
index 6f92049f96ce5029c4e05c4047d917e97ca0e0f5..fe6cc0c6c0d92055594e423643f8cd318ed39930 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named05.conf.in
+++ b/bin/tests/system/allow-query/ns2/named05.conf.in
@@ -25,7 +25,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named06.conf.in b/bin/tests/system/allow-query/ns2/named06.conf.in
index 261c75b988309beb0a3c1b7e3e47313ba143abf9..1f78f131ce344dfc01679d16e4c067926ff3e0d6 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named06.conf.in
+++ b/bin/tests/system/allow-query/ns2/named06.conf.in
@@ -25,7 +25,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named07.conf.in b/bin/tests/system/allow-query/ns2/named07.conf.in
index 8050fa22048448e249652147f8f7785cda9c1003..15dca8f10148a741cfe46edae2e771dda82da63b 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named07.conf.in
+++ b/bin/tests/system/allow-query/ns2/named07.conf.in
@@ -27,7 +27,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named08.conf.in b/bin/tests/system/allow-query/ns2/named08.conf.in
index ffa4cdc8d66e98081407d355fdf44e35bddaf981..c2eed2dbf2f691c5841f716ca5329cd49c2208e9 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named08.conf.in
+++ b/bin/tests/system/allow-query/ns2/named08.conf.in
@@ -27,7 +27,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named09.conf.in b/bin/tests/system/allow-query/ns2/named09.conf.in
index 49166e64fd998aa8a5d7c7948da7d447e5ebe6e1..248da9e7bb3b3dd7b0975502a3c350af469725e9 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named09.conf.in
+++ b/bin/tests/system/allow-query/ns2/named09.conf.in
@@ -27,7 +27,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in
index d684c2d01c2a6e21b81328d39a16165d8854e884..774dacebec0bac7a77238e7d9a23849db7399401 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named10.conf.in
+++ b/bin/tests/system/allow-query/ns2/named10.conf.in
@@ -30,7 +30,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
index 59b9e0e76ecb853c5bb3e521e0e033123702b49d..c860aed11709ea10c54a7d8b8a2d18059bfc2c92 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named11.conf.in
+++ b/bin/tests/system/allow-query/ns2/named11.conf.in
@@ -36,7 +36,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in
index a8e9107663971fdfcdc94811584e573f9222bd49..1d9c5d51dc8095d6b57feb1c31d2a03e40780ecd 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named12.conf.in
+++ b/bin/tests/system/allow-query/ns2/named12.conf.in
@@ -30,7 +30,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named21.conf.in b/bin/tests/system/allow-query/ns2/named21.conf.in
index c6204a3b6c22b2dc9785914197513351e960e2e0..b120f2aaa5f9e21d2414ddbd1172125f8ab59cd6 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named21.conf.in
+++ b/bin/tests/system/allow-query/ns2/named21.conf.in
@@ -26,7 +26,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named22.conf.in b/bin/tests/system/allow-query/ns2/named22.conf.in
index 454f24a59c2281e2789b76c4c56bd14e0a60dc5e..37ccedcc8d89133529ae965d9f43f6f509893bc0 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named22.conf.in
+++ b/bin/tests/system/allow-query/ns2/named22.conf.in
@@ -28,7 +28,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named23.conf.in b/bin/tests/system/allow-query/ns2/named23.conf.in
index f62337bc2866b0d1cc3f6b237a79c5795bd75c19..c43e232f16c0de77b1ac70fc1671baf17f362b39 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named23.conf.in
+++ b/bin/tests/system/allow-query/ns2/named23.conf.in
@@ -28,7 +28,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named24.conf.in b/bin/tests/system/allow-query/ns2/named24.conf.in
index 1e277a95aa4b5a9ec8bab7c0be1e4612d47c69ff..6cdbeec18b800c63059749f7b33811e10d1f9caf 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named24.conf.in
+++ b/bin/tests/system/allow-query/ns2/named24.conf.in
@@ -28,7 +28,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named25.conf.in b/bin/tests/system/allow-query/ns2/named25.conf.in
index 0548af248895f54bbdd0154e38c7c68b4edbb09e..51e247ca92499cfbb92f1ed8f1096e214dff7da8 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named25.conf.in
+++ b/bin/tests/system/allow-query/ns2/named25.conf.in
@@ -28,7 +28,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named26.conf.in b/bin/tests/system/allow-query/ns2/named26.conf.in
index 40e5dfd175fbf88d6ff9ccf672e719aed7945b0a..a72136c8794a9f55058c9e61730035f3ed9a9218 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named26.conf.in
+++ b/bin/tests/system/allow-query/ns2/named26.conf.in
@@ -28,7 +28,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named27.conf.in b/bin/tests/system/allow-query/ns2/named27.conf.in
index 92fa1f8bd1ec3e15e589d2d58fe774fd5ec4c2b6..4c3f958d0b5e5f81223a848a6ff3cae395e13727 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named27.conf.in
+++ b/bin/tests/system/allow-query/ns2/named27.conf.in
@@ -30,7 +30,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named28.conf.in b/bin/tests/system/allow-query/ns2/named28.conf.in
index 2ecac7ce833a19235d6b2890dc587d9478a36877..8db4555f8d99625c4a570deffcf3bc84246ca5aa 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named28.conf.in
+++ b/bin/tests/system/allow-query/ns2/named28.conf.in
@@ -30,7 +30,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named29.conf.in b/bin/tests/system/allow-query/ns2/named29.conf.in
index 9a6c9e5a0e134bbafa36891269a2db7b7e96579f..2031a6ea515c98c7e11320762a5adc900036536d 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named29.conf.in
+++ b/bin/tests/system/allow-query/ns2/named29.conf.in
@@ -30,7 +30,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in
index f7084c87e76487926e846d75d654aa51d4109d79..e57b7aba3dd581379fe02e4397ab318d37a7d68e 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named30.conf.in
+++ b/bin/tests/system/allow-query/ns2/named30.conf.in
@@ -33,7 +33,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
index d6a7af54080726d502d0cc2a45a48d327bdc8b0b..776cbb7c7197bbd2ab68784a49326fc95a26d388 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named31.conf.in
+++ b/bin/tests/system/allow-query/ns2/named31.conf.in
@@ -40,7 +40,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in
index b7d7ee42c5192393b268c885c689931c3fbe77dc..35dfb6e15c56e9b0616057e62b5fac20bb54d5e0 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named32.conf.in
+++ b/bin/tests/system/allow-query/ns2/named32.conf.in
@@ -33,7 +33,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named33.conf.in b/bin/tests/system/allow-query/ns2/named33.conf.in
index be31b720516178c871bb8973822912394050cb4b..3721e62f38604b4f9d3f78bd43806460fb87167f 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named33.conf.in
+++ b/bin/tests/system/allow-query/ns2/named33.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named34.conf.in b/bin/tests/system/allow-query/ns2/named34.conf.in
index 165ff06b05af8a6ef74ab6595eea27f06e5cc80f..09125ef021819afbe8c9b0a8268a62c17572f039 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named34.conf.in
+++ b/bin/tests/system/allow-query/ns2/named34.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
index b7a87464f57f1b9ee1d623be98a2bb03553517cc..10e0818c96564acccf258171174ffd2aa07621f8 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named40.conf.in
+++ b/bin/tests/system/allow-query/ns2/named40.conf.in
@@ -38,7 +38,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named53.conf.in b/bin/tests/system/allow-query/ns2/named53.conf.in
index bd0af284203cf45e1fa77c4719f485933a9a6d1a..d3463b27967c5cc55e0d59c242f99065a8dc8f0a 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named53.conf.in
+++ b/bin/tests/system/allow-query/ns2/named53.conf.in
@@ -25,7 +25,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named54.conf.in b/bin/tests/system/allow-query/ns2/named54.conf.in
index a6ca42442db22ef6f54e1831cf3884de85f5f397..5dddf8998eb95ff052b81fa8f2676c46faf68b21 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named54.conf.in
+++ b/bin/tests/system/allow-query/ns2/named54.conf.in
@@ -25,7 +25,7 @@ include "controls.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named55.conf.in b/bin/tests/system/allow-query/ns2/named55.conf.in
index 6bcba0771c63cc519161d3945322634125b0bf4a..4a0880fed3e0451ab48a0306ee2afa8b8558fbc6 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named55.conf.in
+++ b/bin/tests/system/allow-query/ns2/named55.conf.in
@@ -28,7 +28,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named56.conf.in b/bin/tests/system/allow-query/ns2/named56.conf.in
index d89a5fbabc21d47256cb3dce1e636d797d013225..564063b17ecb75cb1b80d392bbf221582eea0890 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named56.conf.in
+++ b/bin/tests/system/allow-query/ns2/named56.conf.in
@@ -28,7 +28,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns2/named57.conf.in b/bin/tests/system/allow-query/ns2/named57.conf.in
index bcc3a85dcaf995444af7e72657608be9cba4a45e..db5f3d0800650fab24ab153bb82643ab6868b8f3 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named57.conf.in
+++ b/bin/tests/system/allow-query/ns2/named57.conf.in
@@ -27,7 +27,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "normal.example" {

diff --git a/bin/tests/system/allow-query/ns3/named1.conf.in b/bin/tests/system/allow-query/ns3/named1.conf.in
index 74b9885bcc3ca55c928e196d244b4d02aa3267ff..bc422464b0f11e42f3da203e903e3e725a3ab147 100644 (file)
--- a/bin/tests/system/allow-query/ns3/named1.conf.in
+++ b/bin/tests/system/allow-query/ns3/named1.conf.in
@@ -31,5 +31,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/allow-query/ns3/named2.conf.in b/bin/tests/system/allow-query/ns3/named2.conf.in
index c4a4e8fb88b0a67254ef6f312b50121b7c12e013..53e73ad80782d2d804a9645d9f29c18edef916fe 100644 (file)
--- a/bin/tests/system/allow-query/ns3/named2.conf.in
+++ b/bin/tests/system/allow-query/ns3/named2.conf.in
@@ -34,5 +34,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/allow-query/ns3/named3.conf.in b/bin/tests/system/allow-query/ns3/named3.conf.in
index 0e1f7b021115c32852d2c290670ec37781a47ee1..36b5f77ce3df19905de5478bd3865894b5ea966c 100644 (file)
--- a/bin/tests/system/allow-query/ns3/named3.conf.in
+++ b/bin/tests/system/allow-query/ns3/named3.conf.in
@@ -34,5 +34,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/allow-query/ns3/named4.conf.in b/bin/tests/system/allow-query/ns3/named4.conf.in
index 36ff9114f300cf30a19e9788b4c6daffe67dd94b..f9e88d4a403d70b2df1732758420b69f44079241 100644 (file)
--- a/bin/tests/system/allow-query/ns3/named4.conf.in
+++ b/bin/tests/system/allow-query/ns3/named4.conf.in
@@ -34,5 +34,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh
index c85676ef8efef6da557d37ddcf2852d290c8c98c..d354fa1a0ad1330749b545b5431c2f400a4ed24c 100644 (file)
--- a/bin/tests/system/allow-query/setup.sh
+++ b/bin/tests/system/allow-query/setup.sh
@@ -13,7 +13,7 @@
 
 . ../conf.sh
 
-copy_setports ../common/controls.conf.in ns2/controls.conf
+copy_setports ../_common/controls.conf.in ns2/controls.conf
 copy_setports  ns1/named.conf.in ns1/named.conf
 copy_setports  ns2/named01.conf.in ns2/named.conf
 copy_setports  ns3/named1.conf.in ns3/named.conf

diff --git a/bin/tests/system/autosign/ns2/named.conf.in b/bin/tests/system/autosign/ns2/named.conf.in
index c155a3bb7de03e446cbfdbbe2f4dab0e7c8e4b66..a1340198154cefbc3f158e647c587997494ee2c8 100644 (file)
--- a/bin/tests/system/autosign/ns2/named.conf.in
+++ b/bin/tests/system/autosign/ns2/named.conf.in
@@ -38,7 +38,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
index 64196a19113c14aafbaec1d52261da28f216121f..42a0fd618e4193b15d5c4486be588d9ef002c59b 100644 (file)
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -42,7 +42,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/autosign/ns4/named.conf.in b/bin/tests/system/autosign/ns4/named.conf.in
index b46ce91cf03188885b3ea6e139126fcd898c2e4a..13a8e897c5f58a5919fddaf46e8ac3ccac02314c 100644 (file)
--- a/bin/tests/system/autosign/ns4/named.conf.in
+++ b/bin/tests/system/autosign/ns4/named.conf.in
@@ -28,7 +28,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/autosign/ns5/named.conf.in b/bin/tests/system/autosign/ns5/named.conf.in
index 710dfa8cd6a0d22265d257890e5f766e616dd502..e0927daa332843082ab7a9b486e7f8815904fde5 100644 (file)
--- a/bin/tests/system/autosign/ns5/named.conf.in
+++ b/bin/tests/system/autosign/ns5/named.conf.in
@@ -27,7 +27,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index ad23c22652e51c2c5f8ef2ab0496d5df9be51f28..0963fe75993846c6ec0c491a5daabb7104bc1950 100755 (executable)
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -19,7 +19,7 @@ status=0
 n=0
 
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 # convert private-type records to readable form
 # $1 is the zone

diff --git a/bin/tests/system/builtin/ns1/named.conf.in b/bin/tests/system/builtin/ns1/named.conf.in
index 723e6b20c0f7a1bfee7405fa7191e2f48f79388b..d2abad762d1acee8d79ae097f737120072998566 100644 (file)
--- a/bin/tests/system/builtin/ns1/named.conf.in
+++ b/bin/tests/system/builtin/ns1/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/builtin/ns2/named.conf.in b/bin/tests/system/builtin/ns2/named.conf.in
index 38b95f00367b69a66da150877f43668ed255960d..64327db08de1a5f310b8853d76d17072ae74ec31 100644 (file)
--- a/bin/tests/system/builtin/ns2/named.conf.in
+++ b/bin/tests/system/builtin/ns2/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/builtin/ns3/named.conf.in b/bin/tests/system/builtin/ns3/named.conf.in
index df538dbbc8a2a4ee76f288b637ea5808b97a42df..c3a1372e71c4a762ca8bf2ae92fba4a0d5ae077e 100644 (file)
--- a/bin/tests/system/builtin/ns3/named.conf.in
+++ b/bin/tests/system/builtin/ns3/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh
index 21213dedd7a8c6d4f8045b9d3cac731993141126..226047fee16b5d8dbd4805d8429d7d0f0812e3e0 100644 (file)
--- a/bin/tests/system/builtin/tests.sh
+++ b/bin/tests/system/builtin/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 n=0

diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index 0b5cd29813cf6c4f9f7b0a77981974bb9f1e1161..6ffa0737b22e3f21bb6c6c26486fbb8a7dd9b8b9 100644 (file)
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "flushtest.example" {

diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index 8dc8b0de314014a8065fd88409a7712f52dd1ee9..bd1ed25bd6e852e5506ff1614c8a153b63c68faa 100755 (executable)
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -18,7 +18,7 @@ set -e
 status=0
 n=0
 
-RNDCOPTS="-c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}"
+RNDCOPTS="-c ../_common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}"
 DIGOPTS="+nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm \
          +nostat @10.53.0.2 -p ${PORT}"
 

diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
index bcfc68a04a5a6082bf102ead1d0d0546ef58d90b..1f4ee99337d0eb083d2b39f46489ac8c67b5d70a 100644 (file)
--- a/bin/tests/system/catz/ns1/named.conf.in
+++ b/bin/tests/system/catz/ns1/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/catz/ns2/named1.conf.in b/bin/tests/system/catz/ns2/named1.conf.in
index 3169abb88e25401339bf1e03eff7319c001b8c98..882a4bab4fab7c3b19dcfec2de697b42a9e70fb0 100644 (file)
--- a/bin/tests/system/catz/ns2/named1.conf.in
+++ b/bin/tests/system/catz/ns2/named1.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/catz/ns2/named2.conf.in b/bin/tests/system/catz/ns2/named2.conf.in
index b5be974053c7a808b464033844562770b336ac8a..51d72dc3af3189dca32b629cc52f03c6e6f83ee8 100644 (file)
--- a/bin/tests/system/catz/ns2/named2.conf.in
+++ b/bin/tests/system/catz/ns2/named2.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/catz/ns3/named.conf.in b/bin/tests/system/catz/ns3/named.conf.in
index fb823791104c80fb7a3b447a76dc6fafbe21a4cf..47c4ed7ed71566c0f04cfc68ea89f6dc34f0e6fe 100644 (file)
--- a/bin/tests/system/catz/ns3/named.conf.in
+++ b/bin/tests/system/catz/ns3/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/catz/ns4/named.conf.in b/bin/tests/system/catz/ns4/named.conf.in
index 2f43c25e1837e8538246cd05c53aef24e71845a7..3ac60b2dd88e0e12acf86cf77b33e18a5ea0e7f1 100644 (file)
--- a/bin/tests/system/catz/ns4/named.conf.in
+++ b/bin/tests/system/catz/ns4/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index eacb39c0789514081dfbab3d6a6007dac9891201..2c6c7cb61d4734dccc1207ec10cf78367a8666a7 100644 (file)
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -21,7 +21,7 @@ dig_with_opts() {
 }
 
 rndccmd() (
-       "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
+       "$RNDC" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "$@"
 )
 
 _wait_for_message() (
@@ -662,7 +662,7 @@ echo_i "reconfiguring secondary - checking if catz survives a certain class of f
 ret=0
 sed -e "s/^#T3//" < ns2/named1.conf.in > ns2/named.conf.tmp
 copy_setports ns2/named.conf.tmp ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
+$RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
@@ -689,7 +689,7 @@ echo_i "reconfiguring secondary - checking if catz survives another type of fail
 ret=0
 sed -e "s/^#T4//" < ns2/named1.conf.in > ns2/named.conf.tmp
 copy_setports ns2/named.conf.tmp ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
+$RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
@@ -1746,7 +1746,7 @@ echo_i "reconfiguring secondary - removing catalog4 catalog zone, adding non-exi
 ret=0
 sed -e "s/^#T2//" < ns2/named1.conf.in > ns2/named.conf.tmp
 copy_setports ns2/named.conf.tmp ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
+$RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 

diff --git a/bin/tests/system/chain/ns5/named.conf.in b/bin/tests/system/chain/ns5/named.conf.in
index 86bbf26edced6a03702bc4e92f799064ec4d6c22..ba8cc6f0010ef6408b22f70dd8a7e0e3d865960e 100644 (file)
--- a/bin/tests/system/chain/ns5/named.conf.in
+++ b/bin/tests/system/chain/ns5/named.conf.in
@@ -28,7 +28,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "sub5.example" {

diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh
index 3ad8e31233cf9c76c1604b4ecab59dd7b8f3dc1b..274d40d86effdc63837db5cf67d6ac32ac27ef49 100644 (file)
--- a/bin/tests/system/chain/tests.sh
+++ b/bin/tests/system/chain/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 sendcmd() {
     send 10.53.0.4 "${EXTRAPORT1}"

diff --git a/bin/tests/system/checkds/ns2/named.conf.in b/bin/tests/system/checkds/ns2/named.conf.in
index 48e675cd5e32cec5d2b5c99904b5637ceb128984..2698082970db4bbeb1773c58b5f25450e49b2627 100644 (file)
--- a/bin/tests/system/checkds/ns2/named.conf.in
+++ b/bin/tests/system/checkds/ns2/named.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "checkds" {

diff --git a/bin/tests/system/checkds/ns3/named.conf.in b/bin/tests/system/checkds/ns3/named.conf.in
index 54bfc9989862165f801847b1e601e2f6248b2e28..3d54e11bf3a7725938026498dfecafadb7a4a1a6 100644 (file)
--- a/bin/tests/system/checkds/ns3/named.conf.in
+++ b/bin/tests/system/checkds/ns3/named.conf.in
@@ -35,7 +35,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/checkds/ns5/named.conf.in b/bin/tests/system/checkds/ns5/named.conf.in
index b7226fecf597bee9d220fa4916cf4edf787a8031..227b5624dce7895e516cf816c69846d1da39581e 100644 (file)
--- a/bin/tests/system/checkds/ns5/named.conf.in
+++ b/bin/tests/system/checkds/ns5/named.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "checkds" {

diff --git a/bin/tests/system/checkds/ns6/named.conf.in b/bin/tests/system/checkds/ns6/named.conf.in
index cc226fbd958a30b94db98fbbc27c0048369a89a9..814cacaa3b01cfef4ee40aa619f430016844c810 100644 (file)
--- a/bin/tests/system/checkds/ns6/named.conf.in
+++ b/bin/tests/system/checkds/ns6/named.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "foo" {

diff --git a/bin/tests/system/checkds/ns7/named.conf.in b/bin/tests/system/checkds/ns7/named.conf.in
index 57460c884d0c90287932a4041d6182a81d7d4011..f4a3524edbf5a4f44258c966a1dd4668d91d951f 100644 (file)
--- a/bin/tests/system/checkds/ns7/named.conf.in
+++ b/bin/tests/system/checkds/ns7/named.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
         type hint;
-        file "../../common/root.hint";
+        file "../../_common/root.hint";
 };
 
 zone "checkds" {

diff --git a/bin/tests/system/checkds/ns9/named.conf.in b/bin/tests/system/checkds/ns9/named.conf.in
index 74a51302d3342631d7102e901104a7f57991b394..b964e8cd07f60ad23f1000066ca3e0ce0af61f8e 100644 (file)
--- a/bin/tests/system/checkds/ns9/named.conf.in
+++ b/bin/tests/system/checkds/ns9/named.conf.in
@@ -41,7 +41,7 @@ parental-agents "ns2" port @PORT@ {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 /*

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index 90059ddc7b11194195fb81168aebeb58c83be12c..d2fc635dd76d9179237c0b6f0892f655997431eb 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -296,7 +296,7 @@ send() {
 eval "$($PYTHON "$TOP_SRCDIR/bin/tests/system/get_algorithms.py")"
 
 # Default HMAC algorithm.
-# also update common/rndc.conf and common/rndc.key when updating DEFAULT_HMAC
+# also update _common/rndc.conf and _common/rndc.key when updating DEFAULT_HMAC
 export DEFAULT_HMAC=hmac-sha256
 
 #
@@ -609,12 +609,12 @@ _times() {
 }
 
 rndc_reload() {
-    $RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} reload $3 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
+    $RNDC -c ../_common/rndc.conf -s $2 -p ${CONTROLPORT} reload $3 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
     # reloading single zone is synchronous, if we're reloading whole server
     # we need to wait for reload to finish
     if [ -z "$3" ]; then
         for _ in $(_times 10); do
-            $RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} status | grep "reload/reconfig in progress" > /dev/null || break
+            $RNDC -c ../_common/rndc.conf -s $2 -p ${CONTROLPORT} status | grep "reload/reconfig in progress" > /dev/null || break
             sleep 1
         done
     fi
@@ -622,9 +622,9 @@ rndc_reload() {
 
 rndc_reconfig() {
     seconds=${3:-10}
-    $RNDC -c ../common/rndc.conf -s "$2" -p "${CONTROLPORT}" reconfig 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
+    $RNDC -c ../_common/rndc.conf -s "$2" -p "${CONTROLPORT}" reconfig 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
     for _ in $(_times "$seconds"); do
-        "$RNDC" -c ../common/rndc.conf -s "$2" -p "${CONTROLPORT}" status | grep "reload/reconfig in progress" > /dev/null || break
+        "$RNDC" -c ../_common/rndc.conf -s "$2" -p "${CONTROLPORT}" status | grep "reload/reconfig in progress" > /dev/null || break
         sleep 1
     done
 }
@@ -636,7 +636,7 @@ rndc_reconfig() {
 # arguments, if any, are appended to the rndc command line after "dumpdb".
 #
 # Control channel configuration for the name server instance to send the
-# command to must match the contents of bin/tests/system/common/rndc.conf.
+# command to must match the contents of bin/tests/system/_common/rndc.conf.
 #
 # rndc output is stored in a file called rndc.out.test${n}; the "n" variable is
 # required to be set by the calling tests.sh script.
@@ -651,7 +651,7 @@ rndc_dumpdb() {
        __ip="10.53.0.$(echo "${__server}" | tr -c -d "0-9")"
 
        shift
-       ${RNDC} -c ../common/rndc.conf -p "${CONTROLPORT}" -s "${__ip}" dumpdb "$@" > "rndc.out.test${n}" 2>&1 || __ret=1
+       ${RNDC} -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "${__ip}" dumpdb "$@" > "rndc.out.test${n}" 2>&1 || __ret=1
 
        for _ in 0 1 2 3 4 5 6 7 8 9
        do

diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh
index fad73d71a02375dbe3efb9ca9936e71818679f85..387fca806e39c8347b4dc2691811db3cb25ef691 100755 (executable)
--- a/bin/tests/system/cookie/tests.sh
+++ b/bin/tests/system/cookie/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 n=0

diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 408b094be00f1aa5b40114af12e0b4c25137347d..664f671510d694824eb61a52ee79fd174b43f26d 100644 (file)
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -21,7 +21,7 @@ n=0
 rm -f dig.out.*
 
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p ${PORT}"
-RNDCCMD="$RNDC -s 10.53.0.1 -p ${CONTROLPORT} -c ../common/rndc.conf"
+RNDCCMD="$RNDC -s 10.53.0.1 -p ${CONTROLPORT} -c ../_common/rndc.conf"
 
 # Check the example. domain
 

diff --git a/bin/tests/system/digdelv/ns2/named.conf.in b/bin/tests/system/digdelv/ns2/named.conf.in
index 1391b7322c0a9753add9bc0e7a4c5369df36cc52..0aa42a33d157c7bf14b6944bb79b2ce128b324ac 100644 (file)
--- a/bin/tests/system/digdelv/ns2/named.conf.in
+++ b/bin/tests/system/digdelv/ns2/named.conf.in
@@ -25,7 +25,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/digdelv/ns3/named.conf.in b/bin/tests/system/digdelv/ns3/named.conf.in
index 66bb74891fb9c181cdb06ca22ed55bde1e32014b..90a3fa30669633f2ba98c0b4d50b5f1adc8a2a23 100644 (file)
--- a/bin/tests/system/digdelv/ns3/named.conf.in
+++ b/bin/tests/system/digdelv/ns3/named.conf.in
@@ -24,5 +24,5 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/dispatch/ns2/named.conf.in b/bin/tests/system/dispatch/ns2/named.conf.in
index 50f2c34494a968af6caef01ff10bf64f1b3fe6e8..895f40d790f2e078f2849a9f2a82d3db6c6c5c06 100644 (file)
--- a/bin/tests/system/dispatch/ns2/named.conf.in
+++ b/bin/tests/system/dispatch/ns2/named.conf.in
@@ -41,7 +41,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh
index cbab5094e062e7dfa4246a33c4a9f23d8b027f64..fd579ffb7c33c80a028b4d35cc0a76f44df98cc7 100644 (file)
--- a/bin/tests/system/dlzexternal/tests.sh
+++ b/bin/tests/system/dlzexternal/tests.sh
@@ -19,7 +19,7 @@ status=0
 n=0
 
 DIGOPTS="@10.53.0.1 -p ${PORT} +nocookie"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 newtest() {
        n=$((n + 1))

diff --git a/bin/tests/system/dns64/ns1/named.conf1.in b/bin/tests/system/dns64/ns1/named.conf1.in
index aaf7aab096883e9d4327015a36e199b6d79a3426..41950d9f64de84c952274386817f8bb4f320400c 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf1.in
+++ b/bin/tests/system/dns64/ns1/named.conf1.in
@@ -13,7 +13,7 @@
 
 // NS1
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
         inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/dns64/ns1/named.conf2.in b/bin/tests/system/dns64/ns1/named.conf2.in
index f3fc40f645aaa1ad5c5debe0b779e688c3904040..ff39dd1fb63585407a1bbf57786c9171c2e2e0f6 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf2.in
+++ b/bin/tests/system/dns64/ns1/named.conf2.in
@@ -13,7 +13,7 @@
 
 // NS1
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
         inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/dns64/ns1/named.conf3.in b/bin/tests/system/dns64/ns1/named.conf3.in
index cb6237b0e77b46d7bad1f05a5b66e397d472f423..a44c258cc3e915e4d0d83cecd44b1076f0d2a066 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf3.in
+++ b/bin/tests/system/dns64/ns1/named.conf3.in
@@ -13,7 +13,7 @@
 
 // NS1
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
         inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
index be92d1a04514cb58dfbe5bcf234662a90bdddeab..263cc8a1b1b07c435af24058bb1ef3189fa7b3ae 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf.in
+++ b/bin/tests/system/dns64/ns2/named.conf.in
@@ -62,7 +62,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "rpz" {

diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index 94928c1f1d40c2cc763f0f9fddd5d7e3099ce7dd..a854a08a535ca91c16c4e0f654a8366310f2b08f 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -39,7 +39,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "trusted" {

diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index cdc6e020073a5a12b4beccfa448febde15c677d0..680cff58d5b2311db530543b08250a060e033890 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -39,7 +39,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in
index 280217e50b58799767724dea59de93022472951d..113e3bbe1d1cf3abb8fdf8617f13b4b719c0ed5b 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named1.conf.in
+++ b/bin/tests/system/dnssec/ns4/named1.conf.in
@@ -50,7 +50,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "corp" {

diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in
index b01979bb526597afd3a7c173a12f58efe4f28488..56bdfe4235814e164520cb8731c7df60e669675a 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named2.conf.in
+++ b/bin/tests/system/dnssec/ns4/named2.conf.in
@@ -38,5 +38,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/dnssec/ns4/named3.conf.in b/bin/tests/system/dnssec/ns4/named3.conf.in
index 3a64e9d27ad924890a6210eaa6cbb3476dd5ed1e..e160d374336a72ddf24c966b92b1f5fe31b59d3b 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named3.conf.in
+++ b/bin/tests/system/dnssec/ns4/named3.conf.in
@@ -39,5 +39,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/dnssec/ns4/named4.conf.in b/bin/tests/system/dnssec/ns4/named4.conf.in
index 5d3bf3f0c71b2c42be5c584abf1c3e66c9afda8d..d192ceb4b3eb1c2c6397f00ffe19518b6592c6ee 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named4.conf.in
+++ b/bin/tests/system/dnssec/ns4/named4.conf.in
@@ -48,7 +48,7 @@ view rec {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone secure.example {

diff --git a/bin/tests/system/dnssec/ns5/named1.conf.in b/bin/tests/system/dnssec/ns5/named1.conf.in
index ccb3de919c97501ffe29a66d6e712d1321256e6b..ef371e175a6c6d5df5b8212737b5254b97d33174 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named1.conf.in
+++ b/bin/tests/system/dnssec/ns5/named1.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/dnssec/ns6/named.conf.in b/bin/tests/system/dnssec/ns6/named.conf.in
index 4bdc79c5f70e72132db4104c880a0e0be8e7c9ab..2818b7958cbb47cabf46b75d53f40f4fe8138013 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.conf.in
+++ b/bin/tests/system/dnssec/ns6/named.conf.in
@@ -29,7 +29,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "optout-tld" {

diff --git a/bin/tests/system/dnssec/ns7/named.conf.in b/bin/tests/system/dnssec/ns7/named.conf.in
index 55cbec9ee96ffe88a2aba23a7ab76827faf278a3..b35284664b3a61950c0c0dd5e1f41b79e635cce8 100644 (file)
--- a/bin/tests/system/dnssec/ns7/named.conf.in
+++ b/bin/tests/system/dnssec/ns7/named.conf.in
@@ -29,7 +29,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "nsec3.example" {

diff --git a/bin/tests/system/dnssec/ns8/named.conf.in b/bin/tests/system/dnssec/ns8/named.conf.in
index d0278caeb9d288684c8921c63b02c0820b14f0aa..2590de18908aeaeea3d1313892da693d789404cd 100644 (file)
--- a/bin/tests/system/dnssec/ns8/named.conf.in
+++ b/bin/tests/system/dnssec/ns8/named.conf.in
@@ -39,7 +39,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "managed.conf";

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index fe4fc32ed5f73ce21bced2d5c163cd19983718ef..13a31798406c708b4a84831682c5bbf31f5cd2c4 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -38,7 +38,7 @@ delv_with_opts() {
 }
 
 rndccmd() {
-    "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 # TODO: Move loadkeys_on to conf.sh.common

diff --git a/bin/tests/system/dnstap/ns2/named.conf.in b/bin/tests/system/dnstap/ns2/named.conf.in
index badc2257bbba25faa7910116a02b83957ccce9f2..cc05db02ffa700ab378615e89f17d8b61d534b79 100644 (file)
--- a/bin/tests/system/dnstap/ns2/named.conf.in
+++ b/bin/tests/system/dnstap/ns2/named.conf.in
@@ -43,7 +43,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/dnstap/ns3/named.conf.in b/bin/tests/system/dnstap/ns3/named.conf.in
index a5ee2ede8b41d50193ce96b7a4b77461907e500d..1626030ba8c5357a18886ca68ec3d19f1e61ad97 100644 (file)
--- a/bin/tests/system/dnstap/ns3/named.conf.in
+++ b/bin/tests/system/dnstap/ns3/named.conf.in
@@ -46,5 +46,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/dnstap/ns4/named.conf.in b/bin/tests/system/dnstap/ns4/named.conf.in
index e2a9207d1fbb7bd81008f87d5b320aad39194694..4a1debf6abb5ab5ac7439a1265cda8f846dfbc85 100644 (file)
--- a/bin/tests/system/dnstap/ns4/named.conf.in
+++ b/bin/tests/system/dnstap/ns4/named.conf.in
@@ -45,5 +45,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index 36202a28ed3b51e6e27a9cf0f83b44888633d9f7..dbd4aed71299d071120192d1e3f85d5147e0499d 100644 (file)
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="+short -p ${PORT}"
-RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf"
+RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../_common/rndc.conf"
 
 status=0
 

diff --git a/bin/tests/system/dnstap/tests_dnstap.py b/bin/tests/system/dnstap/tests_dnstap.py
index ca687b0fc25210486c654c9d4705094256f3ee44..0dbf2aa3b804a7976845f5e4babe5359ceb69787 100644 (file)
--- a/bin/tests/system/dnstap/tests_dnstap.py
+++ b/bin/tests/system/dnstap/tests_dnstap.py
@@ -28,7 +28,7 @@ def run_rndc(server, rndc_command):
     rndc = os.getenv("RNDC")
     port = os.getenv("CONTROLPORT")
 
-    cmdline = [rndc, "-c", "../common/rndc.conf", "-p", port, "-s", server]
+    cmdline = [rndc, "-c", "../_common/rndc.conf", "-p", port, "-s", server]
     cmdline.extend(rndc_command)
 
     subprocess.check_output(cmdline, stderr=subprocess.STDOUT, timeout=10)

diff --git a/bin/tests/system/doth/ns1/named.conf.in b/bin/tests/system/doth/ns1/named.conf.in
index 500675f587882e3b761ac27aff5b63d440b74f7b..b0247dc2d4fa4abb6066de21baf5aa4f2a694a52 100644 (file)
--- a/bin/tests/system/doth/ns1/named.conf.in
+++ b/bin/tests/system/doth/ns1/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/doth/ns2/named.conf.in b/bin/tests/system/doth/ns2/named.conf.in
index 3cb20425c7d4c86e7fe10c7faa4aea9626c92249..e533f47e4a2c1fafc00dd92eb0f111be894c8e34 100644 (file)
--- a/bin/tests/system/doth/ns2/named.conf.in
+++ b/bin/tests/system/doth/ns2/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -55,7 +55,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 tls tls-example-primary {

diff --git a/bin/tests/system/doth/ns3/named.conf.in b/bin/tests/system/doth/ns3/named.conf.in
index 74d3957e2d85bfc83ca408bf995b9def6dabfca0..cd1ab9cfa6e9a02a4d93a21d0ac9d34479116093 100644 (file)
--- a/bin/tests/system/doth/ns3/named.conf.in
+++ b/bin/tests/system/doth/ns3/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -48,7 +48,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 tls tls-v1.2-pfs {

diff --git a/bin/tests/system/doth/ns4/named.conf.in b/bin/tests/system/doth/ns4/named.conf.in
index 077226a488fcf5ec2428fd4ae654c839c52ce808..c7c6c91a58a847f5b9cbe033f2ad29b7a668fa71 100644 (file)
--- a/bin/tests/system/doth/ns4/named.conf.in
+++ b/bin/tests/system/doth/ns4/named.conf.in
@@ -18,7 +18,7 @@
 # startup/reconfiguration was known to cause timeout issues in the CI
 # system, where many tests run in parallel.
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -56,7 +56,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 tls tls-v1.2-pfs {

diff --git a/bin/tests/system/dsdigest/ns2/named.conf.in b/bin/tests/system/dsdigest/ns2/named.conf.in
index d3fd750279214c01b8a9c72e1cc4b4969219444b..b20a027b6d040a10c9921ae7a23e174921faac82 100644 (file)
--- a/bin/tests/system/dsdigest/ns2/named.conf.in
+++ b/bin/tests/system/dsdigest/ns2/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "good" {

diff --git a/bin/tests/system/dsdigest/ns3/named.conf.in b/bin/tests/system/dsdigest/ns3/named.conf.in
index a2b105c31b6e75710ac39f61aff8b4691b514a27..bd4eb83a6ff856f87f146a6e8b2948830f36ddef 100644 (file)
--- a/bin/tests/system/dsdigest/ns3/named.conf.in
+++ b/bin/tests/system/dsdigest/ns3/named.conf.in
@@ -33,7 +33,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/dsdigest/ns4/named.conf.in b/bin/tests/system/dsdigest/ns4/named.conf.in
index e43763bbc02b29a2d44b3ceb2cbe7f46adaafbcf..74e896009ab9ac0e4a31da7e5b6203c42662f4cf 100644 (file)
--- a/bin/tests/system/dsdigest/ns4/named.conf.in
+++ b/bin/tests/system/dsdigest/ns4/named.conf.in
@@ -31,7 +31,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh
index ef02dea8f56a842c093fb9effe3d8fa47b9ab9c4..5fb7ba99df5c8e036d787a4bfc9f9a7609322aa5 100644 (file)
--- a/bin/tests/system/dyndb/tests.sh
+++ b/bin/tests/system/dyndb/tests.sh
@@ -19,7 +19,7 @@ status=0
 n=0
 
 DIGOPTS="@10.53.0.1 -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 newtest() {
        n=$((n + 1))

diff --git a/bin/tests/system/ecdsa/ns2/named.conf.in b/bin/tests/system/ecdsa/ns2/named.conf.in
index fd125d3e9dd35682926ed80accd75ef64db612a2..bb8a89cca927c61aa916050c77cfcabe9e1894a8 100644 (file)
--- a/bin/tests/system/ecdsa/ns2/named.conf.in
+++ b/bin/tests/system/ecdsa/ns2/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/ecdsa/ns3/named.conf.in b/bin/tests/system/ecdsa/ns3/named.conf.in
index f1a80b67f122d6913c81831354caff2cc7e4d616..0053898a164e18635a384575d222b3bbbb65476d 100644 (file)
--- a/bin/tests/system/ecdsa/ns3/named.conf.in
+++ b/bin/tests/system/ecdsa/ns3/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/eddsa/ns2/named.conf.in b/bin/tests/system/eddsa/ns2/named.conf.in
index fd125d3e9dd35682926ed80accd75ef64db612a2..bb8a89cca927c61aa916050c77cfcabe9e1894a8 100644 (file)
--- a/bin/tests/system/eddsa/ns2/named.conf.in
+++ b/bin/tests/system/eddsa/ns2/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/eddsa/ns3/named.conf.in b/bin/tests/system/eddsa/ns3/named.conf.in
index f1a80b67f122d6913c81831354caff2cc7e4d616..0053898a164e18635a384575d222b3bbbb65476d 100644 (file)
--- a/bin/tests/system/eddsa/ns3/named.conf.in
+++ b/bin/tests/system/eddsa/ns3/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/emptyzones/tests.sh b/bin/tests/system/emptyzones/tests.sh
index c968d515c1ba8610fb6604cc2fc072afc2b434d2..6bd9c873e79918973b6c00afba8f9fada6234dbd 100644 (file)
--- a/bin/tests/system/emptyzones/tests.sh
+++ b/bin/tests/system/emptyzones/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 n=0

diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh
index a16659dbc41ddf5af6c70ef018dc7108e69ee0f4..e6d0e079a366f89a7915c7fe4baefc683f80f306 100644 (file)
--- a/bin/tests/system/fetchlimit/tests.sh
+++ b/bin/tests/system/fetchlimit/tests.sh
@@ -18,7 +18,7 @@ set -e
 DIGCMD="$DIG @10.53.0.3 -p ${PORT} +tcp +tries=1 +time=1"
 
 rndccmd() (
-    "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "$@"
 )
 
 burst() {

diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh
index 5ed97eb2371a9a4ec5516987391ddd732a6bf906..b20982dfc89b6140c43c78ff9ebb0710e79d4b02 100644 (file)
--- a/bin/tests/system/filter-aaaa/tests.sh
+++ b/bin/tests/system/filter-aaaa/tests.sh
@@ -21,7 +21,7 @@ n=0
 rm -f dig.out.*
 
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 for conf in conf/good*.conf
 do

diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index 4037f221da259f81732e0bf8db4aa868a3f2b697..1053709ce266247de9e8ca3689cd5b76841271aa 100644 (file)
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -25,7 +25,7 @@ sendcmd() (
 )
 
 rndccmd() {
-    "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 root=10.53.0.1

diff --git a/bin/tests/system/geoip2/tests.sh b/bin/tests/system/geoip2/tests.sh
index b72a870714d3b1b3bf1ba5483a7f8b71ea646ad6..de38e1a20f057983742e056d758f7781c53ca83f 100644 (file)
--- a/bin/tests/system/geoip2/tests.sh
+++ b/bin/tests/system/geoip2/tests.sh
@@ -22,7 +22,7 @@ rm -f dig.out.*
 
 DIGOPTS="+tcp +short -p ${PORT} @10.53.0.2"
 DIGOPTS6="+tcp +short -p ${PORT} @fd92:7065:b8e:ffff::2 -6"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 for conf in conf/good*.conf
 do

diff --git a/bin/tests/system/inline/ns2/named.conf.in b/bin/tests/system/inline/ns2/named.conf.in
index 38e6e90fbf47996df731cfc8fe58fb5072121fda..44b712793e277a5e17b1185178cd19d8523ae212 100644 (file)
--- a/bin/tests/system/inline/ns2/named.conf.in
+++ b/bin/tests/system/inline/ns2/named.conf.in
@@ -13,7 +13,7 @@
 
 // NS2
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/inline/ns3/named.conf.in b/bin/tests/system/inline/ns3/named.conf.in
index 6b3b3cd5bc8f08965546b9184602b23d462e60a4..a74a9bee62f8139eb025f71c462683f894eb831e 100644 (file)
--- a/bin/tests/system/inline/ns3/named.conf.in
+++ b/bin/tests/system/inline/ns3/named.conf.in
@@ -13,7 +13,7 @@
 
 // NS3
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/inline/ns5/named.conf.post b/bin/tests/system/inline/ns5/named.conf.post
index f454b353a298a169eacfcbb6830dcb51076525b1..169c2bb81aabb87b8a48efec7cdb7535ca50fb58 100644 (file)
--- a/bin/tests/system/inline/ns5/named.conf.post
+++ b/bin/tests/system/inline/ns5/named.conf.post
@@ -13,7 +13,7 @@
 
 // NS5
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/inline/ns5/named.conf.pre b/bin/tests/system/inline/ns5/named.conf.pre
index 91844acb225fe3e65330b0c17fddd05e86418656..2018289634829107ee7fd90b4af8598ee6393ce8 100644 (file)
--- a/bin/tests/system/inline/ns5/named.conf.pre
+++ b/bin/tests/system/inline/ns5/named.conf.pre
@@ -13,7 +13,7 @@
 
 // NS5
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/inline/ns6/named.conf.in b/bin/tests/system/inline/ns6/named.conf.in
index 8237f310a9a400004f80fef5b356d12788d2eb60..05de00188d6928c98453af4d050dbed08d96d5c4 100644 (file)
--- a/bin/tests/system/inline/ns6/named.conf.in
+++ b/bin/tests/system/inline/ns6/named.conf.in
@@ -13,7 +13,7 @@
 
 // NS6
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -35,7 +35,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/inline/ns7/named.conf.in b/bin/tests/system/inline/ns7/named.conf.in
index 3a0cf86f56d4655d7a9ee023fe8ca950808f551c..4e99dabea5abcf9582f6b0a8c475f4b6ffb1e8d1 100644 (file)
--- a/bin/tests/system/inline/ns7/named.conf.in
+++ b/bin/tests/system/inline/ns7/named.conf.in
@@ -27,7 +27,7 @@
  * one it was meant for.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/inline/ns8/named.conf.in b/bin/tests/system/inline/ns8/named.conf.in
index 47bb99151b1de57c70830d5f1516910017c66e32..a16bcad2e519d70865307dfdb1c2803b7d46f279 100644 (file)
--- a/bin/tests/system/inline/ns8/named.conf.in
+++ b/bin/tests/system/inline/ns8/named.conf.in
@@ -13,7 +13,7 @@
 
 // NS8
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index e9c455472afc17566acd88bf66069b335b2f8b98..b698162972e4117e75160787a63880ba66d6cc3c 100755 (executable)
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="+tcp +dnssec -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 dig_with_opts() {
        $DIG $DIGOPTS "$@"

diff --git a/bin/tests/system/integrity/ns1/named.conf.in b/bin/tests/system/integrity/ns1/named.conf.in
index 00d9dba3b6bc2986fdeea1844c9bc6a7290be954..c1c092fba92a427b37e3ea1856188e617a3ba67a 100644 (file)
--- a/bin/tests/system/integrity/ns1/named.conf.in
+++ b/bin/tests/system/integrity/ns1/named.conf.in
@@ -28,7 +28,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "mx-cname-fail" {

diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index f1e3b622411cd05a2536d17bcc9da33196bfa8c3..8f04ea6c31d2d4fef791b540581efdf1e6fa8114 100644 (file)
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -30,7 +30,7 @@ status=0
 n=0
 
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
-RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf -s"
+RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../_common/rndc.conf -s"
 
 sendcmd() {
     send 10.53.0.2 "${EXTRAPORT1}"

diff --git a/bin/tests/system/journal/tests.sh b/bin/tests/system/journal/tests.sh
index 5dbceb8feb93cf60ad5a89f3233f38fcc2cd66cc..05a043fc7df58c41f41313872df74d3f94cb6fa4 100644 (file)
--- a/bin/tests/system/journal/tests.sh
+++ b/bin/tests/system/journal/tests.sh
@@ -20,7 +20,7 @@ dig_with_opts() {
 }
 
 rndc_with_opts() {
-    "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 status=0

diff --git a/bin/tests/system/kasp.sh b/bin/tests/system/kasp.sh
index 4c44ac9571d4662c905c8276ef9b18947aacc40b..444fc1e39f9a19559ce0292cdf925f972db098f6 100644 (file)
--- a/bin/tests/system/kasp.sh
+++ b/bin/tests/system/kasp.sh
@@ -159,7 +159,7 @@ _dig_with_opts() {
 
 # RNDC.
 _rndccmd() {
-       "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+       "$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 # Print IDs of keys used for generating RRSIG records for RRsets of type $1

diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh
index ddbbd322c599a2f1a0127733dd6fca6af3ff508a..213cc31fed19cebc93651d853dc930bc4104d267 100644 (file)
--- a/bin/tests/system/kasp/tests.sh
+++ b/bin/tests/system/kasp/tests.sh
@@ -38,7 +38,7 @@ dig_with_opts() {
 
 # RNDC.
 rndccmd() {
-       "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+       "$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 # Log error and increment failure rate.

diff --git a/bin/tests/system/keepalive/ns2/named.conf.in b/bin/tests/system/keepalive/ns2/named.conf.in
index 8ccf1c434320959df9ed94a8c2b38d2825c78ba3..011e1d07413fbf2c935028ca919ad8762dfd2349 100644 (file)
--- a/bin/tests/system/keepalive/ns2/named.conf.in
+++ b/bin/tests/system/keepalive/ns2/named.conf.in
@@ -36,7 +36,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/keepalive/ns3/named.conf.in b/bin/tests/system/keepalive/ns3/named.conf.in
index 3713f1309973769fb1149fca4982becf9bded863..76e5a5bda527042392d95299f903ce4af673eb14 100644 (file)
--- a/bin/tests/system/keepalive/ns3/named.conf.in
+++ b/bin/tests/system/keepalive/ns3/named.conf.in
@@ -41,5 +41,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/keepalive/tests.sh b/bin/tests/system/keepalive/tests.sh
index 7314a9e1c306653d2d13c22a78633fc60532be7a..4aa48b1f20917685a69dd91b68949efa4ceb5afa 100644 (file)
--- a/bin/tests/system/keepalive/tests.sh
+++ b/bin/tests/system/keepalive/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC  -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}"
+RNDCCMD="$RNDC  -c ../_common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}"
 
 n=0
 status=0

diff --git a/bin/tests/system/legacy.run.sh.in b/bin/tests/system/legacy.run.sh.in
index b523637cdb5cf5fe77822e0cdd6fe3ccb13423b3..026e5850c99303aa4d7e987b9cf11046513c1674 100644 (file)
--- a/bin/tests/system/legacy.run.sh.in
+++ b/bin/tests/system/legacy.run.sh.in
@@ -110,8 +110,8 @@ if [ ! -d "${srcdir}/$systest" ]; then
 fi
 
 if [ "${srcdir}" != "${builddir}" ]; then
-    if [ ! -d common ] || [ ! -r common/.prepared ]; then
-        cp -a "${srcdir}/common" "${builddir}"
+    if [ ! -d _common ] || [ ! -r _common/.prepared ]; then
+        cp -a "${srcdir}/_common" "${builddir}"
     fi
     # Some tests require additional files to work for out-of-tree test runs.
     for file in ckdnsrps.sh conftest.py digcomp.pl ditch.pl fromhex.pl get_core_dumps.sh kasp.sh packet.pl pytest_custom_markers.py start.pl stop.pl testcrypto.sh; do

diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.in
index 1f4ef912c75c4548f375dd53c008d7a6ee3464d3..2a84f86f26d73c5244b4a28a9f80c07804ab1073 100644 (file)
--- a/bin/tests/system/masterfile/ns2/named.conf.in
+++ b/bin/tests/system/masterfile/ns2/named.conf.in
@@ -28,7 +28,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index da9ec87ebf30793e87db056acad845d555dd834f..71285de13fbd92ff31b5b5b515b264194677c8d2 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -82,7 +82,7 @@ dig_with_opts() {
 }
 
 rndccmd() {
-    "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "$@"
 }
 
 status=0

diff --git a/bin/tests/system/mirror/ns3/named.conf.in b/bin/tests/system/mirror/ns3/named.conf.in
index b644f459ad893414a29289766ad416d0fb7e1fee..edbfed8da2d1f25750a0e49d1bb45bf3f3092e51 100644 (file)
--- a/bin/tests/system/mirror/ns3/named.conf.in
+++ b/bin/tests/system/mirror/ns3/named.conf.in
@@ -37,7 +37,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "." {

diff --git a/bin/tests/system/mirror/tests.sh b/bin/tests/system/mirror/tests.sh
index dc6cffa7fc00cc687614643b7f731bdd54043188..c877cb9e85bd33ba66438b2cdb73909db2bdae2d 100644 (file)
--- a/bin/tests/system/mirror/tests.sh
+++ b/bin/tests/system/mirror/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT} -b 10.53.0.1 +dnssec +time=2 +tries=1 +multi"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 # Wait until the transfer of the given zone to ns3 either completes
 # successfully or is aborted by a verification failure or a REFUSED response

diff --git a/bin/tests/system/mkeys/ns2/named.conf.in b/bin/tests/system/mkeys/ns2/named.conf.in
index 1c77556f783a68806db29fca98c64038590d2c90..feed9239c1a051dd870d69706c2d2ba12443ae95 100644 (file)
--- a/bin/tests/system/mkeys/ns2/named.conf.in
+++ b/bin/tests/system/mkeys/ns2/named.conf.in
@@ -39,5 +39,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/mkeys/ns3/named.conf.in b/bin/tests/system/mkeys/ns3/named.conf.in
index 374b18444828422fc27dda7967c82cab8fd97291..ed3bf46b6796805222734a10e89ce0417db617b7 100644 (file)
--- a/bin/tests/system/mkeys/ns3/named.conf.in
+++ b/bin/tests/system/mkeys/ns3/named.conf.in
@@ -39,7 +39,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "broken.conf";

diff --git a/bin/tests/system/mkeys/ns4/named.conf.in b/bin/tests/system/mkeys/ns4/named.conf.in
index 5c2370887b58865e74e89ef4a1bb1e09474d1768..1ad75aa0cf204e243696c188dbbb1fd589f037fe 100644 (file)
--- a/bin/tests/system/mkeys/ns4/named.conf.in
+++ b/bin/tests/system/mkeys/ns4/named.conf.in
@@ -39,7 +39,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "sub.foo" {

diff --git a/bin/tests/system/mkeys/ns5/named.conf.in b/bin/tests/system/mkeys/ns5/named.conf.in
index 757d61495ace98f9ff2536c8901f662dfeaaf97d..866997102d7e1b92f78941330881f4de492ff469 100644 (file)
--- a/bin/tests/system/mkeys/ns5/named.conf.in
+++ b/bin/tests/system/mkeys/ns5/named.conf.in
@@ -39,7 +39,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "foo" {

diff --git a/bin/tests/system/mkeys/ns6/named.conf.in b/bin/tests/system/mkeys/ns6/named.conf.in
index 32798592f4962bded4f7844700cabd112d9e55d1..48afcbef8d62e8c6ba74cd3f9958862959d2b9f5 100644 (file)
--- a/bin/tests/system/mkeys/ns6/named.conf.in
+++ b/bin/tests/system/mkeys/ns6/named.conf.in
@@ -38,7 +38,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "managed.conf";

diff --git a/bin/tests/system/mkeys/ns7/named.conf.in b/bin/tests/system/mkeys/ns7/named.conf.in
index b50246a7746f6c86ec75ee809dfbb0f4de03f870..7ccf59ef604ec1998e2ef4ab2da57a26e0158e6f 100644 (file)
--- a/bin/tests/system/mkeys/ns7/named.conf.in
+++ b/bin/tests/system/mkeys/ns7/named.conf.in
@@ -39,13 +39,13 @@ controls {
 view view1 {
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 };
 
 view view2 {
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 };

diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index ed9dcf6f29d2703557cbad34d0435fe84b10284e..2913bf002034fb509203e75d6204a281181d7949 100644 (file)
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -26,7 +26,7 @@ delv_with_opts() (
 )
 
 rndccmd() (
-       "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
+       "$RNDC" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "$@"
 )
 
 mkeys_reconfig_on() (

diff --git a/bin/tests/system/notify/ns2/named.conf.in b/bin/tests/system/notify/ns2/named.conf.in
index bc5af9d1b0f50503ec4459b2bdec2208c7b2e6e5..203f23ca6e50127460efe855286c552033acecec 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf.in
+++ b/bin/tests/system/notify/ns2/named.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/notify/ns3/named.conf.in b/bin/tests/system/notify/ns3/named.conf.in
index ee21f92c0e7da868bd4a969a68273a1232d3f9fa..4761622651ab4f6ccd9c01be4a7479185f160055 100644 (file)
--- a/bin/tests/system/notify/ns3/named.conf.in
+++ b/bin/tests/system/notify/ns3/named.conf.in
@@ -26,7 +26,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/notify/ns4/named.conf.in b/bin/tests/system/notify/ns4/named.conf.in
index 95a0ff9c6b5f2b0beee5440516a3dab271d1a684..2f0b930b42577259362bfc051d03ae99c20d3e0c 100644 (file)
--- a/bin/tests/system/notify/ns4/named.conf.in
+++ b/bin/tests/system/notify/ns4/named.conf.in
@@ -26,7 +26,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "x21" {

diff --git a/bin/tests/system/nsec3/tests.sh b/bin/tests/system/nsec3/tests.sh
index 117bf636a78c0644c82d29d93d1c49b619e509b3..f675bebf7bc4b3ab5556f98d64fe3221878f7f18 100644 (file)
--- a/bin/tests/system/nsec3/tests.sh
+++ b/bin/tests/system/nsec3/tests.sh
@@ -31,7 +31,7 @@ dig_with_opts() {
 
 # Call rndc.
 rndccmd() {
-    "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 # Set zone name ($1) and policy ($2) for testing nsec3.

diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index 44830d4b251b4e7cb4de5a350a83aa4e7a84f926..be853de90eea3acfe17f4e620aa326bc8e8f43de 100755 (executable)
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 #
 # Uncomment when creating credential cache files.

diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh
index 2cfc58f0f161984af2baa97f2fca054d22d8475a..17cec1fe4ec6a750ac9ce5117d9faad99d1c1c4f 100644 (file)
--- a/bin/tests/system/nzd2nzf/tests.sh
+++ b/bin/tests/system/nzd2nzf/tests.sh
@@ -20,7 +20,7 @@ dig_with_opts() {
 }
 
 rndccmd() {
-    "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "$@"
 }
 
 status=0

diff --git a/bin/tests/system/padding/ns2/named.conf.in b/bin/tests/system/padding/ns2/named.conf.in
index 10ba86b6242eac9600bb65719eea50fdac13102d..6f2a34cd1673d051109d22fbdf57f24c7f2d8023 100644 (file)
--- a/bin/tests/system/padding/ns2/named.conf.in
+++ b/bin/tests/system/padding/ns2/named.conf.in
@@ -36,7 +36,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/padding/ns3/named.conf.in b/bin/tests/system/padding/ns3/named.conf.in
index a719249690ba2761a37737ceb50b4ff6b99d78d4..1b44e479cf07ac45238ce798858e190653b0ab4f 100644 (file)
--- a/bin/tests/system/padding/ns3/named.conf.in
+++ b/bin/tests/system/padding/ns3/named.conf.in
@@ -41,5 +41,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/padding/ns4/named.conf.in b/bin/tests/system/padding/ns4/named.conf.in
index 6828f2ab95a9bd53c28b97c751513fa6ffea1056..957175c4b718617205d6d62e900084cbb428739c 100644 (file)
--- a/bin/tests/system/padding/ns4/named.conf.in
+++ b/bin/tests/system/padding/ns4/named.conf.in
@@ -41,5 +41,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/padding/tests.sh b/bin/tests/system/padding/tests.sh
index c952537826fde9b65e5714c8c11e04a5dcce3b85..cfbd49bd7e71929b4bc3353789a22e727a06e41e 100644 (file)
--- a/bin/tests/system/padding/tests.sh
+++ b/bin/tests/system/padding/tests.sh
@@ -19,7 +19,7 @@ n=0
 status=0
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 getcookie() {
        awk '$2 == "COOKIE:" {

diff --git a/bin/tests/system/pending/ns2/named.conf.in b/bin/tests/system/pending/ns2/named.conf.in
index 59824df0a98c580f0f02206f74625da20739aeb8..a403f13fadcdd6afa459b6d34fdd1a4171778458 100644 (file)
--- a/bin/tests/system/pending/ns2/named.conf.in
+++ b/bin/tests/system/pending/ns2/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/pending/ns3/named.conf.in b/bin/tests/system/pending/ns3/named.conf.in
index 29afd19b0d873bd4d6372bc98abd80ff30338754..6d69d67f28d77e7a4adeb260c9f2d9bb6748bacf 100644 (file)
--- a/bin/tests/system/pending/ns3/named.conf.in
+++ b/bin/tests/system/pending/ns3/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "mail.example" {

diff --git a/bin/tests/system/pending/ns4/named.conf.in b/bin/tests/system/pending/ns4/named.conf.in
index dfb55413f8e1fedb08944715d61a66eee200354c..0c2e8a80c600b457bf18eabba249fdca1aa3c9d3 100644 (file)
--- a/bin/tests/system/pending/ns4/named.conf.in
+++ b/bin/tests/system/pending/ns4/named.conf.in
@@ -27,5 +27,5 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.in
index 3679e97b12f7d15f705fd5ade509981f5963b07a..98026893f68f32c3b9234adc69ce36e59194fb98 100644 (file)
--- a/bin/tests/system/pipelined/ns2/named.conf.in
+++ b/bin/tests/system/pipelined/ns2/named.conf.in
@@ -35,7 +35,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "examplea" {

diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.in
index d8943d5b63903d3668ed5bf1450d167f05c3949b..3fe8f56422ae82d0a2b088de578b3303f8bf7e13 100644 (file)
--- a/bin/tests/system/pipelined/ns3/named.conf.in
+++ b/bin/tests/system/pipelined/ns3/named.conf.in
@@ -35,7 +35,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "exampleb" {

diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.in
index 5d4be1c4a9b92123bced68e8cfab725e0a08ada0..a233f6c8f3ecfda44d91747ef3c0d3893585a095 100644 (file)
--- a/bin/tests/system/pipelined/ns4/named.conf.in
+++ b/bin/tests/system/pipelined/ns4/named.conf.in
@@ -37,5 +37,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh
index 26c0d31990cfd500ec702d069782a89b33a905e9..6821107af2fa3625eaf2c904b74ce47c0053e204 100644 (file)
--- a/bin/tests/system/pipelined/tests.sh
+++ b/bin/tests/system/pipelined/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 MDIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 

diff --git a/bin/tests/system/qmin/ns5/named.conf.in b/bin/tests/system/qmin/ns5/named.conf.in
index d84d818a6e1e114cf9c916f21fbee6f9ed3020d9..fac3538387ed6ead66b473a8b78024bcdd48e60d 100644 (file)
--- a/bin/tests/system/qmin/ns5/named.conf.in
+++ b/bin/tests/system/qmin/ns5/named.conf.in
@@ -39,5 +39,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/qmin/ns6/named.conf.in b/bin/tests/system/qmin/ns6/named.conf.in
index 828973cef5111b01d7b4b620e584a2c94a14083b..6301fb2c4e8625e8471aef54b13cece1f249a906 100644 (file)
--- a/bin/tests/system/qmin/ns6/named.conf.in
+++ b/bin/tests/system/qmin/ns6/named.conf.in
@@ -39,5 +39,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/qmin/ns7/named.conf.in b/bin/tests/system/qmin/ns7/named.conf.in
index 8ca32750e3942939ac149b1f162fd6a853939ccd..917e3e768c4ffd656a9e28f02c654da0e2969913 100644 (file)
--- a/bin/tests/system/qmin/ns7/named.conf.in
+++ b/bin/tests/system/qmin/ns7/named.conf.in
@@ -39,7 +39,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "fwd." IN {

diff --git a/bin/tests/system/qmin/tests.sh b/bin/tests/system/qmin/tests.sh
index b8d31285c0d259acdd5fd820bf46c43e2f749a1b..897178c0e87ee8abbfbdb8b79a6573f4ba940b6c 100755 (executable)
--- a/bin/tests/system/qmin/tests.sh
+++ b/bin/tests/system/qmin/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 CLEANQL="rm -f ans*/query.log"
 status=0
 n=0

diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh
index 7e80d2248b85a496555008cc69ce24a95a2f2032..0da8841677d7368958d66328b0ae54648441a36f 100644 (file)
--- a/bin/tests/system/reclimit/tests.sh
+++ b/bin/tests/system/reclimit/tests.sh
@@ -22,8 +22,8 @@ n=0
 
 ns3_reset() {
        copy_setports $1 ns3/named.conf
-       $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reconfig 2>&1 | sed 's/^/I:ns3 /'
-       $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush | sed 's/^/I:ns3 /'
+       $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reconfig 2>&1 | sed 's/^/I:ns3 /'
+       $RNDC -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush | sed 's/^/I:ns3 /'
 }
 
 ns3_sends_aaaa_queries() {

diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in
index 9b887360d85e144b792648f7eeedbd4d43310a68..881a81f9d10a2c67e3f1fa53916e0ed9e87dc00c 100644 (file)
--- a/bin/tests/system/redirect/ns2/named.conf.in
+++ b/bin/tests/system/redirect/ns2/named.conf.in
@@ -42,7 +42,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "." {

diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh
index 83b90ad485eb1a96821cefa110486b6bdafe7f31..4e95ce38dbfab8de6c6f70d5bfd500d3e81b9848 100644 (file)
--- a/bin/tests/system/redirect/tests.sh
+++ b/bin/tests/system/redirect/tests.sh
@@ -21,7 +21,7 @@ n=1
 rm -f dig.out.*
 
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 for conf in conf/good*.conf
 do

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 2232e5b7fc6c099ccc1928ffbdc4ad5d47fe1a09..0f016f23921304d31a7df2e080ca25ced49c494b 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -25,7 +25,7 @@ resolve_with_opts() {
 }
 
 rndccmd() {
-       "${RNDC}" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "${@}"
+       "${RNDC}" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "${@}"
 }
 
 status=0

diff --git a/bin/tests/system/rndc/ns2/named.conf.in b/bin/tests/system/rndc/ns2/named.conf.in
index c3ce3eb65dd474cbd63449be94b4376f8574eaa5..630fa25622ccd495c24273ccbec78cb7949d2770 100644 (file)
--- a/bin/tests/system/rndc/ns2/named.conf.in
+++ b/bin/tests/system/rndc/ns2/named.conf.in
@@ -38,7 +38,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "nil" {

diff --git a/bin/tests/system/rndc/ns3/named.conf.in b/bin/tests/system/rndc/ns3/named.conf.in
index ed159b4410df6bdc585fcb83ed6cbd89e101250b..e3bf42e8c1db4d59fa0a290b1240ee92873fbe6d 100644 (file)
--- a/bin/tests/system/rndc/ns3/named.conf.in
+++ b/bin/tests/system/rndc/ns3/named.conf.in
@@ -40,7 +40,7 @@ view all {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 };
 

diff --git a/bin/tests/system/rndc/ns5/named.conf.in b/bin/tests/system/rndc/ns5/named.conf.in
index e32fa49fdfb43e5a7107a2c96a1dda99c6bf7bc7..51aacd3be2b2cbf6d1bfe49b0c00a51cb6d0ed9f 100644 (file)
--- a/bin/tests/system/rndc/ns5/named.conf.in
+++ b/bin/tests/system/rndc/ns5/named.conf.in
@@ -31,5 +31,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 924507af75af123a6a694486c257d3b1494f3688..d82fcaa7c60b062b78c8e4ad72a6e0c867ac716e 100644 (file)
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -18,7 +18,7 @@ set -e
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd"
 DIGOPTS=""
 DIGCMD="$DIG $DIGOPTS -p ${PORT}"
-RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf -s"
+RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../_common/rndc.conf -s"
 
 status=0
 n=0

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 658250ea2fc74840a8e623b4ea276963d8820835..450d0f7fd9fde3d904d92592c5f333f3e9b8db45 100644 (file)
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -66,7 +66,7 @@ comment () {
 }
 
 DNSRPSCMD=./dnsrps
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 if test -x "$DNSRPSCMD"; then
     # speed up the many delays for dnsrpzd by waiting only 0.1 seconds

diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.in b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
index f838535f8f02263832f2d3ee9793d0552f5a540d..6a1bd1165800c8d9de4916d3c6e82fa77d871b6a 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.in b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
index 40f6b4945955fdd5f15f911748166913284266af..06b2536e807e53fe6f07b96bd807d9b80be99b87 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.in b/bin/tests/system/rpzrecurse/ns3/named3.conf.in
index 3926bf9125c022ef4d60d0cbac5a60502b650d84..ac2e19cac059139b67de16592560b4595b260a67 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named3.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index eed53e82fda138a1933db4fd1aed90f2a685c0d2..894a085c466614bc5dea57504013bcf57f3581a7 100644 (file)
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -42,7 +42,7 @@ fi
 trap 'exit 1' 1 2 15
 
 DNSRPSCMD=../rpz/dnsrps
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 # $1 = test name (such as 1a, 1b, etc. for which named.$1.conf exists)
 run_server() {
@@ -257,7 +257,7 @@ for mode in native dnsrps; do
   echo_i "adding an NSDNAME policy"
   cp ns2/db.6a.00.policy.local ns2/saved.policy.local
   cp ns2/db.6b.00.policy.local ns2/db.6a.00.policy.local
-  $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/ns2 /' | cat_i
+  $RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/ns2 /' | cat_i
   test -f dnsrpzd.pid && kill -USR1 $(cat dnsrpzd.pid) || true
   sleep 1
   t=$((t + 1))
@@ -267,7 +267,7 @@ for mode in native dnsrps; do
   sleep 1
   echo_i "removing the NSDNAME policy"
   cp ns2/db.6c.00.policy.local ns2/db.6a.00.policy.local
-  $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/ns2 /' | cat_i
+  $RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/ns2 /' | cat_i
   test -f dnsrpzd.pid && kill -USR1 $(cat dnsrpzd.pid) || true
   sleep 1
   echo_i "resuming authority server"
@@ -299,7 +299,7 @@ for mode in native dnsrps; do
   kill -STOP $PID
   echo_i "adding an NSDNAME policy"
   cp ns2/db.6b.00.policy.local ns2/db.6a.00.policy.local
-  $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/ns2 /' | cat_i
+  $RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 6a.00.policy.local 2>&1 | sed 's/^/ns2 /' | cat_i
   test -f dnsrpzd.pid && kill -USR1 $(cat dnsrpzd.pid) || true
   sleep 1
   t=$((t + 1))
@@ -494,10 +494,10 @@ for mode in native dnsrps; do
   p1=$((t2 - t1))
   echo_i "elapsed time $p1 seconds"
 
-  $RNDC  -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
+  $RNDC  -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
   copy_setports ns3/named2.conf.in ns3/named.conf
   nextpart ns3/named.run > /dev/null
-  $RNDC  -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
+  $RNDC  -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
   wait_for_log 20 "rpz: policy: reload done" ns3/named.run || ret=1
 
   echo_i "timing 'nsip-wait-recurse no'"
@@ -511,11 +511,11 @@ for mode in native dnsrps; do
   if test $ret != 0; then echo_i "failed"; fi
   status=$((status + ret))
 
-  $RNDC  -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
+  $RNDC  -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
   # restore original named.conf
   copy_setports ns3/named1.conf.in ns3/named.conf
   nextpart ns3/named.run > /dev/null
-  $RNDC  -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
+  $RNDC  -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
   wait_for_log 20 "rpz: policy: reload done" ns3/named.run || ret=1
 
   t=$((t + 1))
@@ -529,10 +529,10 @@ for mode in native dnsrps; do
   p1=$((t2 - t1))
   echo_i "elapsed time $p1 seconds"
 
-  $RNDC  -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
+  $RNDC  -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} flush
   copy_setports ns3/named3.conf.in ns3/named.conf
   nextpart ns3/named.run > /dev/null
-  $RNDC  -c ../common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
+  $RNDC  -c ../_common/rndc.conf -s 10.53.0.3 -p ${CONTROLPORT} reload > /dev/null
   wait_for_log 20 "rpz: policy: reload done" ns3/named.run || ret=1
 
   echo_i "timing 'nsdname-wait-recurse no'"

diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index 9465b93b929de44fa3930a7abae6042cd4325858..dbbb1dd006e33b8744d02cb671ce531b822b1c2d 100644 (file)
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -17,7 +17,7 @@ set -e
 
 . ../conf.sh
 
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 #set -x
 

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.in b/bin/tests/system/rrsetorder/ns3/named.conf.in
index a5850ca34472db01d068aae9ed18320c16204624..807fa37820d39251582efab2de554fe71c4ae4ef 100644 (file)
--- a/bin/tests/system/rrsetorder/ns3/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.in
@@ -34,5 +34,5 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.in b/bin/tests/system/rrsetorder/ns4/named.conf.in
index d12f50f833a95e59457cced9365ed0007590e39c..d5fc5274aee684343909fb702f2df2454b2e33f7 100644 (file)
--- a/bin/tests/system/rrsetorder/ns4/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.in
@@ -30,5 +30,5 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.in b/bin/tests/system/rrsetorder/ns5/named.conf.in
index d1a4cfae8bbf1ae6e18a62c38d3c79dc154241ad..c0836d320a4fd83814bce6b613ba0496a0a25b9b 100644 (file)
--- a/bin/tests/system/rrsetorder/ns5/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns5/named.conf.in
@@ -26,5 +26,5 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.in b/bin/tests/system/rsabigexponent/ns2/named.conf.in
index c81b3f68eed3dfaf501a68c02b28dee1a1c1dbbe..267daa6ae9cdd6d9dff5ac97d241d778fafcfb1e 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.in
@@ -28,7 +28,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/rsabigexponent/ns3/named.conf.in b/bin/tests/system/rsabigexponent/ns3/named.conf.in
index bc6365603818ae054b1ba5bd9460e8abc733c727..6504886b56b473fa82735df8ce5b151fb3961cbe 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns3/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns3/named.conf.in
@@ -29,7 +29,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 6fd428ea6d86791e35b7bfe8b018fceb0a3c9c6f..e4be62cf07160b82ffffd0e4698729e2df6d913a 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -16,7 +16,7 @@ set -e
 # shellcheck source=conf.sh
 . ../conf.sh
 
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 NAMED_DEFAULT_ARGS="-m record -d 99 -g -U 4"
 
 kill_named() {

diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh
index 8c5ce843546677ef8fd84cc0d1f6f9749f2d61ea..b1db4469a22c45b9da7901bc89ba5fcb9557ffc5 100755 (executable)
--- a/bin/tests/system/serve-stale/tests.sh
+++ b/bin/tests/system/serve-stale/tests.sh
@@ -15,7 +15,7 @@ set -e
 
 . ../conf.sh
 
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 DIG="$DIG +time=12 +tries=1"
 
 max_stale_ttl=$(sed -ne 's,^[[:space:]]*max-stale-ttl \([[:digit:]]*\).*,\1,p' $TOP_SRCDIR/bin/named/config.c)

diff --git a/bin/tests/system/sfcache/ns2/named.conf.in b/bin/tests/system/sfcache/ns2/named.conf.in
index afb5a86212a8eb068d23d30f0ee4fc6aec454177..7052ac66a1b751348204fcba5522ab51ed7e4785 100644 (file)
--- a/bin/tests/system/sfcache/ns2/named.conf.in
+++ b/bin/tests/system/sfcache/ns2/named.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/sfcache/ns5/named.conf.in b/bin/tests/system/sfcache/ns5/named.conf.in
index 272d65b515bc6437362a7595df10c081480e2bf2..36bfb96759d59ea52a15c4ccd2f3694f660f0e63 100644 (file)
--- a/bin/tests/system/sfcache/ns5/named.conf.in
+++ b/bin/tests/system/sfcache/ns5/named.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/sfcache/tests.sh b/bin/tests/system/sfcache/tests.sh
index d2aeee701f15e3709971b8353b784215d7785dc6..fdf6f1ede2381d70ab7fa89c2925048825c39431 100644 (file)
--- a/bin/tests/system/sfcache/tests.sh
+++ b/bin/tests/system/sfcache/tests.sh
@@ -26,7 +26,7 @@ dig_with_opts() {
 }
 
 rndc_with_opts() {
-    "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
+    "$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
 }
 
 echo_i "checking DNSSEC SERVFAIL is cached ($n)"

diff --git a/bin/tests/system/shutdown/tests_shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
index 89cada2bb77a9069efd6860c93ccbfcc4d6c49b1..19f853bc32b4b88cf5c0dd8718cd569781017557 100755 (executable)
--- a/bin/tests/system/shutdown/tests_shutdown.py
+++ b/bin/tests/system/shutdown/tests_shutdown.py
@@ -175,8 +175,8 @@ def test_named_shutdown(named_port, control_port, kill_method):
     rndc = os.getenv("RNDC")
     assert rndc is not None
 
-    # rndc configuration resides in ../common/rndc.conf
-    rndc_cfg = os.path.join("..", "common", "rndc.conf")
+    # rndc configuration resides in ../_common/rndc.conf
+    rndc_cfg = os.path.join("..", "_common", "rndc.conf")
     assert os.path.isfile(rndc_cfg)
 
     # rndc command with default arguments.

diff --git a/bin/tests/system/staticstub/ns2/named.conf.in b/bin/tests/system/staticstub/ns2/named.conf.in
index 55483ab0ecfa2eb93c08e7ecf1a0581a1f936f43..a73407174f24122d128bacc84657dd045129e5eb 100644 (file)
--- a/bin/tests/system/staticstub/ns2/named.conf.in
+++ b/bin/tests/system/staticstub/ns2/named.conf.in
@@ -37,7 +37,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index e0f578858ad34ea4891917f98b136ad36da76106..ec23795faa6f323f4bb0c1f315fa1b51fee7336e 100755 (executable)
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 n=0

diff --git a/bin/tests/system/statistics/ns2/named.conf.in b/bin/tests/system/statistics/ns2/named.conf.in
index 48fb8b481fff850262de2ef2e8b3f44ed14cff1c..30c46518f85084c5b548ba32b0b2d2d53c47a315 100644 (file)
--- a/bin/tests/system/statistics/ns2/named.conf.in
+++ b/bin/tests/system/statistics/ns2/named.conf.in
@@ -40,7 +40,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/statistics/ns2/named2.conf.in b/bin/tests/system/statistics/ns2/named2.conf.in
index d370931d39073ae970faed2d320d99792938ac48..39772f98221f8ab7e57c3feeb9ac3f2663453863 100644 (file)
--- a/bin/tests/system/statistics/ns2/named2.conf.in
+++ b/bin/tests/system/statistics/ns2/named2.conf.in
@@ -40,7 +40,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh
index af57b60e2c431231816d57880231ab75007f7ad1..a5ecab8e7593d0dbfbbcd6d83171dc5308e35d3c 100644 (file)
--- a/bin/tests/system/statistics/tests.sh
+++ b/bin/tests/system/statistics/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGCMD="$DIG +tcp -p ${PORT}"
-RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf"
+RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../_common/rndc.conf"
 
 status=0
 

diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index f06cad40f68abdc8b72e260f8fd896c675f2ef16..e468d446727a1d3efbbb2cdc06931ce07c1b2e4f 100644 (file)
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -17,7 +17,7 @@ set -e
 . ../conf.sh
 
 DIGCMD="$DIG @10.53.0.2 -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 if ! $FEATURETEST --have-json-c
 then

diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 572f709474f0641b5b32310851ee47033000c75b..24776fb494af3a343ae187677be82d3fe3625a7f 100644 (file)
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -189,7 +189,7 @@ sub stop_rndc {
        my $how = $halt ? "halt" : "stop";
 
        # Ugly, but should work.
-       system("$RNDC -c ../common/rndc.conf -s $ip -p $port $how | sed 's/^/I:$test:$server /'");
+       system("$RNDC -c ../_common/rndc.conf -s $ip -p $port $how | sed 's/^/I:$test:$server /'");
        return;
 }
 

diff --git a/bin/tests/system/stress/tests_stress_update.py b/bin/tests/system/stress/tests_stress_update.py
index d326f14b7f21af271cbb09a2cdfd65902a925b5a..46ac1c97de906321666d50e43b5fb882f12615cd 100644 (file)
--- a/bin/tests/system/stress/tests_stress_update.py
+++ b/bin/tests/system/stress/tests_stress_update.py
@@ -24,7 +24,7 @@ def rndc_loop(test_state, server):
     cmdline = [
         rndc,
         "-c",
-        "../common/rndc.conf",
+        "../_common/rndc.conf",
         "-p",
         port,
         "-s",

diff --git a/bin/tests/system/stub/ns2/named.conf.in b/bin/tests/system/stub/ns2/named.conf.in
index 1f006e0b8f8dbc0a299aeba1b6ce5c885a2a3ee1..3aa1e6623eec39da7e17132ae3713256fcf39eb7 100644 (file)
--- a/bin/tests/system/stub/ns2/named.conf.in
+++ b/bin/tests/system/stub/ns2/named.conf.in
@@ -27,7 +27,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "child.example" {

diff --git a/bin/tests/system/stub/ns3/named.conf.in b/bin/tests/system/stub/ns3/named.conf.in
index e8e432f316309095f246cab20d749ebf095e1381..a8e692f186e4cb3767f79d76258989ff677665c8 100644 (file)
--- a/bin/tests/system/stub/ns3/named.conf.in
+++ b/bin/tests/system/stub/ns3/named.conf.in
@@ -27,7 +27,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/stub/ns5/named.conf.in b/bin/tests/system/stub/ns5/named.conf.in
index 39e38cc4d5173247e7fcf3233c9b0737986310b9..ce1021b2ee052ffc1e915e16b32acee35df6c369 100644 (file)
--- a/bin/tests/system/stub/ns5/named.conf.in
+++ b/bin/tests/system/stub/ns5/named.conf.in
@@ -24,7 +24,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/synthfromdnssec/tests.sh b/bin/tests/system/synthfromdnssec/tests.sh
index 1bfd00bda5929f8480ddfce5ab3f15a870803970..24c19c2cf69893aaba862fe812dac8d361d590c8 100644 (file)
--- a/bin/tests/system/synthfromdnssec/tests.sh
+++ b/bin/tests/system/synthfromdnssec/tests.sh
@@ -16,7 +16,7 @@
 # shellcheck source=conf.sh
 . ../conf.sh
 
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 set -e
 

diff --git a/bin/tests/system/tcp/ns2/named.conf.in b/bin/tests/system/tcp/ns2/named.conf.in
index 0a97093192ff441e0ad2f931f2c9a15aabf44eae..65c1f40af092b7778e0051599280fe3b4726048b 100644 (file)
--- a/bin/tests/system/tcp/ns2/named.conf.in
+++ b/bin/tests/system/tcp/ns2/named.conf.in
@@ -37,7 +37,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/tcp/ns3/named.conf.in b/bin/tests/system/tcp/ns3/named.conf.in
index 8516d721bbaa93c5d05ba4ca3bfc1748bd296c7b..82ba791d2cb189498c415930783389e5f532ffda 100644 (file)
--- a/bin/tests/system/tcp/ns3/named.conf.in
+++ b/bin/tests/system/tcp/ns3/named.conf.in
@@ -38,5 +38,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/tcp/ns4/named.conf.in b/bin/tests/system/tcp/ns4/named.conf.in
index a7758cc9e94fdb7cc0712475b76f58bc34c2dbca..5982230441ae69a85b25b5dfaf138d8057525c1d 100644 (file)
--- a/bin/tests/system/tcp/ns4/named.conf.in
+++ b/bin/tests/system/tcp/ns4/named.conf.in
@@ -40,5 +40,5 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/tcp/ns5/named.conf.in b/bin/tests/system/tcp/ns5/named.conf.in
index bd754f714b0c2bdbbf64274f62155e7a19f6e35f..05e56f7c742741dce2dacc2a0f7d93974b769bb0 100644 (file)
--- a/bin/tests/system/tcp/ns5/named.conf.in
+++ b/bin/tests/system/tcp/ns5/named.conf.in
@@ -41,5 +41,5 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh
index 12ca6790d610ca6c8ef490d04f54836244b2be55..f1f070c20628a9f1cc9cee2f3ed0ec8c8804ccf8 100644 (file)
--- a/bin/tests/system/tcp/tests.sh
+++ b/bin/tests/system/tcp/tests.sh
@@ -21,7 +21,7 @@ dig_with_opts() {
 }
 
 rndccmd() {
-       "${RNDC}" -p "${CONTROLPORT}" -c ../common/rndc.conf -s "$@"
+       "${RNDC}" -p "${CONTROLPORT}" -c ../_common/rndc.conf -s "$@"
 }
 
 status=0

diff --git a/bin/tests/system/timeouts/ns1/named.conf.in b/bin/tests/system/timeouts/ns1/named.conf.in
index 1c4654984a33d37e595c7eabc821ae6c1b0ca6db..b7d468b3822d20c275bff39616276ab760723af2 100644 (file)
--- a/bin/tests/system/timeouts/ns1/named.conf.in
+++ b/bin/tests/system/timeouts/ns1/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
index 864542f69497701db2788b44bc4abe15bcfc6651..21557d9f405f212f11b03c5f5b2464c56be88e4d 100644 (file)
--- a/bin/tests/system/tkey/tests.sh
+++ b/bin/tests/system/tkey/tests.sh
@@ -96,7 +96,7 @@ n=$((n+1))
 
 echo_i "checking the key with 'rndc tsig-list' ($n)"
 ret=0
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-list > rndc.out.test$n
+$RNDC -c ../_common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-list > rndc.out.test$n
 grep "key \"bar.example.server" rndc.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then
         echo_i "failed"
@@ -116,8 +116,8 @@ n=$((n+1))
 
 echo_i "deleting the key with 'rndc tsig-delete' ($n)"
 ret=0
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-delete bar.example.server > /dev/null || ret=1
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-list > rndc.out.test$n
+$RNDC -c ../_common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-delete bar.example.server > /dev/null || ret=1
+$RNDC -c ../_common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-list > rndc.out.test$n
 grep "key \"bar.example.server" rndc.out.test$n > /dev/null && ret=1
 dig_with_opts -k "$keyname" txt.example txt > dig.out.test$n || ret=1
 grep "TSIG could not be validated" dig.out.test$n > /dev/null || ret=1
@@ -141,7 +141,7 @@ n=$((n+1))
 
 echo_i "checking the new key with 'rndc tsig-list' ($n)"
 ret=0
-$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-list > rndc.out.test$n
+$RNDC -c ../_common/rndc.conf -s 10.53.0.1 -p "$CONTROLPORT" tsig-list > rndc.out.test$n
 grep "key \"bar.example.server" rndc.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then
         echo_i "failed"

diff --git a/bin/tests/system/transport-acl/ns1/named.conf.in b/bin/tests/system/transport-acl/ns1/named.conf.in
index cf0ccd5d70ae1d05277916c38b9f19fa9a147dc8..d2a941a7f2d988e2f8b42da23fbb99d258dabe28 100644 (file)
--- a/bin/tests/system/transport-acl/ns1/named.conf.in
+++ b/bin/tests/system/transport-acl/ns1/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/ttl/ns1/named.conf.in b/bin/tests/system/ttl/ns1/named.conf.in
index 51eee0cd336e1a4a064ca3ffed4419fd1149b9a2..6864614a3b8a4412b3ebae7e3f67099a32aab525 100644 (file)
--- a/bin/tests/system/ttl/ns1/named.conf.in
+++ b/bin/tests/system/ttl/ns1/named.conf.in
@@ -35,7 +35,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "min-example" {

diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index 9b49fbdfb217adc3094863028c35a75ab528128a..c81b0ec1960a06fe212c9500f9d541e6e082afb6 100644 (file)
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -20,7 +20,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
-RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf"
+RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../_common/rndc.conf"
 
 status=0
 n=1

diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index 4a257c049eb47ddefb946f90c68b401bd9886d01..d79a35ee72a630adbade1dedd6c18c9dec70e763 100644 (file)
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in
index 8a4d77385e312066a04633efaf8a180446f217fa..8819f5059a515e979c4ae608b69c872bea266d22 100644 (file)
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -39,7 +39,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "example" {
@@ -74,7 +74,7 @@ view "external" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "example" {

diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in
index b4fbf417cd780b2d9bc1a12411d08b055168de19..a4cb2437591d1a68774eaf1469354b5e923a1b86 100644 (file)
--- a/bin/tests/system/views/ns3/named1.conf.in
+++ b/bin/tests/system/views/ns3/named1.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in
index 0ef2009732763858c56c1e4c6a07f8df4db3620f..0f819fa0cfca8214446c9936168911eca1050829 100644 (file)
--- a/bin/tests/system/views/ns3/named2.conf.in
+++ b/bin/tests/system/views/ns3/named2.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.in
index 4c4ee4e27133137c83da706b5c5b41b0d89667b1..23556a79e381b0c02dd830c79286677352edd529 100644 (file)
--- a/bin/tests/system/views/ns5/named.conf.in
+++ b/bin/tests/system/views/ns5/named.conf.in
@@ -36,7 +36,7 @@ controls {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "child.clone" {

diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 06cb3b1a5f26d928927889fc2c3c3b1f8d8ccf3b..27edee7131f970a82d603d2116d399f3a1a8ec54 100644 (file)
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -24,7 +24,7 @@ dig_with_shortopts() {
        "$DIG" +tcp +short -p "${PORT}" "$@"
 }
 
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0
 

diff --git a/bin/tests/system/wildcard/ns2/named.conf.in b/bin/tests/system/wildcard/ns2/named.conf.in
index a9a2a7076d91199eeefcc8e2b20f5f5ac5539f13..9d90299b16fd885c515eba61a9dff455369d1c37 100644 (file)
--- a/bin/tests/system/wildcard/ns2/named.conf.in
+++ b/bin/tests/system/wildcard/ns2/named.conf.in
@@ -26,5 +26,5 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/wildcard/ns3/named.conf.in b/bin/tests/system/wildcard/ns3/named.conf.in
index 0b958fa1a2919de6417b58964214b641532ca0b2..f7e20eadae650c86c2804d9dfae397591af57291 100644 (file)
--- a/bin/tests/system/wildcard/ns3/named.conf.in
+++ b/bin/tests/system/wildcard/ns3/named.conf.in
@@ -28,5 +28,5 @@ include "../ns1/trusted.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/wildcard/ns5/named.conf.in b/bin/tests/system/wildcard/ns5/named.conf.in
index 1cd358dc6f96d96034172907d068e31d750dad99..3668ee39f0a4ab75aa9bb75bf6faa29cc4267fd7 100644 (file)
--- a/bin/tests/system/wildcard/ns5/named.conf.in
+++ b/bin/tests/system/wildcard/ns5/named.conf.in
@@ -28,5 +28,5 @@ include "../ns1/trusted.conf";
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };

diff --git a/bin/tests/system/xfer/ns1/named1.conf.in b/bin/tests/system/xfer/ns1/named1.conf.in
index d7ce42039516842b5b13eba4982da8ea9dd8e917..74111e0f1f93dca99239c3559075a773bc19be0a 100644 (file)
--- a/bin/tests/system/xfer/ns1/named1.conf.in
+++ b/bin/tests/system/xfer/ns1/named1.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/xfer/ns1/named2.conf.in b/bin/tests/system/xfer/ns1/named2.conf.in
index b349c33934a0a81e6c4b1d825050df31c02172da..401de479ecaaa78becb293f406db089a5def5260 100644 (file)
--- a/bin/tests/system/xfer/ns1/named2.conf.in
+++ b/bin/tests/system/xfer/ns1/named2.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/xfer/ns1/named3.conf.in b/bin/tests/system/xfer/ns1/named3.conf.in
index 05af9614cb2b3fc51722a52a85f8561e25c13ce8..b195986cdaca593ad9315468ec25ef3c39afd4c5 100644 (file)
--- a/bin/tests/system/xfer/ns1/named3.conf.in
+++ b/bin/tests/system/xfer/ns1/named3.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.in
index b81bd1c35ee3c182921b30d82e2b88135fc74244..81649ffe32292e995d2d927cebed6e6a93310da8 100644 (file)
--- a/bin/tests/system/xfer/ns2/named.conf.in
+++ b/bin/tests/system/xfer/ns2/named.conf.in
@@ -46,7 +46,7 @@ acl tzkey {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.in
index 16d0759b47380f6e9e7cabcae02579cf3592d7dc..dcc6472baf0ef50c0a38d3d126ff68b0bd76e94e 100644 (file)
--- a/bin/tests/system/xfer/ns3/named.conf.in
+++ b/bin/tests/system/xfer/ns3/named.conf.in
@@ -40,7 +40,7 @@ key tsigzone. {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "example" {

diff --git a/bin/tests/system/xfer/ns6/named.conf.in b/bin/tests/system/xfer/ns6/named.conf.in
index 87397b0619fb4115e71fb4a53f42ba9726833313..142383c89a80b7ff89cff7b6d4f2b3ff378f0c9f 100644 (file)
--- a/bin/tests/system/xfer/ns6/named.conf.in
+++ b/bin/tests/system/xfer/ns6/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -35,7 +35,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "primary" {

diff --git a/bin/tests/system/xfer/ns7/named.conf.in b/bin/tests/system/xfer/ns7/named.conf.in
index 47a9b0576773aa9a8c682c03dfa1dac14013488b..41ea1cbc2a2b26ae7a73d0000b3cc468a72e75ae 100644 (file)
--- a/bin/tests/system/xfer/ns7/named.conf.in
+++ b/bin/tests/system/xfer/ns7/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.7 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@@ -34,7 +34,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "primary2" {

diff --git a/bin/tests/system/xfer/ns8/named.conf.in b/bin/tests/system/xfer/ns8/named.conf.in
index 831e9341cd15c69f56e016e05255f298a0756a6d..3846d4e27dbfd67f8a8b648394b507b55db42d8c 100644 (file)
--- a/bin/tests/system/xfer/ns8/named.conf.in
+++ b/bin/tests/system/xfer/ns8/named.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-include "../../common/rndc.key";
+include "../../_common/rndc.key";
 
 controls {
        inet 10.53.0.8 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index f012d8b3ff59e59dd16682bfb59fb3334395f37e..d2db51ae2da081e86d0afa8e105a9228d176de0e 100755 (executable)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 NS_PARAMS="-X named.lock -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152"
 
 status=0

diff --git a/bin/tests/system/xferquota/ns2/named.conf.in b/bin/tests/system/xferquota/ns2/named.conf.in
index f21938e03512f4ec35ad36537f4fdb8e6fd56f24..a82fa44c2bddb79db950d22e4cf87259ceddb754 100644 (file)
--- a/bin/tests/system/xferquota/ns2/named.conf.in
+++ b/bin/tests/system/xferquota/ns2/named.conf.in
@@ -29,7 +29,7 @@ options {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 zone "changing." {

diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index 46dfba05399a4269f8f21a667abb389022ef9e8c..98996ed208c8249a65820e0e858c9014e08613aa 100755 (executable)
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 #
 # Perform tests

diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh
index 958bfed99a55df7dc16323d5bd0ace5606e52a1d..eb964e21904ccef67cde240231e844592330a215 100644 (file)
--- a/bin/tests/system/zonechecks/tests.sh
+++ b/bin/tests/system/zonechecks/tests.sh
@@ -16,7 +16,7 @@ set -e
 . ../conf.sh
 
 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
 
 status=0