diff --git a/bin/tests/system/masterfile/knowngood.dig.out b/bin/tests/system/masterfile/knowngood.dig.out index f638653f19..60478dc728 100644 --- a/bin/tests/system/masterfile/knowngood.dig.out +++ b/bin/tests/system/masterfile/knowngood.dig.out @@ -1,6 +1,3 @@ - -; <<>> DiG 9.2.0b2 <<>> +nostats include. axfr @10.53.0.1 -p 5300 -;; global options: printcmd include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600 include. 300 IN NS ns.include. a.include. 300 IN A 10.0.0.1 @@ -14,9 +11,6 @@ c.b.include. 300 IN A 10.0.0.3 b.foo.b.include. 300 IN A 10.0.2.2 ns.include. 300 IN A 127.0.0.1 include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600 - -; <<>> DiG 9.2.0b2 <<>> +nostats ttl2. axfr @10.53.0.1 -p 5300 -;; global options: printcmd ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3 ttl2. 1 IN NS ns.ttl2. a.ttl2. 1 IN TXT "inherited ttl 1" @@ -26,9 +20,6 @@ d.ttl2. 3 IN TXT "default ttl 3" e.ttl2. 2 IN TXT "explicit ttl 2" f.ttl2. 3 IN TXT "default ttl 3" ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3 - -; <<>> DiG 9.2.0b2 <<>> +nostats ttl2. axfr @10.53.0.1 -p 5300 -;; global options: printcmd ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3 ttl2. 1 IN NS ns.ttl2. a.ttl2. 1 IN TXT "inherited ttl 1" diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh index a095b64374..5de334913e 100644 --- a/bin/tests/system/masterfile/tests.sh +++ b/bin/tests/system/masterfile/tests.sh @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.1 2001/08/01 19:01:01 gson Exp $ +# $Id: tests.sh,v 1.2 2001/08/09 00:10:56 gson Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -23,13 +23,13 @@ SYSTEMTESTTOP=.. status=0 echo "I:test master file \$INCLUDE semantics" -$DIG +nostats include. axfr @10.53.0.1 -p 5300 >dig.out +$DIG +nostats +nocmd include. axfr @10.53.0.1 -p 5300 >dig.out echo "I:test master file BIND 8 compatibility TTL and \$TTL semantics" -$DIG +nostats ttl2. axfr @10.53.0.1 -p 5300 >>dig.out +$DIG +nostats +nocmd ttl2. axfr @10.53.0.1 -p 5300 >>dig.out echo "I:test of master file RFC1035 TTL and \$TTL semantics" -$DIG +nostats ttl2. axfr @10.53.0.1 -p 5300 >>dig.out +$DIG +nostats +nocmd ttl2. axfr @10.53.0.1 -p 5300 >>dig.out diff dig.out knowngood.dig.out || status=1