Remove duplicated empty zone files

(cherry picked from commit 1456b4fc7778b851256107dbc79fb67d45f752f5)

diff --git a/bin/tests/system/masterformat/ns1/255types.db.in b/bin/tests/system/masterformat/ns1/empty.db.in
similarity index 100%
rename from bin/tests/system/masterformat/ns1/255types.db.in
rename to bin/tests/system/masterformat/ns1/empty.db.in

diff --git a/bin/tests/system/masterformat/ns1/on-limit.db.in b/bin/tests/system/masterformat/ns1/on-limit.db.in
deleted file mode 100644 (file)
index 5a81863..0000000
--- a/bin/tests/system/masterformat/ns1/on-limit.db.in
+++ /dev/null
@@ -1,22 +0,0 @@
-; 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.
-
-$TTL 1D
-
-@                      IN SOA  ns hostmaster (
-                               1
-                               3600
-                               1800
-                               1814400
-                               3
-                               )
-                       NS      ns
-ns                     A       10.53.0.1

diff --git a/bin/tests/system/masterformat/ns1/over-limit.db.in b/bin/tests/system/masterformat/ns1/over-limit.db.in
deleted file mode 100644 (file)
index 5a81863..0000000
--- a/bin/tests/system/masterformat/ns1/over-limit.db.in
+++ /dev/null
@@ -1,22 +0,0 @@
-; 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.
-
-$TTL 1D
-
-@                      IN SOA  ns hostmaster (
-                               1
-                               3600
-                               1800
-                               1814400
-                               3
-                               )
-                       NS      ns
-ns                     A       10.53.0.1

diff --git a/bin/tests/system/masterformat/ns1/under-limit.db.in b/bin/tests/system/masterformat/ns1/under-limit.db.in
deleted file mode 100644 (file)
index 5a81863..0000000
--- a/bin/tests/system/masterformat/ns1/under-limit.db.in
+++ /dev/null
@@ -1,22 +0,0 @@
-; 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.
-
-$TTL 1D
-
-@                      IN SOA  ns hostmaster (
-                               1
-                               3600
-                               1800
-                               1814400
-                               3
-                               )
-                       NS      ns
-ns                     A       10.53.0.1

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index 272bd31047c0cfbc21f09983b6719d05b35f8c2c..223ca0bd47ea790a795782c8ffd5adb30f0d770a 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -22,7 +22,7 @@ copy_setports ns3/named.conf.in ns3/named.conf
 
 cp ns1/example.db ns2/
 cp ns2/formerly-text.db.in ns2/formerly-text.db
-cp ns1/under-limit.db.in ns1/under-limit.db
+cp ns1/empty.db.in ns1/under-limit.db
 
 # counts are set with respect to these limits in named.conf:
 #      max-records-per-type 2050;
@@ -32,14 +32,14 @@ awk 'END {
         for (i = 0; i < 1000; i++ ) { print "1000-txt TXT", i; }
         for (i = 0; i < 2000; i++ ) { print "2000-txt TXT", i; }
 }' </dev/null >>ns1/under-limit.db
-cp ns1/on-limit.db.in ns1/on-limit.db
+cp ns1/empty.db.in ns1/on-limit.db
 awk 'END {
         for (i = 0; i < 500; i++ ) { print "500-txt TXT", i; }
         for (i = 0; i < 1000; i++ ) { print "1000-txt TXT", i; }
         for (i = 0; i < 2000; i++ ) { print "2000-txt TXT", i; }
         for (i = 0; i < 2050; i++ ) { print "2050-txt TXT", i; }
 }' </dev/null >>ns1/on-limit.db
-cp ns1/over-limit.db.in ns1/over-limit.db
+cp ns1/empty.db.in ns1/over-limit.db
 awk 'END {
         for (i = 0; i < 500; i++ ) { print "500-txt TXT", i; }
         for (i = 0; i < 1000; i++ ) { print "1000-txt TXT", i; }
@@ -47,7 +47,7 @@ awk 'END {
         for (i = 0; i < 2050; i++ ) { print "2050-txt TXT", i; }
         for (i = 0; i < 2100; i++ ) { print "2100-txt TXT", i; }
 }' </dev/null >>ns1/over-limit.db
-cp ns1/255types.db.in ns1/255types.db
+cp ns1/empty.db.in ns1/255types.db
 for ntype in $(seq 65280 65534); do
   echo "m TYPE${ntype} \# 0"
 done >>ns1/255types.db