Replace the trivial setup.sh system test files

All these setup files only use copy_setports function which can be done
with jinja2 templates instead -- simply by renaming the .in files to
.j2, without any other changes. The pytest runner will render these
templates during test setup without any need for an additional script.

diff --git a/bin/tests/system/auth/ns1/named.conf.in b/bin/tests/system/auth/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/auth/ns1/named.conf.in
rename to bin/tests/system/auth/ns1/named.conf.j2

diff --git a/bin/tests/system/auth/ns2/named.conf.in b/bin/tests/system/auth/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/auth/ns2/named.conf.in
rename to bin/tests/system/auth/ns2/named.conf.j2

diff --git a/bin/tests/system/auth/setup.sh b/bin/tests/system/auth/setup.sh
deleted file mode 100644 (file)
index 6929ec5..0000000
--- a/bin/tests/system/auth/setup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/builtin/ns1/named.conf.in b/bin/tests/system/builtin/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/builtin/ns1/named.conf.in
rename to bin/tests/system/builtin/ns1/named.conf.j2

diff --git a/bin/tests/system/builtin/ns2/named.conf.in b/bin/tests/system/builtin/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/builtin/ns2/named.conf.in
rename to bin/tests/system/builtin/ns2/named.conf.j2

diff --git a/bin/tests/system/builtin/ns3/named.conf.in b/bin/tests/system/builtin/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/builtin/ns3/named.conf.in
rename to bin/tests/system/builtin/ns3/named.conf.j2

diff --git a/bin/tests/system/builtin/setup.sh b/bin/tests/system/builtin/setup.sh
deleted file mode 100644 (file)
index 7ffda55..0000000
--- a/bin/tests/system/builtin/setup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf

diff --git a/bin/tests/system/cacheclean/ns1/named.conf.in b/bin/tests/system/cacheclean/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/cacheclean/ns1/named.conf.in
rename to bin/tests/system/cacheclean/ns1/named.conf.j2

diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/cacheclean/ns2/named.conf.in
rename to bin/tests/system/cacheclean/ns2/named.conf.j2

diff --git a/bin/tests/system/cacheclean/setup.sh b/bin/tests/system/cacheclean/setup.sh
deleted file mode 100644 (file)
index 6929ec5..0000000
--- a/bin/tests/system/cacheclean/setup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/camp/ns1/named.conf.in b/bin/tests/system/camp/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/camp/ns1/named.conf.in
rename to bin/tests/system/camp/ns1/named.conf.j2

diff --git a/bin/tests/system/camp/ns2/named.conf.in b/bin/tests/system/camp/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/camp/ns2/named.conf.in
rename to bin/tests/system/camp/ns2/named.conf.j2

diff --git a/bin/tests/system/camp/ns3/named.conf.in b/bin/tests/system/camp/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/camp/ns3/named.conf.in
rename to bin/tests/system/camp/ns3/named.conf.j2

diff --git a/bin/tests/system/camp/ns9/named.conf.in b/bin/tests/system/camp/ns9/named.conf.j2
similarity index 100%
rename from bin/tests/system/camp/ns9/named.conf.in
rename to bin/tests/system/camp/ns9/named.conf.j2

