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.

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 6c5bae15c1a94539752778797d1181488a6b6ac6..6c12b02617529594fa2b14167af0636855c8a02e 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 cbf461bcf09003b90afd022afdcd955ecba4b248..59d3897bea47208c71c9500e5d4c99fa1e7655b5 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 bb03efd75d71876478a1ddc96d9f7ac574615878..116a29875cb99661407a2d9345b9182246d1a728 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 b4e20d5ebd2ae6249ddf63eb77e5ac03c42f7f8a..5688ab2cfdcf3e90df642860561917dfa3a3b7c9 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 868d46492f9d6992d9867d0c259f198e05cf07bc..b0fdd627a6243bf22c52b3d049fb6ea9f33d92ce 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 e24080f064a225e8233a1f6ee794009afb0e4acb..b4338da51523b576831d7036fb412cdefd98e4e3 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 57530360263374983f24b8a1a1c49654a8a9420f..d37a9494adef9c892226e698a8ed7a310c206e80 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 131da000482f81d41507521da2d9a2ade039c546..af0e3a63c848fc7ab69a47a8c8ced512e8d6ec5f 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 a9cb0b21f3c7d6dcb3aa7e2e7dd3e6f0fc71a3be..1dbafbd7735f5c5b838f133b601febcf5038715b 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 372f4f3655ddb34b5410b17b0ab7b25b54ea9f68..4d961a5776886c51fb8ad55348a1c78766214b61 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 5dc3e776ea12861b872cbae6496b79e590536b5e..75ab352676e4532c265735d82e9aa79db1363ff7 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 975b039a5f7cc04b99adb4fcd0f7bd002d6b4b28..0a90219efa71013c5dc60803174b125e089da4b2 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 c9b11aee8260030bb69455ae7322895093da0968..faec50e6a2a66e400872acb705a5efd9fe39a9aa 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 54a45f22ea18b8c996f79b3c58fa202e7b4ab63c..dcd663ba0a06652c168d4a00331d0c3d520a3b93 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 2eb9191a374bf0427a7d13f47743e8e058209f38..2349d9235796fdd04d2b85252494a31ed51fc33a 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 0dad4bde0d886cf80c73e4a233dc8db2b7bae33e..83da46459529402a3b30d9dd789c7e030a1b990c 100644 (file)
--- a/bin/tests/system/autosign/ns2/named.conf.in
+++ b/bin/tests/system/autosign/ns2/named.conf.in
@@ -72,7 +72,7 @@ dnssec-policy "optout" {
 
 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 343c743af3e51d2a9d514f8b29ce296f411c04a1..ded882ee7bc3b7e3d85368f23d2ee9685deae236 100644 (file)
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -122,7 +122,7 @@ dnssec-policy "rsasha512" {
 
 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 28045bc5c459f4d2beeee8172c2be0bac0678bf4..24a68cf90226de5244d4f5de10de6b4fe62c6eb4 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 9151fc30ee37d6f2a08e336cbd68113ebbe32f38..8fe02a95002b7979bbf044fa8c55a3f336b28486 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 a648c95a50fdaada92e4b476aa54ff317e2d80a5..4d325b68edd78316518da7369a45e18d8016bf4d 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 7ffec5a809ac0259f6afb111b60ae4c58c388075..fdf8041f31927ed40556032336a8333721670784 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 2ee9da4d31310ee8b492ce3248e48ebf1460e928..9de019b6b44ff83a07e41d60a80ca9c3a0914a1b 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 5ca4e3e7d677f2572c712289d38d1ef3400e1f4a..99055688586a9d3312e1b100dc28a23d0525285e 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 b1bbc1ea196291ad5d627e9ed73910990485b795..59a75b0a295ab52248a885862fa8e42e73067f6a 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 fffd17016ebaa210509f45697eeca50c12f5ca77..daf9a4cfc1ceeec4145ae43ba72543da60cf8bb8 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() (
@@ -661,7 +661,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))
 
@@ -688,7 +688,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))
 
