From 209be9ee33dc6a801df7477f9600ac49eacc1bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Tue, 1 Oct 2024 15:13:06 +0200 Subject: [PATCH] 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. (cherry picked from commit a9f1b8d6a64c956f9f122b4459d24b8bccab3429) --- .../auth/ns1/{named.conf.in => named.conf.j2} | 0 .../auth/ns2/{named.conf.in => named.conf.j2} | 0 bin/tests/system/auth/setup.sh | 17 -------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 bin/tests/system/builtin/setup.sh | 18 --------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 bin/tests/system/cacheclean/setup.sh | 17 -------------- .../camp/ns1/{named.conf.in => named.conf.j2} | 0 .../camp/ns2/{named.conf.in => named.conf.j2} | 0 .../camp/ns3/{named.conf.in => named.conf.j2} | 0 .../camp/ns9/{named.conf.in => named.conf.j2} | 0 bin/tests/system/camp/setup.sh | 5 ---- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 .../ns4/{named.conf.in => named.conf.j2} | 0 .../ns5/{named.conf.in => named.conf.j2} | 0 .../ns6/{named.conf.in => named.conf.j2} | 0 .../ns7/{named.conf.in => named.conf.j2} | 0 .../ns8/{named.conf.in => named.conf.j2} | 0 bin/tests/system/cookie/setup.sh | 23 ------------------- .../cpu/ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/cpu/setup.sh | 19 --------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 bin/tests/system/dispatch/setup.sh | 17 -------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/dyndb/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/ednscompliance/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/formerr/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/hooks/setup.sh | 16 ------------- .../idna/ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/idna/setup.sh | 16 ------------- .../ns2/{named.conf.in => named.conf.j2} | 0 bin/tests/system/include-multiplecfg/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/integrity/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 bin/tests/system/keepalive/setup.sh | 18 --------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/limits/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 bin/tests/system/masterfile/setup.sh | 17 -------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/names/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/nzd2nzf/setup.sh | 16 ------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 .../ns4/{named.conf.in => named.conf.j2} | 0 bin/tests/system/pipelined/setup.sh | 19 --------------- .../qmin/ns1/{named.conf.in => named.conf.j2} | 0 .../qmin/ns5/{named.conf.in => named.conf.j2} | 0 .../qmin/ns6/{named.conf.in => named.conf.j2} | 0 .../qmin/ns7/{named.conf.in => named.conf.j2} | 0 bin/tests/system/qmin/setup.sh | 19 --------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 .../ns4/{named.conf.in => named.conf.j2} | 0 .../ns5/{named.conf.in => named.conf.j2} | 0 bin/tests/system/query-source/setup.sh | 20 ---------------- .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 bin/tests/system/rpzextra/setup.sh | 21 ----------------- .../rrl/ns1/{named.conf.in => named.conf.j2} | 0 .../rrl/ns2/{named.conf.in => named.conf.j2} | 0 .../rrl/ns3/{named.conf.in => named.conf.j2} | 0 .../rrl/ns4/{named.conf.in => named.conf.j2} | 0 bin/tests/system/rrl/setup.sh | 19 --------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 .../ns4/{named.conf.in => named.conf.j2} | 0 .../ns5/{named.conf.in => named.conf.j2} | 0 bin/tests/system/rrsetorder/setup.sh | 20 ---------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../resolver/{named.conf.in => named.conf.j2} | 0 bin/tests/system/shutdown/setup.sh | 22 ------------------ .../spf/ns1/{named.conf.in => named.conf.j2} | 0 bin/tests/system/spf/setup.sh | 16 ------------- .../stub/ns1/{named.conf.in => named.conf.j2} | 0 .../stub/ns2/{named.conf.in => named.conf.j2} | 0 .../stub/ns3/{named.conf.in => named.conf.j2} | 0 .../stub/ns4/{named.conf.in => named.conf.j2} | 0 .../stub/ns5/{named.conf.in => named.conf.j2} | 0 bin/tests/system/stub/setup.sh | 20 ---------------- .../tcp/ns1/{named.conf.in => named.conf.j2} | 0 .../tcp/ns2/{named.conf.in => named.conf.j2} | 0 .../tcp/ns3/{named.conf.in => named.conf.j2} | 0 .../tcp/ns4/{named.conf.in => named.conf.j2} | 0 .../tcp/ns5/{named.conf.in => named.conf.j2} | 0 .../tcp/ns7/{named.conf.in => named.conf.j2} | 0 bin/tests/system/tcp/setup.sh | 21 ----------------- .../ttl/ns1/{named.conf.in => named.conf.j2} | 0 .../ttl/ns2/{named.conf.in => named.conf.j2} | 0 bin/tests/system/ttl/setup.sh | 17 -------------- .../ns1/{named.conf.in => named.conf.j2} | 0 .../ns2/{named.conf.in => named.conf.j2} | 0 .../ns3/{named.conf.in => named.conf.j2} | 0 bin/tests/system/unknown/setup.sh | 18 --------------- 112 files changed, 543 deletions(-) rename bin/tests/system/auth/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/auth/ns2/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/auth/setup.sh rename bin/tests/system/builtin/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/builtin/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/builtin/ns3/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/builtin/setup.sh rename bin/tests/system/cacheclean/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cacheclean/ns2/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/cacheclean/setup.sh rename bin/tests/system/camp/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/camp/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/camp/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/camp/ns9/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns4/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns5/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns6/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns7/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/cookie/ns8/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/cookie/setup.sh rename bin/tests/system/cpu/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/cpu/setup.sh rename bin/tests/system/dispatch/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/dispatch/ns2/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/dispatch/setup.sh rename bin/tests/system/dyndb/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/dyndb/setup.sh rename bin/tests/system/ednscompliance/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/ednscompliance/setup.sh rename bin/tests/system/formerr/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/formerr/setup.sh rename bin/tests/system/hooks/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/hooks/setup.sh rename bin/tests/system/idna/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/idna/setup.sh rename bin/tests/system/include-multiplecfg/ns2/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/include-multiplecfg/setup.sh rename bin/tests/system/integrity/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/integrity/setup.sh rename bin/tests/system/keepalive/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/keepalive/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/keepalive/ns3/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/keepalive/setup.sh rename bin/tests/system/limits/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/limits/setup.sh rename bin/tests/system/masterfile/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/masterfile/ns2/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/masterfile/setup.sh rename bin/tests/system/names/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/names/setup.sh rename bin/tests/system/nzd2nzf/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/nzd2nzf/setup.sh rename bin/tests/system/pipelined/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/pipelined/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/pipelined/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/pipelined/ns4/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/pipelined/setup.sh rename bin/tests/system/qmin/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/qmin/ns5/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/qmin/ns6/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/qmin/ns7/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/qmin/setup.sh rename bin/tests/system/query-source/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/query-source/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/query-source/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/query-source/ns4/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/query-source/ns5/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/query-source/setup.sh rename bin/tests/system/rpzextra/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rpzextra/ns3/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/rpzextra/setup.sh rename bin/tests/system/rrl/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rrl/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rrl/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rrl/ns4/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/rrl/setup.sh rename bin/tests/system/rrsetorder/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rrsetorder/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rrsetorder/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rrsetorder/ns4/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/rrsetorder/ns5/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/rrsetorder/setup.sh rename bin/tests/system/shutdown/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/shutdown/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/shutdown/resolver/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/shutdown/setup.sh rename bin/tests/system/spf/ns1/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/spf/setup.sh rename bin/tests/system/stub/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/stub/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/stub/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/stub/ns4/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/stub/ns5/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/stub/setup.sh rename bin/tests/system/tcp/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/tcp/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/tcp/ns3/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/tcp/ns4/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/tcp/ns5/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/tcp/ns7/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/tcp/setup.sh rename bin/tests/system/ttl/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/ttl/ns2/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/ttl/setup.sh rename bin/tests/system/unknown/ns1/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/unknown/ns2/{named.conf.in => named.conf.j2} (100%) rename bin/tests/system/unknown/ns3/{named.conf.in => named.conf.j2} (100%) delete mode 100644 bin/tests/system/unknown/setup.sh 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 index 6929ec541d..0000000000 --- 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 index 7ffda5583c..0000000000 --- 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 index 6929ec541d..0000000000 --- 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 8d17ffc715..7b059e2b9a 100644 --- 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 index 88c7518dd0..0000000000 --- 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 index 7c9de7a6e7..0000000000 --- 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 index 6929ec541d..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 3638ba5e5a..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 7ffda5583c..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 6929ec541d..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index 82240a7c1b..0000000000 --- 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 index b0cb266ec7..0000000000 --- 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 index 5825b3d5e5..0000000000 --- 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 index 5d12d6ac95..0000000000 --- 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 index 2dbb388f72..0000000000 --- a/bin/tests/system/rpzextra/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. - -# touch dnsrps-off to not test with DNSRPS - -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 index b0cb266ec7..0000000000 --- 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 index 5d12d6ac95..0000000000 --- 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 index cdeab8291b..0000000000 --- a/bin/tests/system/shutdown/setup.sh +++ /dev/null @@ -1,22 +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. - -# touch dnsrps-off to not test with DNSRPS - -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 index 82240a7c1b..0000000000 --- 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 index 5d12d6ac95..0000000000 --- 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 index 1c587b5d39..0000000000 --- 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 index 6929ec541d..0000000000 --- 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 index 7ffda5583c..0000000000 --- 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