mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 01:59:26 +00:00
Code Issues Releases Wiki Activity

Remove invocations and mentions of clean.sh

Browse Source
This commit is contained in:
Nicki Křížek 2024-08-26 15:46:21 +02:00
parent 7c259fe254
commit f2cb2e5723
43 changed files with 1 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tests/system/acl/setup.sh
View File

@ -13,7 +13,6 @@
. ../conf.sh
$SHELL clean.sh
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/example.db
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/tsigzone.db
copy_setports ns2/named1.conf.in ns2/named.conf

1
bin/tests/system/additional/setup.sh
View File

@ -13,7 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named1.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/catz/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named1.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/checkds/setup.sh
View File

@ -16,8 +16,6 @@
set -e
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/checknames/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

3
bin/tests/system/conf.sh
View File

@ -232,8 +232,7 @@ private_type_record() {
# has been appended since the last time we read it.
#
# Calling some of these functions causes temporary *.prev files to be
# created that need to be cleaned up manually (usually by a given system
# test's clean.sh script).
# created.
#
# Note that unlike other nextpart*() functions, nextpartread() is not
# meant to be directly used in system tests; its sole purpose is to

2
bin/tests/system/conftest.py
View File

@ -326,8 +326,6 @@ def system_test_dir(request, system_test_name, expected_artifacts):
This fixture is responsible for creating (and potentially removing) a
copy of the system test directory which is used as a temporary
directory for the test execution.
FUTURE: This removes the need to have clean.sh scripts.
"""
def get_test_result():

2
bin/tests/system/cpu/setup.sh
View File

@ -16,6 +16,4 @@
set -e
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/dnssec/setup.sh
View File

@ -16,8 +16,6 @@
set -e
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

1
bin/tests/system/emptyzones/setup.sh
View File

@ -13,5 +13,4 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named1.conf.in ns1/named.conf

2
bin/tests/system/enginepkcs11/setup.sh
View File

@ -16,8 +16,6 @@
set -e
$SHELL clean.sh
OPENSSL_CONF= softhsm2-util --delete-token --token "softhsm2-enginepkcs11" >/dev/null 2>&1 || true
OPENSSL_CONF= softhsm2-util --init-token --free --pin 1234 --so-pin 1234 --label "softhsm2-enginepkcs11" | awk '/^The token has been initialized and is reassigned to slot/ { print $NF }'

1
bin/tests/system/forward/setup.sh
View File

@ -13,7 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
if $FEATURETEST --have-fips-dh; then

2
bin/tests/system/geoip2/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns2/named1.conf.in ns2/named.conf
for i in 1 2 3 4 5 6 7 other bogus; do

1
bin/tests/system/idna/setup.sh
View File

@ -13,5 +13,4 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/include-multiplecfg/setup.sh
View File

@ -13,6 +13,4 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/ixfr/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns3/named.conf.in ns3/named.conf
copy_setports ns4/named.conf.in ns4/named.conf

2
bin/tests/system/journal/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
cp ns1/generic.db.in ns1/changed.db
cp ns1/changed.ver1.jnl.saved ns1/changed.db.jnl

2
bin/tests/system/kasp/setup.sh
View File

@ -16,8 +16,6 @@
set -e
$SHELL clean.sh
mkdir keys
mkdir ns3/keys

4
bin/tests/system/legacy/build.sh
View File

@ -13,9 +13,5 @@
. ../conf.sh
$SHELL clean.sh
(cd ns6 && $SHELL -e sign.sh)
(cd ns7 && $SHELL -e sign.sh)
$SHELL clean.sh

2
bin/tests/system/logfileconfig/setup.sh
View File

@ -13,6 +13,4 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.plain.in ns1/named.conf

1
bin/tests/system/masterfile/setup.sh
View File

@ -13,6 +13,5 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/masterformat/setup.sh
View File

@ -14,8 +14,6 @@
# shellcheck source=conf.sh
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/mirror/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/nsec3/setup.sh
View File

@ -16,8 +16,6 @@
set -e
$SHELL clean.sh
copy_setports ns2/named.conf.in ns2/named.conf
(
cd ns2

2
bin/tests/system/nslookup/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/example.db
copy_setports ns1/named.conf.in ns1/named.conf

5
bin/tests/system/nsupdate/setup.sh
View File

@ -13,11 +13,6 @@
. ../conf.sh
#
# jnl and database files MUST be removed before we start
#
$SHELL clean.sh
if $FEATURETEST --have-fips-dh; then
copy_setports ns1/tls.conf.in ns1/tls.conf
copy_setports ns1/tls.options.in ns1/tls.options

2
bin/tests/system/padding/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL ./clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/pending/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/pipelined/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/proxy/setup.sh
View File

@ -14,8 +14,6 @@
# shellcheck disable=SC1091
. ../conf.sh
$SHELL clean.sh
$SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db
$SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns3/example.db

2
bin/tests/system/rpz/setup.sh
View File

@ -15,8 +15,6 @@ set -e
. ../conf.sh
$SHELL clean.sh
for dir in ns*; do
touch $dir/named.run
nextpart $dir/named.run >/dev/null

2
bin/tests/system/rpzrecurse/setup.sh
View File

@ -15,8 +15,6 @@ set -e
. ../conf.sh
$SHELL clean.sh
$PERL testgen.pl
copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/rrl/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

1
bin/tests/system/rrsetorder/setup.sh
View File

@ -13,7 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/runtime/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns2/named1.conf.in ns2/named.conf
copy_setports ns2/named-alt1.conf.in ns2/named-alt1.conf

2
bin/tests/system/serve-stale/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named1.conf.in ns1/named.conf
copy_setports ns3/named.conf.in ns3/named.conf
copy_setports ns4/named.conf.in ns4/named.conf

2
bin/tests/system/tcp/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf

2
bin/tests/system/transport-acl/setup.sh
View File

@ -14,8 +14,6 @@
# shellcheck disable=SC1091
. ../conf.sh
$SHELL clean.sh
$SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db
copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/transport-change/setup.sh
View File

@ -14,8 +14,6 @@
# shellcheck disable=SC1091
. ../conf.sh
$SHELL clean.sh
$SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db
copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/tsig/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
if $FEATURETEST --md5; then
copy_setports ns1/named-fips.conf.in ns1/named-fips.conf
# includes named-fips.conf

2
bin/tests/system/tsiggss/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
key=$($KEYGEN -Cq -K ns1 -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -n HOST -T KEY key.example.nil.)

2
bin/tests/system/zonechecks/setup.sh
View File

@ -13,8 +13,6 @@
. ../conf.sh
$SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf

4
doc/dev/dev.md
View File

@ -176,10 +176,6 @@ The following standard files are found in system test directories:
- `tests.sh`: runs all the test cases. A non-zero return value results in R:FAIL
- `clean.sh`: run at the end to clean up temporary files, but only if the
test was completed successfully; otherwise the temporary files are left
in place for inspection.
- `ns[X]`: these subdirectories contain test name servers that can be
queried or can interact with each other. (For example, `ns1` might be
running as a root server, `ns2` as a TLD server, and `ns3` as a recursive