From 8578d11ca7d893b590c5dcf2e6a49ab550fc6fa2 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Wed, 27 Feb 2019 16:24:03 +0100 Subject: [PATCH] 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. --- bin/tests/system/checkconf/setup.sh | 15 +++++++++++++++ bin/tests/system/checkzone/setup.sh | 2 ++ bin/tests/system/rrchecker/setup.sh | 15 +++++++++++++++ bin/tests/system/tools/setup.sh | 15 +++++++++++++++ util/copyrights | 3 +++ 5 files changed, 50 insertions(+) create mode 100644 bin/tests/system/checkconf/setup.sh create mode 100644 bin/tests/system/rrchecker/setup.sh create mode 100644 bin/tests/system/tools/setup.sh diff --git a/bin/tests/system/checkconf/setup.sh b/bin/tests/system/checkconf/setup.sh new file mode 100644 index 0000000000..5079232741 --- /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 6814431805..233434e40c 100644 --- 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/rrchecker/setup.sh b/bin/tests/system/rrchecker/setup.sh new file mode 100644 index 0000000000..5079232741 --- /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/bin/tests/system/tools/setup.sh b/bin/tests/system/tools/setup.sh new file mode 100644 index 0000000000..5079232741 --- /dev/null +++ b/bin/tests/system/tools/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 a62df91cb9..9bbcbcf549 100644 --- a/util/copyrights +++ b/util/copyrights @@ -420,6 +420,7 @@ ./bin/tests/system/checkconf/dnssec.2 X 2011,2016,2018,2019 ./bin/tests/system/checkconf/dnssec.3 X 2011,2016,2017,2018,2019 ./bin/tests/system/checkconf/good.zonelist X 2016,2017,2018,2019 +./bin/tests/system/checkconf/setup.sh SH 2019 ./bin/tests/system/checkconf/tests.sh SH 2005,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019 ./bin/tests/system/checkds/clean.sh SH 2012,2013,2014,2016,2017,2018,2019 ./bin/tests/system/checkds/dig.bat BAT 2016,2018,2019 @@ -964,6 +965,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/clean.sh SH 2012,2013,2014,2016,2018,2019 @@ -1099,6 +1101,7 @@ ./bin/tests/system/tkey/setup.sh SH 2001,2004,2007,2009,2012,2013,2014,2016,2017,2018,2019 ./bin/tests/system/tkey/tests.sh SH 2001,2004,2007,2009,2011,2012,2013,2014,2016,2017,2018,2019 ./bin/tests/system/tools/clean.sh SH 2017,2018,2019 +./bin/tests/system/tools/setup.sh SH 2019 ./bin/tests/system/tools/tests.sh SH 2017,2018,2019 ./bin/tests/system/tsig/clean.sh SH 2005,2006,2007,2012,2014,2016,2018,2019 ./bin/tests/system/tsig/setup.sh SH 2016,2017,2018,2019