[rt46602] Miscellaneous changes to fix rebase issues

(cherry picked from commit 7222c9fc76c2c6bdfc8bfa34ae650f4f47932c58)
(cherry picked from commit 3d4a4252669b803cc417ee25a00aad1ff745d051)

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index d5be8f01a2a98c1dcf2b60f4928d324c8dedbbfc..a9021e5b3fe1bd3fd2c97b8021dd49fa9c9b71cb 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -81,7 +81,7 @@ KRB5_CONFIG=/dev/null
 # be run sequentially.
 SUBDIRS="acl additional addzone autosign builtin
         cacheclean case chain checkconf @CHECKDS@ checknames
-        checkzone cookie @COVERAGE@ database delv digdelv dlv
+        checkzone cookie @COVERAGE@ database digdelv dlv
         dlz dlzexternal dlzredir dns64 dnssec dsdigest
         dscp ecdsa eddsa ednscompliance emptyzones fetchlimit filter-aaaa
         formerr forward geoip glue gost ixfr inline integrity

diff --git a/bin/tests/system/rpzrecurse/.gitignore b/bin/tests/system/rpzrecurse/.gitignore
index ed45f426ce1098bd9c106bb36470089582a38445..ab57b958626eed7e486ac9d3d1e850b9aa0a5d4b 100644 (file)
--- a/bin/tests/system/rpzrecurse/.gitignore
+++ b/bin/tests/system/rpzrecurse/.gitignore
@@ -2,6 +2,7 @@
 /ns2/named.conf.header
 /ns2/named.conf
 /ns3/named.conf
+/ns3/named2.conf
 /ns4/named.conf
 /ans5/ans.pl
 /ans5/ans.pid

diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index 3f0d8c4a2eaa344c3887a747a5baea49203aa368..8c334cc8fcf8b32dd6415e72996bfc50c186df3e 100644 (file)
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -24,6 +24,5 @@ rm -f ns*/named.conf
 rm -f ns2/*.local
 rm -f ns2/*.queries
 rm -f ns2/named.[0-9]*.conf
-rm -f ns*/named.lock
-rm -f ns*/named.memstats
-rm -f ns*/named.run
+rm -f ns2/named.conf.header
+rm -f ns*/session.key

diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.in b/bin/tests/system/rpzrecurse/ns1/named.conf.in
index 4747f2bd90e59fefb5e0b57ef409049aab2c081d..edc21740fc298072ec52074a6601ffc600123416 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns1/named.conf.in
+++ b/bin/tests/system/rpzrecurse/ns1/named.conf.in
@@ -27,6 +27,15 @@ options {
        querylog 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/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index 41d8ef6b0d6061f4a77d140a8098740fb9cfcf77..10c7d5c2fa78aabf79f8df5f5899f61dc06cec5b 100644 (file)
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -33,7 +33,8 @@ run_server() {
 
     echo_i "starting resolver using named.$TESTNAME.conf"
     cp -f ns2/named.$TESTNAME.conf ns2/named.conf
-    $PERL $SYSTEMTESTTOP/start.pl --noclean --restart . ns2
+    $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} . ns2
+    sleep 3
 }
 
 run_query() {