Automatically run clean.sh from run.sh

The first step in all existing setup.sh scripts is to call clean.sh.  To
reduce code duplication and ensure all system tests added in the future
behave consistently with existing ones, invoke clean.sh from run.sh
before calling setup.sh.

(cherry picked from commit d8905b7a9ceafedf782dca78bc454364ad52cfe9)

diff --git a/bin/tests/system/README b/bin/tests/system/README
index d7529c6448d0feafbd1a4adc990223bc5b124148..6c23e5a261f07220bfbc9b9886bdce0162210ada 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -240,7 +240,9 @@ Re-Running the Tests
 ---
 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.
+deleted if the test succeeds but are retained on error.  The run.sh script
+automatically calls a given test's clean.sh script before invoking its setup.sh
+script.
 
 Deletion of the files produced by the set of tests (e.g. after the execution
 of "runall.sh") can be carried out using the command:

diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh
index e410e03df212b90a2c6a4ce641f3724356225748..ad952264584c4f5e2e989a732e0686ece2c5b6d9 100644 (file)
--- a/bin/tests/system/acl/setup.sh
+++ b/bin/tests/system/acl/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 $SHELL ../genzone.sh 2 3 >ns2/example.db
 $SHELL ../genzone.sh 2 3 >ns2/tsigzone.db
 copy_setports ns2/named1.conf.in ns2/named.conf

diff --git a/bin/tests/system/additional/setup.sh b/bin/tests/system/additional/setup.sh
index 417a8b872f18cb391012a5b64f8cf72241d393de..9157bca2a536635725bdc9dd35fccca9cb560f61 100644 (file)
--- a/bin/tests/system/additional/setup.sh
+++ b/bin/tests/system/additional/setup.sh
@@ -12,6 +12,5 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named1.conf.in ns1/named.conf
 copy_setports ns3/named.conf.in ns3/named.conf

diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index a394cdb2ded6ee370d3f9840200ebc069384d284..9e294c0391298d0462cc382abcfee1f66fb0953f 100644 (file)
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named1.conf.in ns2/named.conf
 cp -f ns2/default.nzf.in ns2/3bf305731dd26307.nzf

diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh
index da2e3d79e27cbc651b553680860ddbb04e39380e..10b3c934a5eca5c179d182da3906bbb6a16dbab7 100644 (file)
--- a/bin/tests/system/allow-query/setup.sh
+++ b/bin/tests/system/allow-query/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ../common/controls.conf.in ns2/controls.conf
 copy_setports  ns1/named.conf.in ns1/named.conf
 copy_setports  ns2/named01.conf.in ns2/named.conf

diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index d04450b6676f82657e57f26a3573cd23fd1c9814..ef898ccc90a978ce8cf1c6308723c8c36efd58a2 100644 (file)
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/builtin/setup.sh b/bin/tests/system/builtin/setup.sh
index c9f645b29ea4057f0a206c4ddedb5e076a3253ca..def2a615acccafbe9c9b2e9eb028d4bbcbfef6b1 100644 (file)
--- a/bin/tests/system/builtin/setup.sh
+++ b/bin/tests/system/builtin/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/cacheclean/setup.sh b/bin/tests/system/cacheclean/setup.sh
index 85855f32289aaa55816c7ee33557715775b79665..f3826d8683746899567582bd5944fccce3b8a2bc 100644 (file)
--- a/bin/tests/system/cacheclean/setup.sh
+++ b/bin/tests/system/cacheclean/setup.sh
@@ -12,6 +12,5 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh
index 53f01c4fc53af0f901ff4c97c6fc702cb3ea6892..bc5d9de9bd9b4ba97be9103a03038e030ec9e9b4 100644 (file)
--- a/bin/tests/system/case/setup.sh
+++ b/bin/tests/system/case/setup.sh
@@ -10,8 +10,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 cp -f ns1/dynamic.db.in ns1/dynamic.db
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
index 19e11c9daea15d78fcebe44e9997222dce00772e..e06f3a02e9172deba0cbe4ad1e3d0528f5800ee4 100644 (file)
--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/chain/setup.sh b/bin/tests/system/chain/setup.sh
index ac6cf821f0e4c532c662b305fe4d0d9ba8e390bc..0b648c0c519baefdf1a116c5b9eaab4231a6f3db 100644 (file)
--- a/bin/tests/system/chain/setup.sh
+++ b/bin/tests/system/chain/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/checkconf/setup.sh b/bin/tests/system/checkconf/setup.sh
deleted file mode 100644 (file)
index 5079232..0000000
--- a/bin/tests/system/checkconf/setup.sh
+++ /dev/null
@@ -1,15 +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.
-
-# shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
-
-$SHELL clean.sh

diff --git a/bin/tests/system/checkds/setup.sh b/bin/tests/system/checkds/setup.sh
deleted file mode 100644 (file)
index 1405375..0000000
--- a/bin/tests/system/checkds/setup.sh
+++ /dev/null
@@ -1,15 +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.
-
-SYSTEMTESTTOP=..
-. $SYSTEMTESTTOP/conf.sh
-
-$SHELL clean.sh

diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh
index 28d0c4482520c6ac612b7ccab74cec69306a45c7..117c5022d75e95596f79b4cadb86e5b631aae2fb 100644 (file)
--- a/bin/tests/system/checknames/setup.sh
+++ b/bin/tests/system/checknames/setup.sh
@@ -10,8 +10,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/checkzone/setup.sh b/bin/tests/system/checkzone/setup.sh
index 233434e40c49371f2011948ff6b43350c717b913..68144318054d36c51bc767e61ba425c81326415f 100644 (file)
--- a/bin/tests/system/checkzone/setup.sh
+++ b/bin/tests/system/checkzone/setup.sh
@@ -10,8 +10,6 @@
 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/cookie/setup.sh b/bin/tests/system/cookie/setup.sh
index f4b133502230fa25cf9be0fac10407812327eaf6..edcb780294ed43e0d3e95aa2b1072feec4602b4d 100644 (file)
--- a/bin/tests/system/cookie/setup.sh
+++ b/bin/tests/system/cookie/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/coverage/setup.sh b/bin/tests/system/coverage/setup.sh
index 7b9c014279987d28acb01ceaec90e265dc1364c7..31153a7d42b7498f4aa1d2d465c7b859ab7d788c 100644 (file)
--- a/bin/tests/system/coverage/setup.sh
+++ b/bin/tests/system/coverage/setup.sh
@@ -14,8 +14,6 @@ SYSTEMTESTTOP=..
 
 KEYGEN="$KEYGEN -qr $RANDFILE"
 
-$SHELL clean.sh
-
 ln -s $CHECKZONE named-compilezone
 
 # Test 1: KSK goes inactive before successor is active

diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh
index 083ebf34af74216dfd936fa9003d5588b18bb509..8aa0d68bc19dafdb4d311016630122ccfb7ac3cc 100644 (file)
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named1.conf.in ns1/named.conf

diff --git a/bin/tests/system/delzone/setup.sh b/bin/tests/system/delzone/setup.sh
deleted file mode 100644 (file)
index 1405375..0000000
--- a/bin/tests/system/delzone/setup.sh
+++ /dev/null
@@ -1,15 +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.
-
-SYSTEMTESTTOP=..
-. $SYSTEMTESTTOP/conf.sh
-
-$SHELL clean.sh

diff --git a/bin/tests/system/dialup/setup.sh b/bin/tests/system/dialup/setup.sh
deleted file mode 100644 (file)
index e0dc939..0000000
--- a/bin/tests/system/dialup/setup.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/digdelv/setup.sh b/bin/tests/system/digdelv/setup.sh
index c9f645b29ea4057f0a206c4ddedb5e076a3253ca..def2a615acccafbe9c9b2e9eb028d4bbcbfef6b1 100644 (file)
--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index b89da828c76b172fe72a31001e92d5d14071bfe7..ee8dc13f128e55eb059186427105b903d940a4e6 100644 (file)
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dlz/setup.sh b/bin/tests/system/dlz/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/dlz/setup.sh
+++ b/bin/tests/system/dlz/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index 8deb456dab29118b8f7c882defccae0956451fec..8279398d4212e63709359b19d610fb5debcbacdd 100644 (file)
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 $DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key

diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index be3734b83b3c9c4971e5d9eb196dd270df936df1..141512e8ee4180004c290281bc1e49f308e4079d 100644 (file)
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index a6838de97c1a52f5c6469be39883460c3120afe3..95d6e31f6cebbf81a6f28aa88520a5385f310b60 100644 (file)
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh 
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dnstap/setup.sh b/bin/tests/system/dnstap/setup.sh
index 3a14fe9e3ac85392b4f9f2a0af994a7a2c3b24d2..607a341724674d76edd154cd8b259999b9947d50 100644 (file)
--- a/bin/tests/system/dnstap/setup.sh
+++ b/bin/tests/system/dnstap/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/dscp/setup.sh b/bin/tests/system/dscp/setup.sh
index fa6de38c00d1b40fd5a0a21fe41d003cdfca7cfa..87951d7c9c710c2dda6becce675be345f893bbc2 100644 (file)
--- a/bin/tests/system/dscp/setup.sh
+++ b/bin/tests/system/dscp/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh
index 66d4af3bb91d3ca9d7468f5a8fefa8685215e948..c7ade46d017a45be3f44021d3a1431cf6b605bd7 100644 (file)
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dupsigs/setup.sh b/bin/tests/system/dupsigs/setup.sh
index 0cc4048bee69eff5c1b37743662a3caf2548db22..dcfd5c07d544e23c8aae158604c59441c6ffa84d 100644 (file)
--- a/bin/tests/system/dupsigs/setup.sh
+++ b/bin/tests/system/dupsigs/setup.sh
@@ -10,8 +10,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dyndb/setup.sh b/bin/tests/system/dyndb/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/dyndb/setup.sh
+++ b/bin/tests/system/dyndb/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh
index c47b1aab9f570219069c5e565f3c0364bfe2ce80..7fba74b583673be60990d51fdc2430164b908f2a 100644 (file)
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh
index c47b1aab9f570219069c5e565f3c0364bfe2ce80..7fba74b583673be60990d51fdc2430164b908f2a 100644 (file)
--- a/bin/tests/system/eddsa/setup.sh
+++ b/bin/tests/system/eddsa/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/ednscompliance/setup.sh b/bin/tests/system/ednscompliance/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/ednscompliance/setup.sh
+++ b/bin/tests/system/ednscompliance/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/emptyzones/setup.sh b/bin/tests/system/emptyzones/setup.sh
index e842d2c158aa1af3d3e8cdfae37730c116f0a895..3d4a96d9cc47514538dccdf4b7810e6d2308c761 100644 (file)
--- a/bin/tests/system/emptyzones/setup.sh
+++ b/bin/tests/system/emptyzones/setup.sh
@@ -10,5 +10,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named1.conf.in ns1/named.conf

diff --git a/bin/tests/system/fetchlimit/setup.sh b/bin/tests/system/fetchlimit/setup.sh
index 2c83ad11c27c61cda038f0a5cbd0eb780fde85bc..25d8b5d861bfd0b68341e516c73c42d705e5d174 100644 (file)
--- a/bin/tests/system/fetchlimit/setup.sh
+++ b/bin/tests/system/fetchlimit/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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/named1.conf.in ns3/named.conf

diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh
index 746283f3ee1844f1d98ec300e78b616d6e2e5b1a..bdd757933ad6a8e72e18860f6cfecedc4e5fac98 100644 (file)
--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named1.conf.in ns1/named.conf

diff --git a/bin/tests/system/formerr/setup.sh b/bin/tests/system/formerr/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/formerr/setup.sh
+++ b/bin/tests/system/formerr/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/forward/setup.sh b/bin/tests/system/forward/setup.sh
index d64579e590fbbe8db01b4e1d6295aad73c82e23f..a09a3c13bd4a561f3e719e31a722fb26b51eefc9 100644 (file)
--- a/bin/tests/system/forward/setup.sh
+++ b/bin/tests/system/forward/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/geoip/setup.sh b/bin/tests/system/geoip/setup.sh
index c85dd9051935afb8ef1f5b9f49537d1df5a432fb..5351df94c8290e818a0f9a10312da0471a476d89 100644 (file)
--- a/bin/tests/system/geoip/setup.sh
+++ b/bin/tests/system/geoip/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/geoip2/setup.sh b/bin/tests/system/geoip2/setup.sh
index fb51a0a0ddd417beeeb0720615b479bf33d7c05e..41f7a827b54f85cce5633cd97d51d12f60443ef9 100644 (file)
--- a/bin/tests/system/geoip2/setup.sh
+++ b/bin/tests/system/geoip2/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 062e453fd656270e09a09095f44600f11e7ffb85..db566a32a8a00db18215aa92ac19f093e2cb1ca1 100644 (file)
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
 
 cd ns1 && cp -f cache.in cache

