Remove cross-test dependency on ckdnsrps.sh

diff --git a/bin/tests/system/rpz/ckdnsrps.sh b/bin/tests/system/ckdnsrps.sh
similarity index 100%
rename from bin/tests/system/rpz/ckdnsrps.sh
rename to bin/tests/system/ckdnsrps.sh

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 64146a4a6ea368f52441958f7fc9c6f73d510f9c..b4c114eecc512886df221c686d858d4b5d728328 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -57,7 +57,7 @@ copy_setports dnsrpzd.conf.in dnsrpzd.conf
 # decide whether to test DNSRPS
 # Note that dnsrps.conf and dnsrps-slave.conf are included in named.conf
 # and differ from dnsrpz.conf which is used by dnsrpzd.
-$SHELL ../rpz/ckdnsrps.sh -A $TEST_DNSRPS $DEBUG
+$SHELL ../ckdnsrps.sh -A $TEST_DNSRPS $DEBUG
 test -z "`grep 'dnsrps-enable yes' dnsrps.conf`" && TEST_DNSRPS=
 
 # set up test policy zones.

diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index 44c46f051f4738d38fde9993e1093f5d72dab7f2..d15b1df6c8eeaddaa8a4c36391d8bb3c7380ef78 100644 (file)
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -63,7 +63,7 @@ do
 done
 
 # decide whether to test DNSRPS
-$SHELL ../rpz/ckdnsrps.sh $TEST_DNSRPS $DEBUG
+$SHELL ../ckdnsrps.sh $TEST_DNSRPS $DEBUG
 test -z "`grep 'dnsrps-enable yes' dnsrps.conf`" && TEST_DNSRPS=
 
 CWD=`pwd`

diff --git a/util/copyrights b/util/copyrights
index 097fdaee533fe494b21fc44fd947518ae4cbe0b7..7b80b03a7faab81bd1c69f4b9221f176f68d9ae1 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -281,6 +281,7 @@
 ./bin/tests/system/checkzone/setup.sh          SH      2014,2016,2018,2019,2020
 ./bin/tests/system/checkzone/tests.sh          SH      2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
 ./bin/tests/system/checkzone/zones/bad-badclass.raw    X       2015,2018,2019,2020
+./bin/tests/system/ckdnsrps.sh                 SH      2017,2018,2019,2020
 ./bin/tests/system/cleanall.sh                 SH      2000,2001,2004,2007,2012,2014,2015,2016,2017,2018,2019,2020
 ./bin/tests/system/cleanpkcs11.sh              SH      2010,2012,2014,2016,2018,2019,2020
 ./bin/tests/system/common/rndc.key             X       2011,2013,2016,2018,2019,2020
@@ -682,7 +683,6 @@
 ./bin/tests/system/rootkeysentinel/setup.sh    SH      2018,2019,2020
 ./bin/tests/system/rootkeysentinel/tests.sh    SH      2018,2019,2020
 ./bin/tests/system/rpz/README                  TXT.BRIEF       2019,2020
-./bin/tests/system/rpz/ckdnsrps.sh             SH      2017,2018,2019,2020
 ./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013,2014,2016,2017,2018,2019,2020
 ./bin/tests/system/rpz/dnsrps.c                        C       2017,2018,2019,2020
 ./bin/tests/system/rpz/dnsrpzd-license.conf    X       2017,2018,2019