fix legacy test

use rndc rather than signals to stop the server

diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in
index c5833a41c68bbb0308f73b3a58083553e97c7ec8..61e842a9bbc6ea4ed1e4dadd463ab3f1939d13b9 100644 (file)
--- a/bin/tests/system/legacy/ns1/named1.conf.in
+++ b/bin/tests/system/legacy/ns1/named1.conf.in
@@ -20,6 +20,15 @@ options {
        recursion yes;
 };
 
+key rndc_key {
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
+};
+
+controls {
+       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+};
+
 zone "." {
        type master;
        file "root.db";

diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index 9e39c4f52543a8d45d130ca79c17e717d236cc53..ea12ca04671f4ff65d6af142aba507c23b1c113a 100755 (executable)
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.sh
@@ -144,10 +144,8 @@ status=`expr $status + $ret`
 
 if $SHELL ../testcrypto.sh > /dev/null 2>&1
 then
-    $PERL $SYSTEMTESTTOP/stop.pl legacy ns1
-
+    $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} legacy ns1
     copy_setports ns1/named2.conf.in ns1/named.conf
-
     $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} legacy ns1
 
     n=`expr $n + 1`