diff --git a/bin/tests/system/camp/setup.sh b/bin/tests/system/camp/setup.sh
index 8d17ffc715be2630c1fd2ec2a66b66256df65a78..7b059e2b9abcec398bdca35c1cd39171d97f9919 100644 (file)
--- a/bin/tests/system/camp/setup.sh
+++ b/bin/tests/system/camp/setup.sh
@@ -16,11 +16,6 @@
 
 set -e
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns9/named.conf.in ns9/named.conf
-
 (
   cd ns3
   $SHELL setup.sh

diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns1/named.conf.in
rename to bin/tests/system/cookie/ns1/named.conf.j2

diff --git a/bin/tests/system/cookie/ns2/named.conf.in b/bin/tests/system/cookie/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns2/named.conf.in
rename to bin/tests/system/cookie/ns2/named.conf.j2

diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns3/named.conf.in
rename to bin/tests/system/cookie/ns3/named.conf.j2

diff --git a/bin/tests/system/cookie/ns4/named.conf.in b/bin/tests/system/cookie/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns4/named.conf.in
rename to bin/tests/system/cookie/ns4/named.conf.j2

diff --git a/bin/tests/system/cookie/ns5/named.conf.in b/bin/tests/system/cookie/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns5/named.conf.in
rename to bin/tests/system/cookie/ns5/named.conf.j2

diff --git a/bin/tests/system/cookie/ns6/named.conf.in b/bin/tests/system/cookie/ns6/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns6/named.conf.in
rename to bin/tests/system/cookie/ns6/named.conf.j2

diff --git a/bin/tests/system/cookie/ns7/named.conf.in b/bin/tests/system/cookie/ns7/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns7/named.conf.in
rename to bin/tests/system/cookie/ns7/named.conf.j2

diff --git a/bin/tests/system/cookie/ns8/named.conf.in b/bin/tests/system/cookie/ns8/named.conf.j2
similarity index 100%
rename from bin/tests/system/cookie/ns8/named.conf.in
rename to bin/tests/system/cookie/ns8/named.conf.j2

diff --git a/bin/tests/system/cookie/setup.sh b/bin/tests/system/cookie/setup.sh
deleted file mode 100644 (file)
index 88c7518..0000000
--- a/bin/tests/system/cookie/setup.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-copy_setports ns6/named.conf.in ns6/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf
-copy_setports ns8/named.conf.in ns8/named.conf

diff --git a/bin/tests/system/cpu/ns1/named.conf.in b/bin/tests/system/cpu/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/cpu/ns1/named.conf.in
rename to bin/tests/system/cpu/ns1/named.conf.j2

diff --git a/bin/tests/system/cpu/setup.sh b/bin/tests/system/cpu/setup.sh
deleted file mode 100644 (file)
index 7c9de7a..0000000
--- a/bin/tests/system/cpu/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-# shellcheck source=conf.sh
-. ../conf.sh
-
-set -e
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dispatch/ns1/named.conf.in b/bin/tests/system/dispatch/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/dispatch/ns1/named.conf.in
rename to bin/tests/system/dispatch/ns1/named.conf.j2

diff --git a/bin/tests/system/dispatch/ns2/named.conf.in b/bin/tests/system/dispatch/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/dispatch/ns2/named.conf.in
rename to bin/tests/system/dispatch/ns2/named.conf.j2

diff --git a/bin/tests/system/dispatch/setup.sh b/bin/tests/system/dispatch/setup.sh
deleted file mode 100644 (file)
index 6929ec5..0000000
--- a/bin/tests/system/dispatch/setup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/dyndb/ns1/named.conf.in b/bin/tests/system/dyndb/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/dyndb/ns1/named.conf.in
rename to bin/tests/system/dyndb/ns1/named.conf.j2

diff --git a/bin/tests/system/dyndb/setup.sh b/bin/tests/system/dyndb/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/dyndb/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/ednscompliance/ns1/named.conf.in b/bin/tests/system/ednscompliance/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/ednscompliance/ns1/named.conf.in
rename to bin/tests/system/ednscompliance/ns1/named.conf.j2

diff --git a/bin/tests/system/ednscompliance/setup.sh b/bin/tests/system/ednscompliance/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/ednscompliance/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/formerr/ns1/named.conf.in b/bin/tests/system/formerr/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/formerr/ns1/named.conf.in
rename to bin/tests/system/formerr/ns1/named.conf.j2

diff --git a/bin/tests/system/formerr/setup.sh b/bin/tests/system/formerr/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/formerr/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/hooks/ns1/named.conf.in b/bin/tests/system/hooks/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/hooks/ns1/named.conf.in
rename to bin/tests/system/hooks/ns1/named.conf.j2

diff --git a/bin/tests/system/hooks/setup.sh b/bin/tests/system/hooks/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/hooks/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/idna/ns1/named.conf.in b/bin/tests/system/idna/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/idna/ns1/named.conf.in
rename to bin/tests/system/idna/ns1/named.conf.j2

diff --git a/bin/tests/system/idna/setup.sh b/bin/tests/system/idna/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/idna/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/include-multiplecfg/ns2/named.conf.in b/bin/tests/system/include-multiplecfg/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/include-multiplecfg/ns2/named.conf.in
rename to bin/tests/system/include-multiplecfg/ns2/named.conf.j2

diff --git a/bin/tests/system/include-multiplecfg/setup.sh b/bin/tests/system/include-multiplecfg/setup.sh
deleted file mode 100644 (file)
index 3638ba5..0000000
--- a/bin/tests/system/include-multiplecfg/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/integrity/ns1/named.conf.in b/bin/tests/system/integrity/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/integrity/ns1/named.conf.in
rename to bin/tests/system/integrity/ns1/named.conf.j2

diff --git a/bin/tests/system/integrity/setup.sh b/bin/tests/system/integrity/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/integrity/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/keepalive/ns1/named.conf.in b/bin/tests/system/keepalive/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/keepalive/ns1/named.conf.in
rename to bin/tests/system/keepalive/ns1/named.conf.j2

diff --git a/bin/tests/system/keepalive/ns2/named.conf.in b/bin/tests/system/keepalive/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/keepalive/ns2/named.conf.in
rename to bin/tests/system/keepalive/ns2/named.conf.j2

diff --git a/bin/tests/system/keepalive/ns3/named.conf.in b/bin/tests/system/keepalive/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/keepalive/ns3/named.conf.in
rename to bin/tests/system/keepalive/ns3/named.conf.j2

diff --git a/bin/tests/system/keepalive/setup.sh b/bin/tests/system/keepalive/setup.sh
deleted file mode 100644 (file)
index 7ffda55..0000000
--- a/bin/tests/system/keepalive/setup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf

diff --git a/bin/tests/system/limits/ns1/named.conf.in b/bin/tests/system/limits/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/limits/ns1/named.conf.in
rename to bin/tests/system/limits/ns1/named.conf.j2

diff --git a/bin/tests/system/limits/setup.sh b/bin/tests/system/limits/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/limits/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/masterfile/ns1/named.conf.in b/bin/tests/system/masterfile/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/masterfile/ns1/named.conf.in
rename to bin/tests/system/masterfile/ns1/named.conf.j2

diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/masterfile/ns2/named.conf.in
rename to bin/tests/system/masterfile/ns2/named.conf.j2

diff --git a/bin/tests/system/masterfile/setup.sh b/bin/tests/system/masterfile/setup.sh
deleted file mode 100644 (file)
index 6929ec5..0000000
--- a/bin/tests/system/masterfile/setup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/names/ns1/named.conf.in b/bin/tests/system/names/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/names/ns1/named.conf.in
rename to bin/tests/system/names/ns1/named.conf.j2

diff --git a/bin/tests/system/names/setup.sh b/bin/tests/system/names/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/names/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf.in b/bin/tests/system/nzd2nzf/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/nzd2nzf/ns1/named.conf.in
rename to bin/tests/system/nzd2nzf/ns1/named.conf.j2

diff --git a/bin/tests/system/nzd2nzf/setup.sh b/bin/tests/system/nzd2nzf/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/nzd2nzf/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/pipelined/ns1/named.conf.in b/bin/tests/system/pipelined/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/pipelined/ns1/named.conf.in
rename to bin/tests/system/pipelined/ns1/named.conf.j2

diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/pipelined/ns2/named.conf.in
rename to bin/tests/system/pipelined/ns2/named.conf.j2

diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/pipelined/ns3/named.conf.in
rename to bin/tests/system/pipelined/ns3/named.conf.j2

diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/pipelined/ns4/named.conf.in
rename to bin/tests/system/pipelined/ns4/named.conf.j2

diff --git a/bin/tests/system/pipelined/setup.sh b/bin/tests/system/pipelined/setup.sh
deleted file mode 100644 (file)
index b0cb266..0000000
--- a/bin/tests/system/pipelined/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf

diff --git a/bin/tests/system/qmin/ns1/named.conf.in b/bin/tests/system/qmin/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/qmin/ns1/named.conf.in
rename to bin/tests/system/qmin/ns1/named.conf.j2

diff --git a/bin/tests/system/qmin/ns5/named.conf.in b/bin/tests/system/qmin/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/qmin/ns5/named.conf.in
rename to bin/tests/system/qmin/ns5/named.conf.j2

diff --git a/bin/tests/system/qmin/ns6/named.conf.in b/bin/tests/system/qmin/ns6/named.conf.j2
similarity index 100%
rename from bin/tests/system/qmin/ns6/named.conf.in
rename to bin/tests/system/qmin/ns6/named.conf.j2

diff --git a/bin/tests/system/qmin/ns7/named.conf.in b/bin/tests/system/qmin/ns7/named.conf.j2
similarity index 100%
rename from bin/tests/system/qmin/ns7/named.conf.in
rename to bin/tests/system/qmin/ns7/named.conf.j2

diff --git a/bin/tests/system/qmin/setup.sh b/bin/tests/system/qmin/setup.sh
deleted file mode 100644 (file)
index 5825b3d..0000000
--- a/bin/tests/system/qmin/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-copy_setports ns6/named.conf.in ns6/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf

diff --git a/bin/tests/system/query-source/ns1/named.conf.in b/bin/tests/system/query-source/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/query-source/ns1/named.conf.in
rename to bin/tests/system/query-source/ns1/named.conf.j2

diff --git a/bin/tests/system/query-source/ns2/named.conf.in b/bin/tests/system/query-source/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/query-source/ns2/named.conf.in
rename to bin/tests/system/query-source/ns2/named.conf.j2

diff --git a/bin/tests/system/query-source/ns3/named.conf.in b/bin/tests/system/query-source/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/query-source/ns3/named.conf.in
rename to bin/tests/system/query-source/ns3/named.conf.j2

diff --git a/bin/tests/system/query-source/ns4/named.conf.in b/bin/tests/system/query-source/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/query-source/ns4/named.conf.in
rename to bin/tests/system/query-source/ns4/named.conf.j2

diff --git a/bin/tests/system/query-source/ns5/named.conf.in b/bin/tests/system/query-source/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/query-source/ns5/named.conf.in
rename to bin/tests/system/query-source/ns5/named.conf.j2

diff --git a/bin/tests/system/query-source/setup.sh b/bin/tests/system/query-source/setup.sh
deleted file mode 100644 (file)
index 5d12d6a..0000000
--- a/bin/tests/system/query-source/setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf

diff --git a/bin/tests/system/rpzextra/ns2/named.conf.in b/bin/tests/system/rpzextra/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/rpzextra/ns2/named.conf.in
rename to bin/tests/system/rpzextra/ns2/named.conf.j2

diff --git a/bin/tests/system/rpzextra/ns3/named.conf.in b/bin/tests/system/rpzextra/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/rpzextra/ns3/named.conf.in
rename to bin/tests/system/rpzextra/ns3/named.conf.j2

diff --git a/bin/tests/system/rpzextra/setup.sh b/bin/tests/system/rpzextra/setup.sh
deleted file mode 100644 (file)
index 9def61f..0000000
--- a/bin/tests/system/rpzextra/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-. ../conf.sh
-
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf

diff --git a/bin/tests/system/rrl/ns1/named.conf.in b/bin/tests/system/rrl/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrl/ns1/named.conf.in
rename to bin/tests/system/rrl/ns1/named.conf.j2

diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrl/ns2/named.conf.in
rename to bin/tests/system/rrl/ns2/named.conf.j2

diff --git a/bin/tests/system/rrl/ns3/named.conf.in b/bin/tests/system/rrl/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrl/ns3/named.conf.in
rename to bin/tests/system/rrl/ns3/named.conf.j2

diff --git a/bin/tests/system/rrl/ns4/named.conf.in b/bin/tests/system/rrl/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrl/ns4/named.conf.in
rename to bin/tests/system/rrl/ns4/named.conf.j2

diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh
deleted file mode 100644 (file)
index b0cb266..0000000
--- a/bin/tests/system/rrl/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf

diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.in b/bin/tests/system/rrsetorder/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrsetorder/ns1/named.conf.in
rename to bin/tests/system/rrsetorder/ns1/named.conf.j2

diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.in b/bin/tests/system/rrsetorder/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrsetorder/ns2/named.conf.in
rename to bin/tests/system/rrsetorder/ns2/named.conf.j2

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.in b/bin/tests/system/rrsetorder/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrsetorder/ns3/named.conf.in
rename to bin/tests/system/rrsetorder/ns3/named.conf.j2

diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.in b/bin/tests/system/rrsetorder/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrsetorder/ns4/named.conf.in
rename to bin/tests/system/rrsetorder/ns4/named.conf.j2

diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.in b/bin/tests/system/rrsetorder/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/rrsetorder/ns5/named.conf.in
rename to bin/tests/system/rrsetorder/ns5/named.conf.j2

diff --git a/bin/tests/system/rrsetorder/setup.sh b/bin/tests/system/rrsetorder/setup.sh
deleted file mode 100644 (file)
index 5d12d6a..0000000
--- a/bin/tests/system/rrsetorder/setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf

diff --git a/bin/tests/system/shutdown/ns1/named.conf.in b/bin/tests/system/shutdown/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/shutdown/ns1/named.conf.in
rename to bin/tests/system/shutdown/ns1/named.conf.j2

diff --git a/bin/tests/system/shutdown/ns2/named.conf.in b/bin/tests/system/shutdown/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/shutdown/ns2/named.conf.in
rename to bin/tests/system/shutdown/ns2/named.conf.j2

diff --git a/bin/tests/system/shutdown/resolver/named.conf.in b/bin/tests/system/shutdown/resolver/named.conf.j2
similarity index 100%
rename from bin/tests/system/shutdown/resolver/named.conf.in
rename to bin/tests/system/shutdown/resolver/named.conf.j2

diff --git a/bin/tests/system/shutdown/setup.sh b/bin/tests/system/shutdown/setup.sh
deleted file mode 100644 (file)
index e27c30e..0000000
--- a/bin/tests/system/shutdown/setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports resolver/named.conf.in resolver/named.conf

diff --git a/bin/tests/system/spf/ns1/named.conf.in b/bin/tests/system/spf/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/spf/ns1/named.conf.in
rename to bin/tests/system/spf/ns1/named.conf.j2

diff --git a/bin/tests/system/spf/setup.sh b/bin/tests/system/spf/setup.sh
deleted file mode 100644 (file)
index 82240a7..0000000
--- a/bin/tests/system/spf/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/stub/ns1/named.conf.in b/bin/tests/system/stub/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/stub/ns1/named.conf.in
rename to bin/tests/system/stub/ns1/named.conf.j2

diff --git a/bin/tests/system/stub/ns2/named.conf.in b/bin/tests/system/stub/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/stub/ns2/named.conf.in
rename to bin/tests/system/stub/ns2/named.conf.j2

diff --git a/bin/tests/system/stub/ns3/named.conf.in b/bin/tests/system/stub/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/stub/ns3/named.conf.in
rename to bin/tests/system/stub/ns3/named.conf.j2

diff --git a/bin/tests/system/stub/ns4/named.conf.in b/bin/tests/system/stub/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/stub/ns4/named.conf.in
rename to bin/tests/system/stub/ns4/named.conf.j2

diff --git a/bin/tests/system/stub/ns5/named.conf.in b/bin/tests/system/stub/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/stub/ns5/named.conf.in
rename to bin/tests/system/stub/ns5/named.conf.j2

diff --git a/bin/tests/system/stub/setup.sh b/bin/tests/system/stub/setup.sh
deleted file mode 100644 (file)
index 5d12d6a..0000000
--- a/bin/tests/system/stub/setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf

diff --git a/bin/tests/system/tcp/ns1/named.conf.in b/bin/tests/system/tcp/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/tcp/ns1/named.conf.in
rename to bin/tests/system/tcp/ns1/named.conf.j2

diff --git a/bin/tests/system/tcp/ns2/named.conf.in b/bin/tests/system/tcp/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/tcp/ns2/named.conf.in
rename to bin/tests/system/tcp/ns2/named.conf.j2

diff --git a/bin/tests/system/tcp/ns3/named.conf.in b/bin/tests/system/tcp/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/tcp/ns3/named.conf.in
rename to bin/tests/system/tcp/ns3/named.conf.j2

diff --git a/bin/tests/system/tcp/ns4/named.conf.in b/bin/tests/system/tcp/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/tcp/ns4/named.conf.in
rename to bin/tests/system/tcp/ns4/named.conf.j2

diff --git a/bin/tests/system/tcp/ns5/named.conf.in b/bin/tests/system/tcp/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/tcp/ns5/named.conf.in
rename to bin/tests/system/tcp/ns5/named.conf.j2

diff --git a/bin/tests/system/tcp/ns7/named.conf.in b/bin/tests/system/tcp/ns7/named.conf.j2
similarity index 100%
rename from bin/tests/system/tcp/ns7/named.conf.in
rename to bin/tests/system/tcp/ns7/named.conf.j2

diff --git a/bin/tests/system/tcp/setup.sh b/bin/tests/system/tcp/setup.sh
deleted file mode 100644 (file)
index 1c587b5..0000000
--- a/bin/tests/system/tcp/setup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf

diff --git a/bin/tests/system/ttl/ns1/named.conf.in b/bin/tests/system/ttl/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/ttl/ns1/named.conf.in
rename to bin/tests/system/ttl/ns1/named.conf.j2

diff --git a/bin/tests/system/ttl/ns2/named.conf.in b/bin/tests/system/ttl/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/ttl/ns2/named.conf.in
rename to bin/tests/system/ttl/ns2/named.conf.j2

diff --git a/bin/tests/system/ttl/setup.sh b/bin/tests/system/ttl/setup.sh
deleted file mode 100644 (file)
index 6929ec5..0000000
--- a/bin/tests/system/ttl/setup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/unknown/ns1/named.conf.in b/bin/tests/system/unknown/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/unknown/ns1/named.conf.in
rename to bin/tests/system/unknown/ns1/named.conf.j2

diff --git a/bin/tests/system/unknown/ns2/named.conf.in b/bin/tests/system/unknown/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/unknown/ns2/named.conf.in
rename to bin/tests/system/unknown/ns2/named.conf.j2

diff --git a/bin/tests/system/unknown/ns3/named.conf.in b/bin/tests/system/unknown/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/unknown/ns3/named.conf.in
rename to bin/tests/system/unknown/ns3/named.conf.j2

diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
deleted file mode 100644 (file)
index 7ffda55..0000000
--- a/bin/tests/system/unknown/setup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf