From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 20 Apr 2021 15:53:55 +0000 (+0200)
Subject: TEST-58: remove stale artifacts to not fail on repeated invocations
X-Git-Tag: v249-rc1~342^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0f04bafe08549069fc217c69647e929f1c431da;p=thirdparty%2Fsystemd.git

TEST-58: remove stale artifacts to not fail on repeated invocations

We would remove stuff only if successful, so repeated invocations would
trivially fail.

Also drop "-f", so that if we expect to remove something, it must be there.
---

diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh
index 1fcc882242e..21ad7d5da21 100755
--- a/test/units/testsuite-58.sh
+++ b/test/units/testsuite-58.sh
@@ -5,6 +5,7 @@ set -o pipefail
 export SYSTEMD_LOG_LEVEL=debug
 export PAGER=cat
 
+rm -f /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img /tmp/testsuite-58.dump
 mkdir -p /tmp/testsuite-58-defs/
 
 # First part: create a disk image and verify its in order
@@ -74,8 +75,8 @@ systemd-repart --definitions=/tmp/testsuite-58-defs/ \
 
 cmp /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img
 
-rm -f /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img /tmp/testsuite-58.dump
-rm -rf /tmp/testsuite-58-defs/
+rm /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img /tmp/testsuite-58.dump
+rm -r /tmp/testsuite-58-defs/
 
 echo OK >/testok