From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Thu, 28 Jan 2021 13:26:35 +0000 (+0000)
Subject: test: fix 'make clean' not removing shared image
X-Git-Tag: v248-rc1~239^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21be71eefb0b5845a3238c7ceff3a3c2efb97aa0;p=thirdparty%2Fsystemd.git

test: fix 'make clean' not removing shared image
---

diff --git a/test/test-functions b/test/test-functions
index a9341445d5e..df6022982c2 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -2088,6 +2088,10 @@ _test_cleanup() {
         set +e
         _umount_dir $initdir
         rm -vf "$IMAGE_PUBLIC"
+        # If multiple setups/cleans are ran in parallel, this can cause a race
+        if [ ${TEST_PARALLELIZE} -ne 1 ]; then
+            rm -vf "${IMAGESTATEDIR}/default.img"
+        fi
         rm -vfr "$TESTDIR"
         rm -vf "$STATEFILE"
     ) || :