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.

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 768260701ccb76510edae98fa8f50fa2fc965ae4..2c338e1268fdfd3b10afea7fa79c7fbb05336d59 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/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index 87a83e9fddf7a83cbdbfdf989f6c4f31c377ef54..1a6579728768d6debee9e8b85cee5e1fff2e8a86 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
-
 cp -f ns1/redirect.db.1 ns1/redirect.db
 cp -f ns2/redirect.db.1 ns2/redirect.db
 cp -f ns3/redirect.db.1 ns3/redirect.db

diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh
index f0d71d4cbd1f914f4f26a6506e9b31935b32c5a0..e23de360125b3b20deed5edc3c5c4c45358425c8 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/auth/setup.sh b/bin/tests/system/auth/setup.sh
index 85855f32289aaa55816c7ee33557715775b79665..f3826d8683746899567582bd5944fccce3b8a2bc 100644 (file)
--- a/bin/tests/system/auth/setup.sh
+++ b/bin/tests/system/auth/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/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 6fcf812bd73bb2de400db05e065b15511065b8ce..1db502d8dca72d3cc1b1e6388999ada27e689402 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
-
 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/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/cds/setup.sh b/bin/tests/system/cds/setup.sh
index 7903a52fb301aa585ef153d5f4fe08d107dea841..d720ec355433270a0c47056a93602606396dd476 100644 (file)
--- a/bin/tests/system/cds/setup.sh
+++ b/bin/tests/system/cds/setup.sh
@@ -14,8 +14,6 @@ set -eu
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 touch empty
 
 Z=cds.test

diff --git a/bin/tests/system/chain/setup.sh b/bin/tests/system/chain/setup.sh
index dda56a2cb0545c56ebc139a1c72fdf8173dc5438..ae271925f70b92f06e9376a5af9cc7e443cf192a 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
-
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
 copy_setports ns5/named.conf.in ns5/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/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 7929f095450f8d722a415b3a86ca3ce5aaa8a877..137db93e511b0f7ac035f807a54ad3decc2d2ac4 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/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/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 413b8c6a1f244fa250d3fe7f08e55ceb50b1fa59..4f37d0228c9de530516fb5541b546f1704026f92 100644 (file)
--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@@ -14,7 +14,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

diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index 5e3c38ef38aaf97aedb4b6bb0f31e81883bf0527..6efd94009221e5e931287a9e1e412f95bcdbc2f3 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
-
 $DDNSCONFGEN -q -z example.nil > ns1/ddns.key
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index 5f2d9d26ded6ef745be7e7b3b176acfc89315dae..e088b804d92af10f14e7d3f77dd770a6a5ec1c24 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
-
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
 

diff --git a/bin/tests/system/dnstap/setup.sh b/bin/tests/system/dnstap/setup.sh
index 689db2e420d33ce472ba2aeb1673a41e33c8c817..f44ffc68c99ce2ad66711b7351a28d57029c22f2 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 7e353f11b24c192102c88838963ae393d200cdfd..e8a39a0196de57ec6867bec13eb4b3fc5071e026 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
-
 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/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 c3c38c3f2f492a785f22c35a905446f4eb9c610d..f5482e6c38cf7cdea5406bce6aff88d9529e4dbd 100644 (file)
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@@ -12,6 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh
index c3c38c3f2f492a785f22c35a905446f4eb9c610d..f5482e6c38cf7cdea5406bce6aff88d9529e4dbd 100644 (file)
--- a/bin/tests/system/eddsa/setup.sh
+++ b/bin/tests/system/eddsa/setup.sh
@@ -12,6 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 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/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 f2d6dd6aadc35e21216c2149004cd1019d5ece34..9e00d77cc8fcdd6f9cc58819ef16fae816e1a41c 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
-
 copy_setports ns1/named1.conf.in ns1/named.conf
 copy_setports ns2/named1.conf.in ns2/named.conf
 copy_setports ns3/named1.conf.in ns3/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/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 7e606316f4254da55ed07920c7131119ce8a2992..985a4bcb6979b437cea91d1f20f9b65943cb7faf 100644 (file)
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/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 4c207ee22cd52571c8b213a2d9517a7aa2fd9ee6..be120501c8a61fdb231c1efa425cb14438b9e410 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
-
 cp ns1/root.db.in ns1/root.db
 
 touch ns2/trusted.conf

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/keepalive/setup.sh b/bin/tests/system/keepalive/setup.sh
index 9b9aa029a1546282814e7b6872b6fa5e6d29956e..def2a615acccafbe9c9b2e9eb028d4bbcbfef6b1 100644 (file)
--- a/bin/tests/system/keepalive/setup.sh
+++ b/bin/tests/system/keepalive/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/keymgr/setup.sh b/bin/tests/system/keymgr/setup.sh
index 58cc0a8bcb0334d652361818b1d489e413d8018e..bd6a6f0afe3e6f1da98da95c03f12adef2bac031 100644 (file)
--- a/bin/tests/system/keymgr/setup.sh
+++ b/bin/tests/system/keymgr/setup.sh
@@ -14,8 +14,6 @@ SYSTEMTESTTOP=..
 
 KEYGEN="$KEYGEN -q"
 
