[rt46602] Miscellaneous changes to fix rebase issues

(cherry picked from commit 7222c9fc76c2c6bdfc8bfa34ae650f4f47932c58)

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 5ac1655102f3b05cd076942e279ffde6f2d4c418..790722bdfabfa28bc23630adbb1db1c65a73765a 100644 (file)
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -19,6 +19,8 @@ rm -f ns2/*.queries
 rm -f ns2/named.[0-9]*.conf
 rm -f ns2/named.conf.header
 
+rm -f ns3/named2.conf
+
 rm -f ans4/ans.pl
 
 rm -f dnsrps*.conf dnsrpzd*

diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.in b/bin/tests/system/rpzrecurse/ns1/named.conf.in
index 5cff0b05788ba864e7828cba5a116889344c6bce..7845b2648fe958c83b69a700b633f68692266864 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns1/named.conf.in
+++ b/bin/tests/system/rpzrecurse/ns1/named.conf.in
@@ -19,6 +19,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/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index 5bf1326505b06663bd9e05055cd5234efe1a7297..c3d648f88c00b7feb490433f3b0b48420408c7b6 100644 (file)
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -36,6 +36,7 @@ copy_setports ns2/named.conf.header.in ns2/named.conf.header
 copy_setports ns2/named.default.conf ns2/named.conf
 
 copy_setports ns3/named1.conf.in ns3/named.conf
+copy_setports ns3/named2.conf.in ns3/named2.conf
 
 copy_setports ns4/named.conf.in ns4/named.conf
 

diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index 90b15591aab11772a41440b4809cce5812962f93..b0ba801b289738ae6b43b8c8899bde7265829d44 100644 (file)
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -47,7 +47,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() {