From: Stephen Morris <stephen@isc.org>
Date: Fri, 24 Nov 2017 12:24:09 +0000 (+0000)
Subject: [rt46602] Modify some test files to cope with the "-p" flag
X-Git-Tag: v9.13.0~158^2~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=517d990bd495ef2fcfe66726c0e68cacfe2bbb90;p=thirdparty%2Fbind9.git

[rt46602] Modify some test files to cope with the "-p" flag
---

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 2cadd168a14..f079d6502ed 100644
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -12,6 +12,7 @@ set -e
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
+. $SYSTEMTESTTOP/getopts.sh
 
 QPERF=`$SHELL qperf.sh`
 
diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 38e5a6a55b7..2fcff21ada7 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -13,6 +13,7 @@
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
+. $SYSTEMTESTTOP/getopts.sh
 
 ns=10.53.0
 ns1=$ns.1		# root, defining the others
@@ -66,7 +67,7 @@ if [ -z "$DNSRPS_TEST_MODE" ]; then
         echo "I:'dnsrps-only' found: skipping native RPZ sub-test"
     else
         echo "I:running native RPZ sub-test"
-	$SHELL ./$0 -D1 $ARGS || status=1
+	$SHELL ./$0 -p $port -- -D1 $ARGS || status=1
     fi
 
     if [ -e dnsrps-off ]; then
diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index 4906e1d79e7..ccee60cbb41 100644
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -9,6 +9,7 @@
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
+. $SYSTEMTESTTOP/getopts.sh
 
 #set -x