ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Remove bin/tests/system/clean.sh

Browse Source 
Since the role of the bin/tests/system/clean.sh script has now been
reduced to calling a given system test's clean.sh script, remove the
former altogether and replace its only use with a direct invocation of
the latter.
This commit is contained in:
Michał Kępień
2019-12-06 14:11:01 +01:00
parent b4d37878f6
commit bf3eeac067
4 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/tests/system/README
View File

@@ -242,12 +242,8 @@ If there is a requirement to re-run a test (or the entire test suite), the
files produced by the tests should be deleted first. Normally, these files are
deleted if the test succeeds but are retained on error.
Deletion of files produced by an individual test can be done with the command:
sh clean.sh <test-name>
Deletion of the files produced by the set of tests (e.g. after the execution
of "runall.sh") can be deleted by the command:
of "runall.sh") can be carried out using the command:
sh cleanall.sh
@@ -712,11 +708,10 @@ If the test fails, all these files are retained. But if the test succeeds,
they are cleaned up at different times:
1. Files generated by the test itself are cleaned up by the test's own
"clean.sh". This is called from the system's "clean.sh", which in turn is
called from "run.sh".
"clean.sh", which is called from "run.sh".
2. Files that may not be cleaned up if named exits abnormally are removed
by the system's "clean.sh".
2. Files that may not be cleaned up if named exits abnormally can be removed
using the "cleanall.sh" script.
3. "test.output.*" files are deleted when the test suite ends. At this point,
the file "testsummary.sh" is called which concatenates all the "test.output.*"

34
bin/tests/system/clean.sh
View File

@@ -1,34 +0,0 @@
#!/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.
#
# Clean up after a specified system test.
#
SYSTEMTESTTOP="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
. $SYSTEMTESTTOP/conf.sh
export SYSTEMTESTTOP
if [ $# -eq 0 ]; then
echo "usage: $0 test-directory" >&2
exit 1
fi
systest=$1
shift
if [ -f $systest/clean.sh ]; then
( cd $systest && $SHELL clean.sh "$@" )
else
echo "Test directory $systest does not exist" >&2
exit 1
fi

2
bin/tests/system/run.sh
View File

@@ -218,7 +218,7 @@ else
echopass "R:$systest:PASS"
if $clean
then
$SHELL clean.sh $runall $systest "$@"
( cd $systest && $SHELL clean.sh "$@" )
if test -d ../../../.git
then
git status -su --ignored $systest 2>/dev/null | \

1
util/copyrights
View File

@@ -447,7 +447,6 @@
./bin/tests/system/checkzone/tests.sh SH 2011,2012,2013,2014,2015,2016,2017,2018,2019
./bin/tests/system/checkzone/zones/.gitattributes X 2015,2018,2019
./bin/tests/system/checkzone/zones/bad-badclass.raw X 2015,2018,2019
./bin/tests/system/clean.sh SH 2015,2016,2018,2019
./bin/tests/system/cleanall.sh SH 2000,2001,2004,2007,2012,2014,2015,2016,2017,2018,2019
./bin/tests/system/cleanpkcs11.sh SH 2010,2012,2014,2016,2018,2019
./bin/tests/system/common/rndc.key X 2011,2013,2016,2018,2019