-$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 0770f4629090454ce68bc7d8dc97ec3047d7c236..585ed65fe2d01606ab00429d07902af89c90927f 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
 copy_setports ns3/named.conf.in ns3/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/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index 580f7196d2628e68a93a73980aadbb761817f7d3..21e293d643dcb18b970822e0926470f0b3516308 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
-
 pzone=parent.nil
 czone=child.parent.nil
 

diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index 13a662192f4ea6a5e3e18455b8b8fceaf220590d..eb50fc726b1c1cb69d2fe0cee47f2522738d65b0 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
-
 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

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/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/padding/setup.sh b/bin/tests/system/padding/setup.sh
index 4563f04145d8af6062412db69bb255c7b5a217e5..607a341724674d76edd154cd8b259999b9947d50 100644 (file)
--- a/bin/tests/system/padding/setup.sh
+++ b/bin/tests/system/padding/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/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh
index e91ca7c34d0a16a88e745d15b767d5698616aba4..cd596198a05920bd8d763db5421b62402900f8b1 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/qmin/setup.sh b/bin/tests/system/qmin/setup.sh
index e9c67c7cb937b0fbb97d6d1df026ef04bad912f7..009d606adea27333861c4c2a6632e6332f43608a 100644 (file)
--- a/bin/tests/system/qmin/setup.sh
+++ b/bin/tests/system/qmin/setup.sh
@@ -12,8 +12,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns5/named.conf.in ns5/named.conf
 copy_setports ns6/named.conf.in ns6/named.conf

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 cad235bd43c0b9dfdf8041a7d352d66add0ae472..2445f5711bade43911ae677ae184863fa60d9402 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
-
 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/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index b15097755b80b7465244cf60c019ef17857f0e1b..1e9456a3273466b239e01ce1fe8612acbb1bbd66 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
-
 cp ns4/tld1.db ns4/tld.db
 cp ns6/to-be-removed.tld.db.in ns6/to-be-removed.tld.db
 cp ns7/server.db.in ns7/server.db

diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index cb64dd9b9c6f168e97c22c47bc661e34e745a994..6b539d178198fae86b0f7ea5dbb5edf0b62fef4c 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
-
 $SHELL ../genzone.sh 2 >ns2/nil.db
 $SHELL ../genzone.sh 2 >ns2/other.db
 $SHELL ../genzone.sh 2 >ns2/static.db

diff --git a/bin/tests/system/rootkeysentinel/setup.sh b/bin/tests/system/rootkeysentinel/setup.sh
index df39b248965719d9e9080c2a2c077a7c617a2ca7..d5c20bb5e1b9dca24ec83242099d6c69842ae3cf 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
-
 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/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index f25a40f04fdbf2ef96946712fede5d55d9b27fda..46653f5b0c8596b5ee75f7919b8a5dac155f2534 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
-
 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/run.sh b/bin/tests/system/run.sh
index 34fe8c2e53383fd943bedb6a5ece823e669f434a..f846e32de9673e59f717a8dbb0ebfe53758f3430 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/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh
index 14235a466c479346a9132240c0fa22931f0ce275..ec795d2d6095e67dc467def9a481218519ff200f 100644 (file)
--- a/bin/tests/system/sfcache/setup.sh
+++ b/bin/tests/system/sfcache/setup.sh
@@ -14,8 +14,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 ns5/named.conf.in ns5/named.conf

