1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
From: =?utf-8?b?UGV0ciDFoHBhxI1law==?= <pspacek@isc.org>
Date: Wed, 29 May 2024 21:03:02 +0200
Subject: Remove duplicated empty zone files
(cherry picked from commit 1456b4fc7778b851256107dbc79fb67d45f752f5)
---
bin/tests/system/masterformat/ns1/255types.db.in | 22 ----------------------
bin/tests/system/masterformat/ns1/empty.db.in | 22 ++++++++++++++++++++++
bin/tests/system/masterformat/ns1/on-limit.db.in | 22 ----------------------
bin/tests/system/masterformat/ns1/over-limit.db.in | 22 ----------------------
.../system/masterformat/ns1/under-limit.db.in | 22 ----------------------
bin/tests/system/masterformat/setup.sh | 8 ++++----
6 files changed, 26 insertions(+), 92 deletions(-)
delete mode 100644 bin/tests/system/masterformat/ns1/255types.db.in
create mode 100644 bin/tests/system/masterformat/ns1/empty.db.in
delete mode 100644 bin/tests/system/masterformat/ns1/on-limit.db.in
delete mode 100644 bin/tests/system/masterformat/ns1/over-limit.db.in
delete mode 100644 bin/tests/system/masterformat/ns1/under-limit.db.in
diff --git a/bin/tests/system/masterformat/ns1/255types.db.in b/bin/tests/system/masterformat/ns1/255types.db.in
deleted file mode 100644
index 5a81863..0000000
--- a/bin/tests/system/masterformat/ns1/255types.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/empty.db.in b/bin/tests/system/masterformat/ns1/empty.db.in
new file mode 100644
index 0000000..5a81863
--- /dev/null
+++ b/bin/tests/system/masterformat/ns1/empty.db.in
@@ -0,0 +1,22 @@
+; 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/on-limit.db.in b/bin/tests/system/masterformat/ns1/on-limit.db.in
deleted file mode 100644
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
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
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 272bd31..223ca0b 100755
--- 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
|
