Move custom-test-driver to bin/tests/system where it belongs

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 56daf105d6e0d475a9c7fb94c8aa751e76f8055b..c55c5305edf405e5dbb503f00e78e7dd59a5edfd 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -225,7 +225,7 @@ LOG_DRIVER_V_ = $(LOG_DRIVER_V_@AM_DEFAULT_V@)
 LOG_DRIVER_V_0 = --verbose no
 LOG_DRIVER_V_1 = --verbose yes
 
-LOG_DRIVER = $(top_srcdir)/custom-test-driver
+LOG_DRIVER = $(srcdir)/custom-test-driver
 AM_LOG_DRIVER_FLAGS = $(LOG_DRIVER_V)
 
 LOG_COMPILER = $(builddir)/run.sh

diff --git a/custom-test-driver b/bin/tests/system/custom-test-driver
similarity index 100%
rename from custom-test-driver
rename to bin/tests/system/custom-test-driver

diff --git a/util/copyrights b/util/copyrights
index cc82d5f756812652776c8d8da5ca43176ddcd690..be1d280c05de0ff9b20c6a40a8675c57dfb0d93e 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -293,6 +293,7 @@
 ./bin/tests/system/cookie/clean.sh             SH      2014,2015,2016,2018,2019,2020
 ./bin/tests/system/cookie/setup.sh             SH      2018,2019,2020
 ./bin/tests/system/cookie/tests.sh             SH      2014,2015,2016,2017,2018,2019,2020
+./bin/tests/system/custom-test-driver          X       2020
 ./bin/tests/system/database/clean.sh           SH      2011,2012,2014,2016,2018,2019,2020
 ./bin/tests/system/database/setup.sh           SH      2011,2012,2016,2018,2019,2020
 ./bin/tests/system/database/tests.sh           SH      2011,2012,2016,2018,2019,2020
@@ -1123,7 +1124,6 @@
 ./contrib/scripts/named-bootconf.sh            SH.PORTION      1999,2000,2001,2004,2006,2007,2012,2014,2016,2018,2019,2020
 ./contrib/scripts/nanny.pl                     PERL    2000,2001,2004,2007,2012,2014,2016,2018,2019,2020
 ./contrib/scripts/zone-edit.sh.in              SH      2010,2012,2014,2016,2018,2019,2020
-./custom-test-driver                           X       2020
 ./doc/arm/advanced.rst                         RST     2020
 ./doc/arm/catz.rst                             RST     2020
 ./doc/arm/conf.py                              PYTHON  2020