diff --git a/bin/tests/system/delv/clean.sh b/bin/tests/system/delv/clean.sh deleted file mode 100644 index e10c430f82..0000000000 --- a/bin/tests/system/delv/clean.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 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. - -rm -f delv.out.test* -rm -f */named.memstats -rm -f */named.run diff --git a/bin/tests/system/delv/ns1/named.conf b/bin/tests/system/delv/ns1/named.conf deleted file mode 100644 index 8f3cc63d8a..0000000000 --- a/bin/tests/system/delv/ns1/named.conf +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2014 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. - */ - -// NS1 - -controls { /* empty */ }; - -options { - query-source address 10.53.0.1; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { fd92:7065:b8e:ffff::1; }; - recursion no; - notify yes; - dnssec-enable no; - dnssec-validation no; -}; - -zone "." { - type master; - file "root.db"; -}; - diff --git a/bin/tests/system/delv/ns1/root.db b/bin/tests/system/delv/ns1/root.db deleted file mode 100644 index cce91c375b..0000000000 --- a/bin/tests/system/delv/ns1/root.db +++ /dev/null @@ -1,29 +0,0 @@ -; Copyright (C) 2014 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. - -$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. -a.root-servers.nil. A 10.53.0.1 -a.root-servers.nil. AAAA fd92:7065:b8e:ffff::1 - -example. NS ns2.example. -ns2.example. A 10.53.0.2 -ns2.example. AAAA fd92:7065:b8e:ffff::2 diff --git a/bin/tests/system/delv/ns2/example.db b/bin/tests/system/delv/ns2/example.db deleted file mode 100644 index b94dc32b8c..0000000000 --- a/bin/tests/system/delv/ns2/example.db +++ /dev/null @@ -1,39 +0,0 @@ -; Copyright (C) 2014 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. - -$TTL 300 ; 5 minutes -@ IN SOA mname1. . ( - 2000042407 ; serial - 20 ; refresh (20 seconds) - 20 ; retry (20 seconds) - 1814400 ; expire (3 weeks) - 3600 ; minimum (1 hour) - ) - NS ns2 - NS ns3 -ns2 A 10.53.0.2 -ns2 AAAA fd92:7065:b8e:ffff::2 -ns3 A 10.53.0.3 -ns3 AAAA fd92:7065:b8e:ffff::3 - -a A 10.0.0.1 -a AAAA fd92:7065:b8e:ffff::1 -b A 10.0.0.2 -b AAAA fd92:7065:b8e:ffff::2 -c A 10.0.0.3 -c AAAA fd92:7065:b8e:ffff::3 - -foo TXT "testing" -foo A 10.0.1.0 -foo SSHFP 2 1 123456789abcdef67890123456789abcdef67890 diff --git a/bin/tests/system/delv/ns2/named.conf b/bin/tests/system/delv/ns2/named.conf deleted file mode 100644 index 04bf1aadd9..0000000000 --- a/bin/tests/system/delv/ns2/named.conf +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2014 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. - */ - -// NS2 - -controls { /* empty */ }; - -options { - query-source address 10.53.0.2; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.2; }; - listen-on-v6 { fd92:7065:b8e:ffff::2; }; - recursion no; - dnssec-enable no; - dnssec-validation no; -}; - -zone "." { - type hint; - file "../../common/root.hint"; -}; - -zone "example" { - type master; - file "example.db"; -}; diff --git a/bin/tests/system/delv/ns3/named.conf b/bin/tests/system/delv/ns3/named.conf deleted file mode 100644 index 9033663703..0000000000 --- a/bin/tests/system/delv/ns3/named.conf +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2014 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. - */ - -// NS4 - -controls { /* empty */ }; - -options { - query-source address 10.53.0.3 dscp 1; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { fd92:7065:b8e:ffff::3; }; - recursion yes; - acache-enable yes; - dnssec-enable no; - dnssec-validation no; -}; - -zone "." { - type hint; - file "../../common/root.hint"; -}; diff --git a/bin/tests/system/delv/tests.sh b/bin/tests/system/delv/tests.sh deleted file mode 100644 index 2b0d1f98bf..0000000000 --- a/bin/tests/system/delv/tests.sh +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (C) 2014 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. - -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh - -status=0 -n=0 -# using delv insecure mode as not testing dnssec here -DELVOPTS="-i -p 5300" - -if [ -x ${DELV} ] ; then - n=`expr $n + 1` - echo "I:checking delv short form works ($n)" - ret=0 - $DELV $DELVOPTS @10.53.0.3 +short a a.example > delv.out.test$n || ret=1 - if test `wc -l < delv.out.test$n` != 1 ; then ret=1 ; fi - if [ $ret != 0 ]; then echo "I:failed"; fi - status=`expr $status + $ret` - - n=`expr $n + 1` - echo "I:checking delv split width works ($n)" - ret=0 - $DELV $DELVOPTS @10.53.0.3 +split=4 -t sshfp foo.example > delv.out.test$n || ret=1 - grep " 9ABC DEF6 7890 " < delv.out.test$n > /dev/null || ret=1 - if [ $ret != 0 ]; then echo "I:failed"; fi - status=`expr $status + $ret` - - echo "I:checking delv with IPv6 on IPv4 does not work ($n)" - n=`expr $n + 1` - if $TESTSOCK6 fd92:7065:b8e:ffff::3 - then - ret=0 - # following should fail because @IPv4 overrides earlier @IPv6 above - # and -6 forces IPv6 so this should fail, such as: - # ;; getaddrinfo failed: hostname nor servname provided, or not known - # ;; resolution failed: not found - # note that delv returns success even on lookup failure - $DELV $DELVOPTS @fd92:7065:b8e:ffff::3 @10.53.0.3 -6 -t txt foo.example > delv.out.test$n 2>&1 || ret=1 - # it should have no results but error output - grep "testing" < delv.out.test$n > /dev/null && ret=1 - grep "getaddrinfo failed:" < delv.out.test$n > /dev/null || ret=1 - if [ $ret != 0 ]; then echo "I:failed"; fi - status=`expr $status + $ret` - else - echo "I:IPv6 unavailable; skipping" - fi - - n=`expr $n + 1` - echo "I:checking delv with reverse lookup works ($n)" - ret=0 - $DELV $DELVOPTS @10.53.0.3 -x 127.0.0.1 > delv.out.test$n 2>&1 || ret=1 - # doesn't matter if has answer - grep -i "127\.in-addr\.arpa\." < delv.out.test$n > /dev/null || ret=1 - if [ $ret != 0 ]; then echo "I:failed"; fi - status=`expr $status + $ret` - - exit $status -else - echo "$DELV is needed, so skipping these delv tests" -fi