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 0763ed9ace00798fd9baa34d57cf45c547c76c57..f0d0f7fa016f64750d2bba0f100994322d7db512 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -58,7 +58,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 36786a72dee78092ae77f5808009b0f052f4ba21..feecb86a47cbf2dac5909214fa5e2bd123850e7b 100644 (file)
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -65,7 +65,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 c2e5080167ff736aa6a6c98c052d356b7c7e47ce..5897c3754a0dc753cee45d0bbbb2145d25068669 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -382,6 +382,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
@@ -864,7 +865,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