@@ -1745,7 +1745,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 5d0b0d44081ab009d294ee24c3b5fc2bb764517e..8342f947abdd98e2fdd0ff889d0b983c22910a28 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 "ns2" {

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 01a2d11f94f29536beb8fbb27a71b874784c03c7..ecc14860cccbce047e5075af6286d0d1590d2a23 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 "ns2" {

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/ns9/named.conf.in b/bin/tests/system/checkds/ns9/named.conf.in
index 54dea08527db4be02f791b4531866e4eda4c1440..0f2ec838e9f1e7e201aabbe76f6a9080c2376da0 100644 (file)
--- a/bin/tests/system/checkds/ns9/named.conf.in
+++ b/bin/tests/system/checkds/ns9/named.conf.in
@@ -43,7 +43,7 @@ parental-agents "ns8" port @PORT@ {
 
 zone "." {
        type hint;
-       file "../../common/root.hint";
+       file "../../_common/root.hint";
 };
 
 /*

diff --git a/bin/tests/system/checkds/tests_checkds.py b/bin/tests/system/checkds/tests_checkds.py
index 99c91c6168a0640d8352bd4f5865e76901cdbf78..515f3ff8eb73db80637b122958bafa800abe0373 100755 (executable)
--- a/bin/tests/system/checkds/tests_checkds.py
+++ b/bin/tests/system/checkds/tests_checkds.py
@@ -244,7 +244,7 @@ def rekey(zone):
     rndc_cmd = [
         rndc,
         "-c",
-        "../common/rndc.conf",
+        "../_common/rndc.conf",
         "-p",
         port,
         "-s",

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index b7d475a4fc2cdec2edd9c7b62650d7e2215cfb99..471741c1fe691f6af7e2155c33acdfe66e1aef3c 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -288,7 +288,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
 
 #
@@ -601,12 +601,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
@@ -614,9 +614,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
 }
@@ -628,7 +628,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.
@@ -643,7 +643,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 570b7351ff8bec52b345b89fb66a61f53109172e..fe5ef6e53b602e4154aeaa81a5ecf2a44d638d45 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 6a6c2b9fb71feb5b7c44867238802fca28655038..c9fdcd79ab798183f211e9f99ff45ca67cde1ada 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/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index dbcb0c44499486c15db07695dfae167daae62bb3..d98e6152393164f032d573d34c1d5080866de2f3 100644 (file)
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -1405,7 +1405,7 @@ if [ -x "$DELV" ] ; then
 
   n=$((n+1))
   echo_i "check NS output from delv +ns ($n)"
-  delv_with_opts -i +ns +nortrace +nostrace +nomtrace +novtrace +hint=../common/root.hint ns example > delv.out.test$n || ret=1
+  delv_with_opts -i +ns +nortrace +nostrace +nomtrace +novtrace +hint=../_common/root.hint ns example > delv.out.test$n || ret=1
   lines=$(awk '$1 == "example." && $4 == "NS" {print}' delv.out.test$n | wc -l)
   [ $lines -eq 2 ] || ret=1
   status=$((status+ret))
@@ -1413,7 +1413,7 @@ if [ -x "$DELV" ] ; then
   n=$((n+1))
   echo_i "checking delv +ns (no validation) ($n)"
   ret=0
-  delv_with_opts -i +ns +hint=../common/root.hint a a.example > delv.out.test$n || ret=1
+  delv_with_opts -i +ns +hint=../_common/root.hint a a.example > delv.out.test$n || ret=1
   grep -q '; authoritative' delv.out.test$n || ret=1
   grep -q '_.example' delv.out.test$n && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1422,7 +1422,7 @@ if [ -x "$DELV" ] ; then
   n=$((n+1))
   echo_i "checking delv +ns +qmin (no validation) ($n)"
   ret=0
-  delv_with_opts -i +ns +qmin +hint=../common/root.hint a a.example > delv.out.test$n || ret=1
+  delv_with_opts -i +ns +qmin +hint=../_common/root.hint a a.example > delv.out.test$n || ret=1
   grep -q '; authoritative' delv.out.test$n || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
   status=$((status+ret))
@@ -1430,7 +1430,7 @@ if [ -x "$DELV" ] ; then
   n=$((n+1))
   echo_i "checking delv +ns (with validation) ($n)"
   ret=0
-  delv_with_opts -a ns1/anchor.dnskey +root +ns +hint=../common/root.hint a a.example > delv.out.test$n || ret=1
+  delv_with_opts -a ns1/anchor.dnskey +root +ns +hint=../_common/root.hint a a.example > delv.out.test$n || ret=1
   grep -q '; fully validated' delv.out.test$n || ret=1
   grep -q '_.example' delv.out.test$n && ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1439,7 +1439,7 @@ if [ -x "$DELV" ] ; then
   n=$((n+1))
   echo_i "checking delv +ns +qmin (with validation) ($n)"
   ret=0
-  delv_with_opts -a ns1/anchor.dnskey +root +ns +qmin +hint=../common/root.hint a a.example > delv.out.test$n || ret=1
+  delv_with_opts -a ns1/anchor.dnskey +root +ns +qmin +hint=../_common/root.hint a a.example > delv.out.test$n || ret=1
   grep -q '; fully validated' delv.out.test$n || ret=1
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
   status=$((status+ret))

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 a86ea7e9ca2891c9477549db5cde78ab1b9a8983..96f244f691303f2bda28961b7cbf21667a163e0e 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 92cc03d8fcb09dd230711eab3bb989321b4559d7..39f1cea26e9c8937219d2b2d50847a89eb7eeeda 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -68,7 +68,7 @@ dnssec-policy "not-enough-hours-in-day" {
 
 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 ee4b766d9fd6973fe88363eec7146b738a25e4f4..f3675f4c31406441cb124482ea8e6b3054a71e00 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -75,7 +75,7 @@ dnssec-policy "autonsec3" {
 
 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 5daa9bff50546b15379a5bb092d078057f938de5..1917f2013497a739f3fd1c521716074d29daac6f 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 c5d4f0aa555941b174799bb038e663a9676d0ea2..88a3971f6f5b9b64283e2affc4f4089d963b7f1f 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 2448184ce2a3b84ce2f07ca551b6cd47b53aa71b..ba1b96596c14b1109e0bde0be7ffd440cdf6a7bb 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 5605c78d19cb3f59c337b000d6d6fff2e85b1420..c7d7e4d5e5ab73bb030a95e3e55873d80c322c48 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 25fc893ebfdbfcdde164e840f62bd7cab9aebc4c..e367b6052fca393c273a0530161313cf609082f7 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 836d915f158c79e45e15c8e831a3f6d1065e4147..ff91985cf47f7ee81b83ac2eabb0f698b46eb21b 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 a85d7606e76332624a9211163e73e4516296bf75..d582b46670b63343f6dfd7a51f9d7da5024b5ce1 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 cd7e52ce1383664c925e5743a991caf29dfd18d5..b446066a360ab8aa1e298ac5f9e67f361bb0b831 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 81e3142a20919a2f32c05254015072a221261b81..e604c7a1b2f2558e248f76c92f4d1b29dce0b1b2 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 9acb0d7dbb3e67a6b47af3d23290b19a7d89e107..12ce25165c3b56b206537bde80fec1cd47424b49 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 4b61a2c9e11d4d52edaa749e1173b13b1f628f93..b8e307a1a69e1fb986f90e9fcfb90b99d69911d9 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 b3ddb0ed4c2d420d8117a9a3cb84f40d04b14973..918d3613cc18cd13313385b5ae62cfb258f908a2 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 636e9acd3ba66d21b4d45824c5dd870c12c89128..dfc2df3e827d5fb19b0bc56d54e9c6efc879f03e 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 39891193ed252f740261b7274f77e4e272d33076..e468d517b136cef5dd1c6dd55c2799414b4c54ba 100644 (file)
--- a/bin/tests/system/legacy.run.sh.in
+++ b/bin/tests/system/legacy.run.sh.in
@@ -109,8 +109,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 50f6158e62c705133f062b0857788b31dadbe068..3d494df7968209b52eb45e60be45cc6f7e7ef4b7 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 91277a42557c864350b9c4d588b6d4749f62702f..d916f0a89bbc3cc1d3609dc91a353962cbac12c4 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 c88520705f3f90bf81d46fece3b3817667bf156c..d590a315f80e42a4f952fa9292dda44c91e73b2f 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 7e74c3820b2a6bc164d4f490b1d974c87f2a8807..114e2b7687c68e35e08eef174dd6ee4ae3ce1fa7 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 bc2a59af355c757ca393568435925a93f3dfa2e9..6e8df61e86dcec97e5718fb4e72ec7fc83664143 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 9ed853a982607f3f1d6a90f825a73c96d2fa3dfb..03430f16e89b12a81c05f1fc98822eaa5c6a9e40 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 c92e2b0a46516c06d3556e8fbda239b07610a4e9..31ebdb69e7bd4d2f1846c8c48196ffa53f0e1143 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 e7d07e99e3fc2b72808cec0039ec0d180c465e44..c36ec91db544ad118fac4e6463a0fdb64796076f 100644 (file)
--- a/bin/tests/system/pipelined/ns4/named.conf.in
+++ b/bin/tests/system/pipelined/ns4/named.conf.in
@@ -36,5 +36,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 0fc513ba97fe8ce59d029ed7459f70ff8ae22bfc..e668b709e0301a2712d6daa005f3d1dca0277970 100644 (file)
--- a/bin/tests/system/pipelined/tests.sh
+++ b/bin/tests/system/pipelined/tests.sh
@@ -20,7 +20,7 @@ mdig_with_opts() {
 }
 
 rndccmd() {
-       "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "${@}"
+       "$RNDC" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "${@}"
 }
 
 pipequeries() {

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 0947045dd57b78a90299cb17c304197c101352e6..4e4999666f9ce319fab2b8e77faa432f0562262a 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/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 "${@}"
 }
 
 status=0

diff --git a/bin/tests/system/rndc/ns2/named.conf.in b/bin/tests/system/rndc/ns2/named.conf.in
index 97d416c2c1aae607200bb120c48b732d8558d7a1..e25f293d806abd295e3c8a7ac8fe6fd7f0841685 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 20fe0ea1820a468ec83201c09f5a606ef2f0558d..0c2b679c0a04423a9c227da5b93a011a234b89c6 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 edcf1cafb76d58e4ee0c087d28f4a50c85d8cdf1..e8abb08e7b4b68f47ba840cab73f52a6aa8e1544 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 ac9967592d3b9522c9d2369dc58579cc57f5793f..df8b668b31ebb5fc21f6faf409a0d7246ce574c7 100644 (file)
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -67,7 +67,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
     WAIT_CMD="$DNSRPSCMD -w 0.1"

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 d7120a31cd2e53005a6c5f64bd33da85a004525a..412b4a22bc9228f80e1d6e63e4e96e71d2bde06a 100644 (file)
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -43,7 +43,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() {
@@ -275,7 +275,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))
@@ -285,7 +285,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"
@@ -317,7 +317,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))
@@ -514,10 +514,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'"
@@ -532,11 +532,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))
@@ -550,10 +550,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 d6fa5aa2475c6f1abe6ddec62c5bbb15dcf72ac4..44b0d3717b200485e922222aef3bad674d188b95 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 ac55f250a8e6c5a3ef5708d6d6389ee2d184942b..058bf39c6e98509ba788cf960b5d397d691e0133 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 aec5f953f5a30bff9e9bc03f946869a1139ef71c..fc505d130a44d1ec90fe1df65d83b2a8ed647f5b 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 5ca19ba16044e016cf89555969c6ca673850b1b6..2de82cef00336bc8cf758b3faf3fbd6e088dc00e 100755 (executable)
--- a/bin/tests/system/shutdown/tests_shutdown.py
+++ b/bin/tests/system/shutdown/tests_shutdown.py
@@ -178,8 +178,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 61527d6b677806ef4d7d06ab1db8597b13298a4f..7876eabe2fa908828c93a55fc8fe436832cc42cd 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 e639663ee853429b4350c96ce64ed82bbcfaa30c..db8bcc263defee296256a31364e851bf6ba99a0e 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 8fa1d4236ed6c9b54f3aca47804df5e2985f72c3..bcbf04f5b2f462f661a721c2541a7ffb3d30134d 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/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 ed18430d8a165bf1cac0661a5bc88e0df1a6c8a2..83a372ce372f7f9ccd2c46cb8234cbf3d82ea038 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"
 
 nextpart_thrice() {
        nextpart ns1/named.run >/dev/null

diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index cfd5526d9f26aec9ee6abe1979f1891c0cfd1ee9..cab21869c8e95ac476ba543bd170207f132f569b 100644 (file)
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -42,7 +42,7 @@ dnssec-policy "views" {
 
 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 beea2abe32e337058f41d7f97894af15dc657840..ac861347a0cfe161398b0295282c98bbd9863baf 100644 (file)
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -46,7 +46,7 @@ view "internal" {
 
        zone "." {
                type hint;
-               file "../../common/root.hint";
+               file "../../_common/root.hint";
        };
 
        zone "example" {
@@ -80,7 +80,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 e99c12d86c59df3dc4d28f511f3c29b0fa1552a8..febf93ee8c35b0b8f5c22824fcfdc75447ab8298 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 10d670f53e96adad71dff26b8b8d959c08dd3fb9..469e085d11646c5cebcdd426c46dc5f9695790a3 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 3fa20a3d9a9b493c023146a3ee1dee94c02fc36e..6cb056b2a2c68be9c38ff08a223c680cb1c59122 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 6b25c3c61b8fbd200c526a185f78df3a3b8d2d79..b071e0cb330007738882bbf03261ea651dc2568f 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 17fee1f1255d5f0170241bd044c2141abd0ea0cb..88e738c1216d4d875d4561597978267465b7dc1f 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 cd1a50a3e4f7135e619e6885a2799c6c3ce5759e..5acc1c5d23aba6897bb27b8cb3f1fd30ab36b12a 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