diff --git a/bin/tests/fromhex.pl b/bin/tests/system/fromhex.pl similarity index 100% rename from bin/tests/fromhex.pl rename to bin/tests/system/fromhex.pl diff --git a/bin/tests/system/journal/setup.sh b/bin/tests/system/journal/setup.sh index 2d74750df9..4a5253900c 100644 --- a/bin/tests/system/journal/setup.sh +++ b/bin/tests/system/journal/setup.sh @@ -42,4 +42,4 @@ cp ns1/generic.db.in ns1/maxjournal2.db cp ns1/maxjournal2.jnl.saved ns1/maxjournal2.db.jnl cp ns1/managed-keys.bind.in ns1/managed-keys.bind -$PERL ../../fromhex.pl < ns1/managed-keys.bind.jnl.in > ns1/managed-keys.bind.jnl +$PERL ../fromhex.pl < ns1/managed-keys.bind.jnl.in > ns1/managed-keys.bind.jnl diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in index c189c3d084..45964d7d87 100644 --- a/bin/tests/system/run.sh.in +++ b/bin/tests/system/run.sh.in @@ -92,7 +92,7 @@ if [ "${srcdir}" != "${builddir}" ]; then cp -a "${srcdir}/common" "${builddir}" fi # Some tests require additional files to work for out-of-tree test runs. - for file in ckdnsrps.sh digcomp.pl ditch.pl kasp.sh packet.pl start.pl stop.pl testcrypto.sh; do + for file in ckdnsrps.sh digcomp.pl ditch.pl fromhex.pl kasp.sh packet.pl start.pl stop.pl testcrypto.sh; do if [ ! -r "${file}" ]; then cp -a "${srcdir}/${file}" "${builddir}" fi diff --git a/util/copyrights b/util/copyrights index 62238cf872..fb258a5370 100644 --- a/util/copyrights +++ b/util/copyrights @@ -203,7 +203,6 @@ ./bin/rndc/win32/rndc.vcxproj.filters.in X 2013,2015,2018,2019,2020 ./bin/rndc/win32/rndc.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 ./bin/rndc/win32/rndc.vcxproj.user X 2013,2018,2019,2020,2021 -./bin/tests/fromhex.pl PERL 2015,2016,2018,2019,2020,2021 ./bin/tests/prepare-softhsm2.sh SH 2020,2021 ./bin/tests/startperf/README X 2011,2018,2019,2020,2021 ./bin/tests/startperf/clean.sh SH 2011,2012,2016,2018,2019,2020,2021 @@ -468,6 +467,7 @@ ./bin/tests/system/forward/ns2/example.db X 2000,2001,2018,2019 ./bin/tests/system/forward/setup.sh SH 2018,2019,2020,2021 ./bin/tests/system/forward/tests.sh SH 2000,2001,2004,2007,2011,2012,2013,2014,2016,2018,2019,2020,2021 +./bin/tests/system/fromhex.pl PERL 2015,2016,2018,2019,2020,2021 ./bin/tests/system/genzone.sh SH 2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 ./bin/tests/system/geoip2/clean.sh SH 2019,2020,2021 ./bin/tests/system/geoip2/data/GeoIP2-City.json X 2019,2020,2021