2916. [func] Add framework to use IPv6 in tests.

                        fd92:7065:b8e:ffff::1 ... fd92:7065:b8e:ffff::7

diff --git a/CHANGES b/CHANGES
index 3a1cb67f58472279fd637e5431391791028d918e..03e281513bb8f84d17a98ea03f9ed1ef77ea2c22 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2916.  [func]          Add framework to use IPv6 in tests.
+                       fd92:7065:b8e:ffff::1 ... fd92:7065:b8e:ffff::7
+
 2915.  [cleanup]       Be smarter about which objects we attempt to compile
                        based on configure options. [RT #21444]
 

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index b12b42daf8e1de77567448b2c76d2da915b18c60..24242c3a5d0ce6c8e06bfe266bb7a735f5170c27 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: conf.sh.in,v 1.37.128.6 2010/06/05 23:46:58 tbox Exp $
+# $Id: conf.sh.in,v 1.37.128.7 2010/06/10 06:23:01 marka Exp $
 
 #
 # Common configuration data for system tests, to be sourced into
@@ -50,6 +50,17 @@ SUBDIRS="acl cacheclean checkconf checknames dlv dnssec forward glue ixfr
 
 # PERL will be an empty string if no perl interpreter was found.
 PERL=@PERL@
+if test -n "$PERL"
+then
+       if $PERL -e "use IO::Socket::INET6;" 2> /dev/null
+       then
+               TESTSOCK6="$PERL $TOP/bin/tests/system/testsock6.pl"
+       else
+               TESTSOCK6=false
+       fi
+else
+       TESTSOCK6=false
+fi
 
 export NAMED LWRESD DIG NSUPDATE KEYGEN SIGNER KEYSIGNER KEYSETTOOL PERL \
-    SUBDIRS RNDC CHECKZONE
+    SUBDIRS RNDC CHECKZONE TESTSOCK6

diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 74bb2d0f391ea06b899929e51d0bc7c1431767b5..4582fd258181cacd47fcd779f4fa5ce1e79ec0ed 100644 (file)
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -15,11 +15,14 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: ifconfig.sh,v 1.51.128.5 2009/06/26 23:46:40 tbox Exp $
+# $Id: ifconfig.sh,v 1.51.128.6 2010/06/10 06:23:01 marka Exp $
 
 #
 # Set up interface aliases for bind9 system tests.
 #
+# IPv4: 10.53.0.{1..7}                         RFC 1918
+# IPv6: fd92:7065:b8e:ffff::{1..7}             ULA
+#
 
 config_guess=""
 for f in ./config.guess ../../../config.guess
@@ -54,6 +57,11 @@ case "$2" in
 *) base=""
 esac
 
+case "$3" in
+[0-9]|[1-9][0-9]|[1-9][0-9][0-9]) base6=$2;;
+*) base6=""
+esac
+
 case "$1" in
 
     start|up)
@@ -65,6 +73,12 @@ case "$1" in
                else
                        int=$ns
                fi
+               if test -n "$base6"
+               then
+                       int6=`expr $ns + $base6 - 1`
+               else
+                       int6=$ns
+               fi
                case "$sys" in
                    *-pc-solaris2.5.1)
                        ifconfig lo0:$int 10.53.0.$ns netmask 0xffffffff up
@@ -75,18 +89,28 @@ case "$1" in
                    *-*-solaris2.[8-9]|*-*-solaris2.1[0-9])
                        /sbin/ifconfig lo0:$int plumb
                        /sbin/ifconfig lo0:$int 10.53.0.$ns up
+                       if test -n "$int6"
+                       then
+                               /sbin/ifconfig lo0:$int6 inet6 plumb
+                               /sbin/ifconfig lo0:$int6 \
+                                       inet6 fd92:7065:b8e:ffff::$ns up
+                       fi
                        ;;
                    *-*-linux*)
                        ifconfig lo:$int 10.53.0.$ns up netmask 255.255.255.0
+                       ifconfig lo inet6 add fd92:7065:b8e:ffff::$ns/64
                        ;;
                    *-unknown-freebsd*)
                        ifconfig lo0 10.53.0.$ns alias netmask 0xffffffff
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns alias
                        ;;
                    *-unknown-netbsd*)
                        ifconfig lo0 10.53.0.$ns alias netmask 255.255.255.0
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns alias
                        ;;
                    *-unknown-openbsd*)
                        ifconfig lo0 10.53.0.$ns alias netmask 255.255.255.0
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns alias
                        ;;
                    *-*-bsdi[3-5].*)
                        ifconfig lo0 add 10.53.0.$ns netmask 255.255.255.0
@@ -102,15 +126,18 @@ case "$1" in
                        ;;
                    *-ibm-aix4.*|*-ibm-aix5.*)
                        ifconfig lo0 alias 10.53.0.$ns
+                       ifconfig lo0 inet6 alias -dad fd92:7065:b8e:ffff::$ns/64
                        ;;
                    hpux)
-                       ifconfig lo0:$int 10.53.0.$ns up
+                       ifconfig lo0:$int 10.53.0.$ns netmask 255.255.255.0 up
+                       ifconfig lo0:$int inet6 fd92:7065:b8e:ffff::$ns up
                        ;;
                    *-sco3.2v*)
                        ifconfig lo0 alias 10.53.0.$ns
                        ;;
                    *-darwin*)
                        ifconfig lo0 alias 10.53.0.$ns
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns alias
                        ;;
                    *)
                        echo "Don't know how to set up interface.  Giving up."
@@ -138,18 +165,27 @@ case "$1" in
                    *-*-solaris2.[8-9]|*-*-solaris2.1[0-9])
                        ifconfig lo0:$int 10.53.0.$ns down
                        ifconfig lo0:$int 10.53.0.$ns unplumb
+                       if test -n "$int6"
+                       then
+                               ifconfig lo0:$int6 inet6 down
+                               ifconfig lo0:$int6 inet6 unplumb
+                       fi
                        ;;
                    *-*-linux*)
                        ifconfig lo:$int 10.53.0.$ns down
+                       ifconfig lo inet6 del fd92:7065:b8e:ffff::$ns/64
                        ;;
                    *-unknown-freebsd*)
                        ifconfig lo0 10.53.0.$ns delete
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns delete
                        ;;
                    *-unknown-netbsd*)
                        ifconfig lo0 10.53.0.$ns delete
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns delete
                        ;;
                    *-unknown-openbsd*)
                        ifconfig lo0 10.53.0.$ns delete
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns delete
                        ;;
                    *-*-bsdi[3-5].*)
                        ifconfig lo0 remove 10.53.0.$ns
@@ -165,15 +201,18 @@ case "$1" in
                        ;;
                    *-ibm-aix4.*|*-ibm-aix5.*)
                        ifconfig lo0 delete 10.53.0.$ns
+                       ifconfig lo0 delete inet6 fd92:7065:b8e:ffff::$ns/64
                        ;;
                    hpux)
-                       ifconfig lo0:$int 10.53.0.$ns down
+                       ifconfig lo0:$int 0.0.0.0
+                       ifconfig lo0:$int inet6 ::
                        ;;
                    *-sco3.2v*)
                        ifconfig lo0 -alias 10.53.0.$ns
                        ;;
                    *darwin*)
                        ifconfig lo0 -alias 10.53.0.$ns
+                       ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns delete
                        ;;
                    *)
                        echo "Don't know how to destroy interface.  Giving up."