3542. [bug] masterformat system test was broken. [RT #33086]

diff --git a/CHANGES b/CHANGES
index fa0037d6b7a6cb4d559d76463d87c6e51a79b1bc..58392459f3b368f6908fa8b6c7ab71869398626f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@
 3543.  [bug]           Update socket stucture before attaching to socket
                        manager after accept. [RT #33084]
 
+3542.  [bug]           masterformat system test was broken. [RT #33086]
+
 3541.  [bug]           Parts of libdns were not properly initialized when
                        built in libexport mode. [RT #33028]
 

diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf
index 72960586feea411c6e054c98b9e54a5a17707317..b46419d79903e121923f6e8bea8744f2f81d46de 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf
+++ b/bin/tests/system/masterformat/ns2/named.conf
@@ -24,6 +24,7 @@ options {
        pid-file "named.pid";
        listen-on port 5300 { 10.53.0.2; };
        listen-on-v6 { none; };
+       port 5300;
        recursion no;
        notify no;
        dnssec-enable yes;

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index df20b39dd77cfc19728d3a84e8e0777d98b489d9..420090b870401b0ddeb04681ccf29188381cc1cd 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -12,9 +12,14 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
+rm -f named-compilezone
 ln -s $CHECKZONE named-compilezone
 rm -f ns1/example.db.raw
 cp ns1/example.db ns2/
+cp ns1/large.db.in ns1/large.db
+awk 'END {
+        for (i = 0; i < 512; i++ ) { print "a TXT", i; }
+        for (i = 0; i < 1024; i++ ) { print "b TXT", i; }
+        for (i = 0; i < 2000; i++ ) { print "c TXT", i; }
+}' < /dev/null >> ns1/large.db
 cd ns1 && sh compile.sh

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index b0d393081eec1c9d0fd7057fcd06ecce05f15dd8..9308cbe3ab16a9fc4b15c71e10ba2288014d8cc6 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -1,46 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id$
-
-SYSTEMTESTTOP=..
-. $SYSTEMTESTTOP/conf.sh
-
-DIGOPTS="+tcp +noauth +noadd +nosea +nostat +noquest +nocomm +nocmd"
-
-status=0
-
-echo "I:checking that master file in the raw format worked"
-
-for server in 1 2
-do
-       for name in ns mx a aaaa cname dname txt rrsig nsec dnskey ds
-       do
-               $DIG $DIGOPTS $name.example. $name @10.53.0.$server -p 5300
-               echo
-       done > dig.out.$server
-done
-
-diff dig.out.1 dig.out.2 || status=1
-
-echo "I:exit status: $status"
-exit $status
-#!/bin/sh
-#
-# Copyright (C) 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -54,8 +14,6 @@ exit $status
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh