Ensure all system tests run clean.sh from setup.sh

For consistency between all system tests, add missing setup.sh scripts
for tests which do not have one yet and ensure every setup.sh script
calls its respective clean.sh script.

(cherry picked from commit e41080391943349e0b5de624a151d6c07425cfef)

diff --git a/bin/tests/system/checkconf/setup.sh b/bin/tests/system/checkconf/setup.sh
new file mode 100644 (file)
index 0000000..5079232
--- /dev/null
+++ b/bin/tests/system/checkconf/setup.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# shellcheck source=conf.sh
+. "$SYSTEMTESTTOP/conf.sh"
+
+$SHELL clean.sh

diff --git a/bin/tests/system/checkzone/setup.sh b/bin/tests/system/checkzone/setup.sh
index 68144318054d36c51bc767e61ba425c81326415f..233434e40c49371f2011948ff6b43350c717b913 100644 (file)
--- a/bin/tests/system/checkzone/setup.sh
+++ b/bin/tests/system/checkzone/setup.sh
@@ -10,6 +10,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 ln -s $CHECKZONE named-compilezone
 
 ./named-compilezone -D -F raw -o good1.db.raw example \

diff --git a/bin/tests/system/lwresd/setup.sh b/bin/tests/system/lwresd/setup.sh
new file mode 100644 (file)
index 0000000..5079232
--- /dev/null
+++ b/bin/tests/system/lwresd/setup.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# shellcheck source=conf.sh
+. "$SYSTEMTESTTOP/conf.sh"
+
+$SHELL clean.sh

diff --git a/bin/tests/system/rrchecker/setup.sh b/bin/tests/system/rrchecker/setup.sh
new file mode 100644 (file)
index 0000000..5079232
--- /dev/null
+++ b/bin/tests/system/rrchecker/setup.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# shellcheck source=conf.sh
+. "$SYSTEMTESTTOP/conf.sh"
+
+$SHELL clean.sh

diff --git a/util/copyrights b/util/copyrights
index 8f718e9cc08372023e7ccd015b464c13fe227269..f61f7237518463c8d3e8d7f3fc26aba09bf89997 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -809,6 +809,7 @@
 ./bin/tests/system/checkconf/notify.conf       CONF-C  2014,2016,2018,2019
 ./bin/tests/system/checkconf/portrange-good.conf       CONF-C  2015,2016,2018,2019
 ./bin/tests/system/checkconf/range.conf                CONF-C  2013,2016,2018,2019
+./bin/tests/system/checkconf/setup.sh          SH      2019
 ./bin/tests/system/checkconf/shared.example.db ZONE    2015,2016,2018,2019
 ./bin/tests/system/checkconf/tests.sh          SH      2005,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019
 ./bin/tests/system/checkconf/view-class-any1.conf      CONF-C  2016,2018,2019
@@ -1640,6 +1641,7 @@
 ./bin/tests/system/lwresd/ns1/named.conf       CONF-C  2000,2001,2004,2006,2007,2008,2016,2018,2019
 ./bin/tests/system/lwresd/ns1/root.db          ZONE    2000,2001,2004,2007,2016,2018,2019
 ./bin/tests/system/lwresd/resolv.conf          CONF-SH 2000,2001,2004,2007,2012,2016,2018,2019
+./bin/tests/system/lwresd/setup.sh             SH      2019
 ./bin/tests/system/lwresd/tests.sh             SH      2000,2001,2004,2007,2011,2012,2013,2014,2016,2018,2019
 ./bin/tests/system/masterfile/clean.sh         SH      2001,2004,2007,2010,2012,2014,2015,2016,2018,2019
 ./bin/tests/system/masterfile/knowngood.dig.out        X       2001,2004,2012,2018,2019
@@ -2018,6 +2020,7 @@
 ./bin/tests/system/rrchecker/classlist.good    X       2013,2018,2019
 ./bin/tests/system/rrchecker/clean.sh          SH      2013,2014,2016,2017,2018,2019
 ./bin/tests/system/rrchecker/privatelist.good  X       2013,2018,2019
+./bin/tests/system/rrchecker/setup.sh          SH      2019
 ./bin/tests/system/rrchecker/tests.sh          SH      2013,2014,2015,2016,2017,2018,2019
 ./bin/tests/system/rrchecker/typelist.good     X       2013,2014,2015,2016,2017,2018,2019
 ./bin/tests/system/rrl/broken.conf             CONF-C  2016,2018,2019