From 8a0da13479b0cb9146371e6c9972338576cee27a Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 3 Aug 2023 10:44:09 +0200
Subject: [PATCH] Clean leftover files in autosign and masterformat

The following files were reported in CI by the legacy system test runner
and prevented job to pass. They should be removed.

    $ if git rev-parse > /dev/null 2>&1; then ( ! grep "^I:.*:file.*not removed$" *.log ); fi
    autosign.log:I:autosign:file autosign/ns3/kskonly.example.db.jbk not removed
    autosign.log:I:autosign:file autosign/ns3/optout.example.db.jbk not removed
    autosign.log:I:autosign:file autosign/ns3/reconf.example.db.jbk not removed
    masterformat.log:I:masterformat:file masterformat/ns1/signed.db.raw.jbk not removed
    masterformat.log:I:masterformat:file masterformat/ns1/signed.db.raw.signed not removed
    masterformat.log:I:masterformat:file masterformat/ns1/signed.db.raw.signed.jnl not removed

Don't print an error when the ns*/inactive directory is not
present:

    rmdir: ns*/inactive: No such file or directory

Remove nsupdate.out.test file instead of nsupdate.out, as the latter
does not exist.
---
 bin/tests/system/autosign/clean.sh     | 6 +++---
 bin/tests/system/masterformat/clean.sh | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
index dc379c0ebc..02ae2c1ee1 100644
--- a/bin/tests/system/autosign/clean.sh
+++ b/bin/tests/system/autosign/clean.sh
@@ -26,8 +26,7 @@ rm -f active.key inact.key del.key delzsk.key unpub.key standby.key rev.key
 rm -f delayksk.key delayzsk.key autoksk.key autozsk.key
 rm -f noksk-ksk.key nozsk-ksk.key nozsk-zsk.key inaczsk-zsk.key inaczsk-ksk.key
 rm -f nopriv.key vanishing.key del1.key del2.key
-rm -f ns*/inactive/*
-rmdir ns*/inactive
+rm -rf ns*/inactive
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.lock
 rm -f ns1/root.db ns1/root.db.1 ns1/root.db.2 ns1/root.db.3
@@ -42,6 +41,7 @@ rm -f ns2/private.secure.example.db
 rm -f ns2/signing.*
 rm -f ns3/*.nzd ns3/*.nzd-lock ns3/*.nzf
 rm -f ns3/*.nzf
+rm -f ns3/*.jbk
 rm -f ns3/autonsec3.example.db
 rm -f ns3/delay.example.db ns3/delay.example.1 ns3/delay.example.2
 rm -f ns3/delzsk.example.db
@@ -71,7 +71,7 @@ rm -f ns3/secure.optout.example.db
 rm -f ns3/settime.out.*
 rm -f ns3/sync.example.db
 rm -f ns3/ttl*.db
-rm -f nsupdate.out
+rm -f nsupdate.out.test*
 rm -f settime.out.*
 rm -f signing.*
 rm -f sync.key
diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 04ff2b8578..e3cc44987b 100755
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -17,6 +17,9 @@ rm -f ./ns1/example.db.serial.raw
 rm -f ./ns1/large.db ./ns1/large.db.raw
 rm -f ./ns1/signed.db.raw
 rm -f ./ns1/session.key
+rm -f ./ns1/signed.db.raw.jbk
+rm -f ./ns1/signed.db.raw.signed
+rm -f ./ns1/signed.db.raw.signed.jnl
 rm -f ./dig.out.*
 rm -f ./dig.out
 rm -f ./*/named.memstats