diff --git a/bin/tests/system/gost/setup.sh b/bin/tests/system/gost/setup.sh
index c47b1aab9f570219069c5e565f3c0364bfe2ce80..7fba74b583673be60990d51fdc2430164b908f2a 100644 (file)
--- a/bin/tests/system/gost/setup.sh
+++ b/bin/tests/system/gost/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/idna/setup.sh b/bin/tests/system/idna/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/idna/setup.sh
+++ b/bin/tests/system/idna/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh
index cc63df85a02935f1bf7f1463840b3abcbf4e9539..1384928ace3c0de94ed9ff43a9085bf88fe2ce96 100644 (file)
--- a/bin/tests/system/inline/setup.sh
+++ b/bin/tests/system/inline/setup.sh
@@ -10,8 +10,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cp ns1/root.db.in ns1/root.db

diff --git a/bin/tests/system/integrity/setup.sh b/bin/tests/system/integrity/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/integrity/setup.sh
+++ b/bin/tests/system/integrity/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index ebb867653f576b0d61142387a83b195e90d08cdc..963d54c50cc489411358d66ede92c4f4e355594e 100644 (file)
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 cat <<EOF >ns1/named.conf
 options {
        query-source address 10.53.0.1;

diff --git a/bin/tests/system/keymgr/setup.sh b/bin/tests/system/keymgr/setup.sh
index f3d2358aa6f9fac0ef4655053a7907bf4e8be397..256c2ec9d49aeec42addd918d51a2ea541b8e1ab 100644 (file)
--- a/bin/tests/system/keymgr/setup.sh
+++ b/bin/tests/system/keymgr/setup.sh
@@ -14,8 +14,6 @@ SYSTEMTESTTOP=..
 
 KEYGEN="$KEYGEN -qr $RANDFILE"
 
-$SHELL clean.sh
-
 # Test 1: KSK goes inactive before successor is active
 dir=01-ksk-inactive
 echo_i "set up $dir"

diff --git a/bin/tests/system/legacy/setup.sh b/bin/tests/system/legacy/setup.sh
index 6cf257b509061d49d3ae42544af3acded61d9315..4aa4e853e1b3dbeb1af7fef65871286ea18dccc5 100644 (file)
--- a/bin/tests/system/legacy/setup.sh
+++ b/bin/tests/system/legacy/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named1.conf.in ns1/named.conf
 
 copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/limits/setup.sh b/bin/tests/system/limits/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/limits/setup.sh
+++ b/bin/tests/system/limits/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh
index d711288a9abbd4d0a5572e73bb1c962d6c81c65b..ef8a919e9d183fb8c79a5c4b225748ee0e0bdb09 100644 (file)
--- a/bin/tests/system/logfileconfig/setup.sh
+++ b/bin/tests/system/logfileconfig/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.plain ns1/named.conf
 copy_setports ns1/rndc.conf.in ns1/rndc.conf
 copy_setports ns1/controls.conf.in ns1/controls.conf

diff --git a/bin/tests/system/lwresd/setup.sh b/bin/tests/system/lwresd/setup.sh
deleted file mode 100644 (file)
index 5079232..0000000
--- a/bin/tests/system/lwresd/setup.sh
+++ /dev/null
@@ -1,15 +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.
-
-# shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
-
-$SHELL clean.sh

diff --git a/bin/tests/system/masterfile/setup.sh b/bin/tests/system/masterfile/setup.sh
index 85855f32289aaa55816c7ee33557715775b79665..f3826d8683746899567582bd5944fccce3b8a2bc 100644 (file)
--- a/bin/tests/system/masterfile/setup.sh
+++ b/bin/tests/system/masterfile/setup.sh
@@ -12,6 +12,5 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index 13724ed7ac896c389aef96dec89a5abf49569518..b3a459c7a471dedf1364439b41938a804f2f6474 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -12,8 +12,6 @@
 # shellcheck source=conf.sh
 . "$SYSTEMTESTTOP/conf.sh"
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index ef97541e67e9726d66f04086b7f1c284d47f70eb..ee15d94d217756adbdd53324a110db502450a500 100644 (file)
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 pzone=parent.nil

diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index dc14abc3923fb47509d21bcc8d7f9b4e4d7a961b..e92069f03ac8ae9506dc38899fb33086e74c0b89 100644 (file)
--- a/bin/tests/system/mkeys/setup.sh
+++ b/bin/tests/system/mkeys/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 

diff --git a/bin/tests/system/names/setup.sh b/bin/tests/system/names/setup.sh
index a3c89c8b676565f5eccea8a18c06256b3b9e4864..3a45a7064802824c4f4fe5e10554e4b2fce4d3e0 100644 (file)
--- a/bin/tests/system/names/setup.sh
+++ b/bin/tests/system/names/setup.sh
@@ -10,6 +10,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh
index 3af216c64fa120e143a3675ed266f0360ae893ca..e2cd0a37c0dfdb7d457ea18e66e3c5b7a889bf6b 100644 (file)
--- a/bin/tests/system/notify/setup.sh
+++ b/bin/tests/system/notify/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/nslookup/setup.sh b/bin/tests/system/nslookup/setup.sh
index 8134fb6ff3e2064dcd92ea58325a71c15d8bede8..6f547254bb2f2f125a5f2719c83465e45737857e 100644 (file)
--- a/bin/tests/system/nslookup/setup.sh
+++ b/bin/tests/system/nslookup/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 $SHELL ../genzone.sh 1 >ns1/example.db
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 21805c5bc06607ddbfda4b7acd26a1c5161e5b2d..a35b8ee356a089584f9bbee852de4ac6b2993bda 100644 (file)
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -14,11 +14,6 @@ SYSTEMTESTTOP=..
 
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
-#
-# jnl and database files MUST be removed before we start
-#
-$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

diff --git a/bin/tests/system/nzd2nzf/setup.sh b/bin/tests/system/nzd2nzf/setup.sh
index b3e0450b4af3dc40b16e5b7611a3996edb05b955..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/nzd2nzf/setup.sh
+++ b/bin/tests/system/nzd2nzf/setup.sh
@@ -12,6 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index 0dc618c6dd3054cb8f4dc6db50928b09e5f69051..45b6365107400fe9faf72a060bae051487d84e3d 100644 (file)
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/pipelined/setup.sh b/bin/tests/system/pipelined/setup.sh
index 7debdf2e341836423836c62ad92fee802f353b38..57c3d667c087001242484109a98008eb47163ce0 100644 (file)
--- a/bin/tests/system/pipelined/setup.sh
+++ b/bin/tests/system/pipelined/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh
index 1d7325ae8a468feef79a3d218313675c6a37d560..4fc5ec5b992e57fe1922f93eb6d57fb07e6bd362 100644 (file)
--- a/bin/tests/system/pkcs11/setup.sh
+++ b/bin/tests/system/pkcs11/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 infile=ns1/example.db.in
 
 /bin/echo -n ${HSMPIN:-1234}> pin

diff --git a/bin/tests/system/pkcs11ssl/setup.sh b/bin/tests/system/pkcs11ssl/setup.sh
index 65857356d750401b8a23e6c0846b7bfdd92578ba..d2fbe922c7e0b34aa7ab9c77f5c0699a0ae4d519 100644 (file)
--- a/bin/tests/system/pkcs11ssl/setup.sh
+++ b/bin/tests/system/pkcs11ssl/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 infile=ns1/example.db.in
 
 /bin/echo -n ${HSMPIN:-1234}> pin

diff --git a/bin/tests/system/reclimit/setup.sh b/bin/tests/system/reclimit/setup.sh
index a191bf838c4339de321e3bf5bb1598d844966d8d..d09a01250fc18aa708b2d425a3bf26cbb72c4594 100644 (file)
--- a/bin/tests/system/reclimit/setup.sh
+++ b/bin/tests/system/reclimit/setup.sh
@@ -12,6 +12,5 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns3/named1.conf.in ns3/named.conf

diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index 86fbdd7be6f30be09a7d0d5aff14775af5f8a6de..f3050d393fc7dd1fa9f3d2cc27943fe49c872279 100644 (file)
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index 0f9605ef1110986bf45b58408835e82cf505ff12..9926dc69764239f9be18465882c4a37e4ec0ef2a 100644 (file)
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cp ns4/tld1.db ns4/tld.db

diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index 343869e96067bcc8c7aeaf63677561e295cbf286..8521ff8f024da9f4bf93d197d0458f0de5fde820 100644 (file)
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 $SHELL ../genzone.sh 2 >ns2/nil.db

diff --git a/bin/tests/system/rootkeysentinel/setup.sh b/bin/tests/system/rootkeysentinel/setup.sh
index 80c2a6403080cb285eaaf0a4e75445155300825c..90c6d4458954a754ba05343524d6d4e508f48160 100644 (file)
--- a/bin/tests/system/rootkeysentinel/setup.sh
+++ b/bin/tests/system/rootkeysentinel/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index d6c78b029314fe6a721dcd1b5149c31f179000c9..ec698ac2519fe5768c6e3e8cefb7e9d3c0947a73 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -16,8 +16,6 @@ SYSTEMTESTTOP=..
 
 QPERF=`$SHELL qperf.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

diff --git a/bin/tests/system/rrchecker/setup.sh b/bin/tests/system/rrchecker/setup.sh
deleted file mode 100644 (file)
index 5079232..0000000
--- a/bin/tests/system/rrchecker/setup.sh
+++ /dev/null
@@ -1,15 +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.
-
-# shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
-
-$SHELL clean.sh

diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh
index 4563f04145d8af6062412db69bb255c7b5a217e5..607a341724674d76edd154cd8b259999b9947d50 100644 (file)
--- a/bin/tests/system/rrl/setup.sh
+++ b/bin/tests/system/rrl/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/rrsetorder/setup.sh b/bin/tests/system/rrsetorder/setup.sh
index 3a14fe9e3ac85392b4f9f2a0af994a7a2c3b24d2..607a341724674d76edd154cd8b259999b9947d50 100644 (file)
--- a/bin/tests/system/rrsetorder/setup.sh
+++ b/bin/tests/system/rrsetorder/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index 71d5042e9c38b128fde581ac9a81007be76976cc..cf596c69887c1571acb9684c2de287f8bba322dd 100644 (file)
--- a/bin/tests/system/rsabigexponent/setup.sh
+++ b/bin/tests/system/rsabigexponent/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 33c0037581a23163959d8af7e56df772e6719510..4d8f53b198d7582d6fe16baf29cfbd25b024f05a 100755 (executable)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -154,6 +154,12 @@ else
     exit 0
 fi
 
+# Clean up files left from any potential previous runs
+if test -f $systest/clean.sh
+then
+   ( cd $systest && $SHELL clean.sh "$@" )
+fi
+
 # Set up any dynamically generated test data
 if test -f $systest/setup.sh
 then

diff --git a/bin/tests/system/runtime/setup.sh b/bin/tests/system/runtime/setup.sh
index 0a8241facb9216b8ff97b12d690c66c1a709d726..a37f8995b68a9733ab21308387879ec1244cd624 100644 (file)
--- a/bin/tests/system/runtime/setup.sh
+++ b/bin/tests/system/runtime/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh
index c28445582ee0a1b1e28d63658e973ffeeed3d9a4..370e57f9553d1a0a0cb871032a0e355c58990e07 100644 (file)
--- a/bin/tests/system/sfcache/setup.sh
+++ b/bin/tests/system/sfcache/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/smartsign/setup.sh b/bin/tests/system/smartsign/setup.sh
index 5c4a2143f0d7b19aae5e590d3a53aa24a48d7aea..dd7dbb3f1c1991f6de30d13c601e1c6fe41c6af6 100644 (file)
--- a/bin/tests/system/smartsign/setup.sh
+++ b/bin/tests/system/smartsign/setup.sh
@@ -12,6 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE

diff --git a/bin/tests/system/sortlist/setup.sh b/bin/tests/system/sortlist/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/sortlist/setup.sh
+++ b/bin/tests/system/sortlist/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/spf/setup.sh b/bin/tests/system/spf/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/spf/setup.sh
+++ b/bin/tests/system/spf/setup.sh
@@ -12,5 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index c6ef82a7aaf2ec2cab6a27d4798c1deea9b911ac..c2742bdc395451dcdc1a5aeb2a7bfe9adc82dba1 100755 (executable)
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in tmp
 sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' tmp > ns2/named.conf

diff --git a/bin/tests/system/statistics/setup.sh b/bin/tests/system/statistics/setup.sh
index c9f645b29ea4057f0a206c4ddedb5e076a3253ca..def2a615acccafbe9c9b2e9eb028d4bbcbfef6b1 100644 (file)
--- a/bin/tests/system/statistics/setup.sh
+++ b/bin/tests/system/statistics/setup.sh
@@ -12,7 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/statschannel/setup.sh b/bin/tests/system/statschannel/setup.sh
index e7ad741204d7747a1469c7052e45d0ab92a59d34..71451f83179e01b5876b29ac720723e0b32235c8 100644 (file)
--- a/bin/tests/system/statschannel/setup.sh
+++ b/bin/tests/system/statschannel/setup.sh
@@ -12,6 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh
index 3860848b9d310dbabe60d727003cca4ad727da45..dab4b9a46fa7fae8355ab5120e4eab203c066e0f 100644 (file)
--- a/bin/tests/system/stress/setup.sh
+++ b/bin/tests/system/stress/setup.sh
@@ -12,8 +12,6 @@
 # shellcheck source=conf.sh
 . "$SYSTEMTESTTOP/conf.sh"
 
-$SHELL clean.sh
-
 #
 # Set up test data for zone transfer quota tests.
 #

diff --git a/bin/tests/system/stub/setup.sh b/bin/tests/system/stub/setup.sh
index 9b9aa029a1546282814e7b6872b6fa5e6d29956e..def2a615acccafbe9c9b2e9eb028d4bbcbfef6b1 100644 (file)
--- a/bin/tests/system/stub/setup.sh
+++ b/bin/tests/system/stub/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/tcp/setup.sh b/bin/tests/system/tcp/setup.sh
index 7db0dec6803e008dc2a233f8e2e035e0855972ea..17f65408b67aa39d060b6dcc21b657096a7d5979 100644 (file)
--- a/bin/tests/system/tcp/setup.sh
+++ b/bin/tests/system/tcp/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh
index fc95ac259a79fb172b9dc469c1144409fd8dcbc2..bd3afcb04f45ee22649b786e1c32fa77b6edb0f4 100644 (file)
--- a/bin/tests/system/tkey/setup.sh
+++ b/bin/tests/system/tkey/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cd ns1 && $SHELL setup.sh

diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
index 4dd4a253efcf0b521ab916f0d1230a51b5978663..9a8ab2eab70ee8b231fd5351387051648a6a609b 100644 (file)
--- a/bin/tests/system/tsig/setup.sh
+++ b/bin/tests/system/tsig/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.conf.in ns1/named.conf
 
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE

diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
index 0d21c7b8ab59b1f4fe773be4b17f30cbe79bea18..49510b43d7dc91dfadcfce26015ff49a66f7f92d 100644 (file)
--- a/bin/tests/system/tsiggss/setup.sh
+++ b/bin/tests/system/tsiggss/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index 48c7d51d93fe85f87b38a017ea4a0cf261d1dacc..e1c4b1de59c8fa6b26595e3ed691c58caee9b427 100644 (file)
--- a/bin/tests/system/unknown/setup.sh
+++ b/bin/tests/system/unknown/setup.sh
@@ -10,8 +10,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh 
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index c22040d332129811d5058170c1b903af0d5a3469..1031f7f5a1f7aa6cd070c93444afb0972399d20d 100644 (file)
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 cp -f ns1/example1.db ns1/example.db
 cp -f ns3/nomaster.db ns3/nomaster1.db
 

diff --git a/bin/tests/system/verify/setup.sh b/bin/tests/system/verify/setup.sh
index 17d7f6d79f2a42c8a5b90a75fc3ec91a313ba995..08e6be8e838442716e4470c930cd4279e9955493 100644 (file)
--- a/bin/tests/system/verify/setup.sh
+++ b/bin/tests/system/verify/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh 
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 (cd zones && $SHELL genzones.sh)

diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index 8d266b8c6a2b798aca6521a4dd3170cbd2da4105..e3ae916ba7746ba19586c63c7f052f40a8c560b1 100644 (file)
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cp -f ns2/example1.db ns2/example.db

diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index c8f1d83a6c4b91fcfa27093f490ab2797edf69a4..f988158e82d08a7c44bedceeac751c263c666706 100644 (file)
--- a/bin/tests/system/wildcard/setup.sh
+++ b/bin/tests/system/wildcard/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index a0bf5777d870e8dc9e99acba80acb971a8dbc6f9..ca690373363d3200f3c9db15bb0add8925c0c21c 100644 (file)
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 $SHELL ../genzone.sh 1 6 7 >ns1/slave.db
 $SHELL ../genzone.sh 1 6 7 >ns1/edns-expire.db
 $SHELL ../genzone.sh 2 3 >ns2/example.db

diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index 5d418992fa8d401e0cb251ef0d1084a32984c70a..6b653493f1b8203eb9ec08c56d870666111745e4 100644 (file)
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -16,8 +16,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 $PERL setup.pl
 
 cp -f ns1/changing1.db ns1/changing.db

diff --git a/bin/tests/system/zero/setup.sh b/bin/tests/system/zero/setup.sh
index 27b8ba7e37015c3d60bb5657f6be9035adafde20..83c35ea60d99f55f625be00784061500824ec436 100644 (file)
--- a/bin/tests/system/zero/setup.sh
+++ b/bin/tests/system/zero/setup.sh
@@ -10,8 +10,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/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

diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index 27f39f5b7e54a2a3f2cdaea2575546e43fcd94ac..37d897d4cea460deb253f9a19a1fb28099b81a3b 100644 (file)
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/util/copyrights b/util/copyrights
index ec2514b2e69e2983a8989528c2309faa58a71953..a2aeebcd1da27aa400597b2abf0367209c8bf5be 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -817,7 +817,6 @@
 ./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
@@ -843,7 +842,6 @@
 ./bin/tests/system/checkds/ok.example.dlv.example.dlv.db       X       2012,2018,2019
 ./bin/tests/system/checkds/ok.example.dnskey.db        X       2012,2018,2019
 ./bin/tests/system/checkds/ok.example.ds.db    X       2012,2018,2019
-./bin/tests/system/checkds/setup.sh            SH      2012,2013,2014,2016,2018,2019
 ./bin/tests/system/checkds/tests.sh            SH      2012,2013,2014,2016,2018,2019
 ./bin/tests/system/checkds/wrong.example.dlv.example.dlv.db    X       2012,2018,2019
 ./bin/tests/system/checkds/wrong.example.dnskey.db     X       2012,2018,2019
@@ -989,7 +987,6 @@
 ./bin/tests/system/delzone/ns2/named.args      X       2016,2018,2019
 ./bin/tests/system/delzone/ns2/named.conf      CONF-C  2016,2018,2019
 ./bin/tests/system/delzone/ns2/normal.db       ZONE    2016,2018,2019
-./bin/tests/system/delzone/setup.sh            SH      2016,2018,2019
 ./bin/tests/system/delzone/tests.sh            SH      2016,2018,2019
 ./bin/tests/system/dialup/clean.sh             SH      2019
 ./bin/tests/system/dialup/ns1/example.db       ZONE    2000,2001,2004,2007,2016,2018,2019
@@ -999,7 +996,6 @@
 ./bin/tests/system/dialup/ns2/named.conf       CONF-C  2000,2001,2004,2007,2016,2018,2019
 ./bin/tests/system/dialup/ns3/hint.db          ZONE    2000,2001,2004,2007,2016,2018,2019
 ./bin/tests/system/dialup/ns3/named.conf       CONF-C  2000,2001,2004,2007,2016,2018,2019
-./bin/tests/system/dialup/setup.sh             SH      2000,2001,2004,2007,2012,2016,2018,2019
 ./bin/tests/system/dialup/tests.sh             SH      2000,2001,2004,2007,2012,2016,2018,2019
 ./bin/tests/system/digcomp.pl                  PERL    2000,2001,2004,2007,2012,2013,2016,2018,2019
 ./bin/tests/system/digdelv/ans4/startme                X       2017,2018,2019
@@ -1735,7 +1731,6 @@
 ./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
@@ -2122,7 +2117,6 @@
 ./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