From: Michał Kępień <michal@isc.org>
Date: Fri, 26 Jan 2018 12:46:46 +0000 (+0100)
Subject: [rt46602] Re-add clean.sh invocation to catz/setup.sh
X-Git-Tag: v9.13.0~158^2~16
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=344d05063f81fc9aa25fcdcdcc57e9bc2ed6e7aa;p=thirdparty%2Fbind9.git

[rt46602] Re-add clean.sh invocation to catz/setup.sh

Commit 57aa7b60fd caused catz/setup.sh to no longer call clean.sh, which
results in the catz system test failing on subsequent runs if the first
run is interrupted or fails.
---

diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
index 02fc258c083..faa9fbec5c0 100644
--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@@ -9,6 +9,8 @@
 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