diff --git a/bin/tests/system/smartsign/setup.sh b/bin/tests/system/smartsign/setup.sh
deleted file mode 100644 (file)
index 42a687d..0000000
--- a/bin/tests/system/smartsign/setup.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-#
-# 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/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 dca4b2490b1a1b56480ad8e6011c814c15b4a795..077690600e9f94b6375f3518c6c5511b0f7a187b 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 bd9a25cb00fdb9e49d399610b646806766e6f0ea..3a8577eb72a1c1257cf9c68bd4297fb30c69d316 100644 (file)
--- a/bin/tests/system/statschannel/setup.sh
+++ b/bin/tests/system/statschannel/setup.sh
@@ -12,8 +12,6 @@
 # shellcheck source=conf.sh
 . "$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/synthfromdnssec/setup.sh b/bin/tests/system/synthfromdnssec/setup.sh
index a6d13849508d3c5d13a676378f8baa507beda101..fe77278c4756e5aaf44bab6f20e408b883fe15b2 100644 (file)
--- a/bin/tests/system/synthfromdnssec/setup.sh
+++ b/bin/tests/system/synthfromdnssec/setup.sh
@@ -14,8 +14,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

diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh
index 480b4fc352f9969c891af460edd8bd2accd45eb5..6e143976a2d4d0b3d6d36248b5900607aa15341b 100644 (file)
--- a/bin/tests/system/tkey/setup.sh
+++ b/bin/tests/system/tkey/setup.sh
@@ -12,6 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh
-
 cd ns1 && $SHELL setup.sh

diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index 49d72d24f2ef0c1082f2f5d20491c638d24d8c2a..26805de9b87d76007a87e969debed4b85bae5a5c 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 
-
 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/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index a2d24e7b9d77a2fccf752daccf23e450902f7d1f..a59b54078a4cb8fab0f26e1abf25f28786da7fb4 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 b43fff26b2d8744ae2e3db0d12258153f8e095c8..dcd2eb8f78c5098dd06d6289ec219c5148e84bb7 100644 (file)
--- a/bin/tests/system/verify/setup.sh
+++ b/bin/tests/system/verify/setup.sh
@@ -12,6 +12,4 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL clean.sh 
-
 (cd zones && $SHELL genzones.sh)

diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index 68791637c21853441f6d5b6a734f9e1b021b0610..05d6d65dba80b94615716f2b51afc69206218a3c 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
-
 cp -f ns2/example1.db ns2/example.db
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index b1982ddfc5b197fa934c17d2116cafa2178138ab..d99aef773a3962d793ffc229de394c0b90bab179 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
-
 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/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/util/copyrights b/util/copyrights
index fa085263860fdbab65b9a1acb6d6697fe6d58075..d4f81051623185ab62cd305bda4e65126f163554 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -421,7 +421,6 @@
 ./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
@@ -435,7 +434,6 @@
 ./bin/tests/system/checkds/ok.example.ds.db    X       2012,2018,2019
 ./bin/tests/system/checkds/prep.example.db     X       2017,2018,2019
 ./bin/tests/system/checkds/prep.example.ds.db  X       2017,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,2017,2018,2019
 ./bin/tests/system/checkds/wrong.example.dnskey.db     X       2012,2018,2019
 ./bin/tests/system/checkds/wrong.example.ds.db X       2012,2018,2019
@@ -491,7 +489,6 @@
 ./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/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
@@ -955,7 +952,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/clean.sh                        SH      2012,2013,2014,2016,2018,2019
@@ -1026,7 +1022,6 @@
 ./bin/tests/system/sfcache/setup.sh            SH      2014,2016,2017,2018,2019
 ./bin/tests/system/sfcache/tests.sh            SH      2014,2016,2017,2018,2019
 ./bin/tests/system/smartsign/clean.sh          SH      2010,2012,2014,2016,2018,2019
-./bin/tests/system/smartsign/setup.sh          SH      2010,2012,2014,2016,2017,2018,2019
 ./bin/tests/system/smartsign/tests.sh          SH      2010,2011,2012,2014,2016,2017,2018,2019
 ./bin/tests/system/sortlist/clean.sh           SH      2000,2001,2004,2007,2009,2012,2014,2015,2016,2018,2019
 ./bin/tests/system/sortlist/setup.sh           SH      2018,2019