Support starting and stopping IPv6 only servers

Look for $testdir/$server/named.ipv6-only and use
fd92:7065:b8e:ffff::$n instead of 10.53.0.$n to
communicate with the server.

(cherry picked from commit a35c34e10f69588ba12052b0f0c978514810a2a1)

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 634dd21f890e6f0d8ef7f18fb1cb383e8fcc79f0..80d25eea82f5889e4981c6d509cef8a0e8e48428 100755 (executable)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -425,8 +425,13 @@ sub verify_ns_server {
                $tcp = "";
        }
 
+       my $ip = "10.53.0.$n";
+       if (-e "$testdir/$server/named.ipv6-only") {
+               $ip = "fd92:7065:b8e:ffff::$n";
+       }
+
        while (1) {
-               my $return = system("$DIG $tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noedns -p $port version.bind. chaos txt \@10.53.0.$n > /dev/null");
+               my $return = system("$DIG $tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noedns -p $port version.bind. chaos txt \@$ip > /dev/null");
 
                last if ($return == 0);
 

diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index abed0bc6bfe5925073696aa00886240a323d2e95..6783b852353d81ee8973e5a0c4b20902448291e9 100644 (file)
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -183,6 +183,10 @@ sub stop_rndc {
        }
 
        my $ip = "10.53.0.$n";
+       if (-e "$testdir/$server/named.ipv6-only") {
+               $ip = "fd92:7065:b8e:ffff::$n";
+       }
+
        my $how = $halt ? "halt" : "stop";
 
        # Ugly, but should work.