remove unneeded files and options from glue test

- the cache-file and check-itegrity options were not needed
- some zones and files were not used

diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index d3dab3e7e6a4959046fe631cfa9d705973d6b1dd..668ea395dea2e5ccd844ba0b12a236ff3012f43d 100644 (file)
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -13,7 +13,7 @@
 # Clean up after glue tests.
 #
 
-rm -f dig.out ns1/cache
+rm -f dig.out
 rm -f */named.conf
 rm -f */named.memstats
 rm -f */named.run

diff --git a/bin/tests/system/glue/ns1/cache.in b/bin/tests/system/glue/ns1/cache.in
deleted file mode 100644 (file)
index 8089efb..0000000
--- a/bin/tests/system/glue/ns1/cache.in
+++ /dev/null
@@ -1,15 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; 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 http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-; Preloaded cache data for glue test
-
-$TTL 86400
-ns.zz.   3600  IN      A       10.0.0.1
-ns.zz.         IN      AAAA    10::1
-ns.zz.         IN      A6      0 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff

diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db
deleted file mode 100644 (file)
index 2dda694..0000000
--- a/bin/tests/system/glue/ns1/mil.db
+++ /dev/null
@@ -1,23 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; 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 http://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$ORIGIN mil.
-$TTL 300
-@                      IN SOA  gson.nominum.com. a.root.servers.nil. (
-                               2000042100      ; serial
-                               600             ; refresh
-                               600             ; retry
-                               1200            ; expire
-                               600             ; minimum
-                               )
-@                      NS      a.root-servers.nil.
-
-ARL.MIL.               172800  IN      NS      NS1.ARL.MIL.
-NS1.arl.mil.            172800  IN A  128.63.16.4
-

diff --git a/bin/tests/system/glue/ns1/named.conf.in b/bin/tests/system/glue/ns1/named.conf.in
index 20cc8870af228bcceae01d7565c5d51af9bb4a66..5f8e2fcfe6797f886e2f83b61d6749c3e0a7fd5f 100644 (file)
--- a/bin/tests/system/glue/ns1/named.conf.in
+++ b/bin/tests/system/glue/ns1/named.conf.in
@@ -19,8 +19,6 @@ options {
        listen-on-v6 { none; };
        recursion yes;
        notify no;
-       cache-file "cache";
-       check-integrity no;
 };
 
 zone "." {
@@ -36,8 +34,3 @@ zone "net" {
        type master;
        file "net.db";
 };
-
-zone "mil" {
-       type master;
-       file "mil.db";
-};

diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db
index 76fefad473bcb0d4ae69ea066c0e80bfbe215430..af31bd48b4715cd95d10d9203635f4b90372060f 100644 (file)
--- a/bin/tests/system/glue/ns1/root.db
+++ b/bin/tests/system/glue/ns1/root.db
@@ -23,8 +23,6 @@ a.root-servers.nil.   A       10.53.0.1
 ; Delegate some domains that contain name servers for the sample
 ; ccTLDs below.
 net.                   172800  IN      NS      a.root-servers.nil.
-mil.                   172800  IN      NS      a.root-servers.nil.
-se.                    172800  IN      NS      ns.uu.net.
 
 ;
 ; A sample ccTLD
@@ -42,17 +40,3 @@ NS.UU.NET.           172800  IN      A       137.39.1.3
 T.NS.VERIO.NET.                172800  IN      A       192.67.14.16
 HYDRA.HELSINKI.fi.     172800  IN      A       128.214.4.29
 NS.EU.NET.             172800  IN      A       192.16.202.11
-
-;
-; Another sample ccTLD
-;
-is.                     172800  IN      NS      ISGATE.is.
-is.                     172800  IN      NS      NISC.JVNC.NET.
-is.                     172800  IN      NS      NS.EU.NET.
-is.                     172800  IN      NS      SPARKY.ARL.MIL.
-is.                     172800  IN      NS      SUNIC.SUNET.SE.
-ISGATE.is.              172800  IN      A       193.4.58.51
-NISC.JVNC.NET.          172800  IN      A       128.121.50.7
-NS.EU.NET.              172800  IN      A       192.16.202.11
-SPARKY.ARL.MIL.         172800  IN      A       128.63.58.18
-SUNIC.SUNET.SE.         172800  IN      A       192.36.125.2

diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 062e453fd656270e09a09095f44600f11e7ffb85..7e606316f4254da55ed07920c7131119ce8a2992 100644 (file)
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -14,5 +14,3 @@ SYSTEMTESTTOP=..
 
 $SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
-
-cd ns1 && cp -f cache.in cache

diff --git a/bin/tests/system/glue/xx.good b/bin/tests/system/glue/xx.good
deleted file mode 100644 (file)
index 19ae1d7..0000000
--- a/bin/tests/system/glue/xx.good
+++ /dev/null
@@ -1,16 +0,0 @@
-
-; <<>> DiG 9.0 <<>> +norec @10.53.0.1 -p 5300 foo.bar.xx. a
-;; global options:  printcmd
-;; Got answer:
-;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 41239
-;; flags: qr ad; QUERY: 1, ANSWER: 0, AUTHORITY: 1, ADDITIONAL: 1
-
-;; QUESTION SECTION:
-;foo.bar.xx.                   IN      A
-
-;; AUTHORITY SECTION:
-xx.                    172800  IN      NS      b.root-servers.nil.
-
-;; ADDITIONAL SECTION:
-b.root-servers.nil.    300     IN      A       10.53.0.2
-

diff --git a/bin/tests/system/glue/yy.good b/bin/tests/system/glue/yy.good
deleted file mode 100644 (file)
index fd97e3d..0000000
--- a/bin/tests/system/glue/yy.good
+++ /dev/null
@@ -1,17 +0,0 @@
-
-; <<>> DiG 9.0 <<>> +norec @10.53.0.1 -p 5300 foo.bar.yy. a
-;; global options:  printcmd
-;; Got answer:
-;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 6172
-;; flags: qr ad; QUERY: 1, ANSWER: 0, AUTHORITY: 1, ADDITIONAL: 3
-
-;; QUESTION SECTION:
-;foo.bar.yy.                   IN      A
-
-;; AUTHORITY SECTION:
-yy.                    172800  IN      NS      ns.zz.
-
-;; ADDITIONAL SECTION:
-ns.zz.                 3463    IN      A       10.0.0.1
-ns.zz.                 86263   IN      AAAA    10::1
-

diff --git a/util/copyrights b/util/copyrights
index b508ed4517434e3dec06e8f281369500dd71b14a..d30ad468ae14c25b8dcdf55df8601f979cb9a29f 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -667,11 +667,8 @@
 ./bin/tests/system/glue/clean.sh               SH      2000,2001,2004,2007,2012,2014,2015,2016,2018,2019
 ./bin/tests/system/glue/fi.good                        X       2000,2001,2018,2019
 ./bin/tests/system/glue/noglue.good            X       2000,2001,2018,2019
-./bin/tests/system/glue/ns1/cache.in           X       2018,2019
 ./bin/tests/system/glue/setup.sh               SH      2001,2004,2007,2012,2016,2018,2019
 ./bin/tests/system/glue/tests.sh               SH      2000,2001,2003,2004,2007,2012,2013,2016,2017,2018,2019
-./bin/tests/system/glue/xx.good                        X       2000,2001,2018,2019
-./bin/tests/system/glue/yy.good                        X       2000,2001,2003,2018,2019
 ./bin/tests/system/idna/clean.sh               SH      2018,2019
 ./bin/tests/system/idna/setup.sh               SH      2018,2019
 ./bin/tests/system/idna/tests.sh               SH      2018,2019