From: Luca Boccassi <bluca@debian.org>
Date: Tue, 28 Mar 2023 23:07:45 +0000 (+0100)
Subject: test: do not remove state directory on failure
X-Git-Tag: v254-rc1~883
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=49e8342965649503a537beacb77dd0fafc71debe;p=systemd%2F.git

test: do not remove state directory on failure

The test log is in the state directory, and we want to keep it around
when a test fails.

Follow-up for: 256a835f1c6c646a55039659aa2db186fbeb5c5d
---

diff --git a/test/test-functions b/test/test-functions
index 5a16459aeb..1a4e42f575 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -3040,7 +3040,6 @@ _test_cleanup() {
         fi
         [[ -n "$TESTDIR" ]] && rm -vfr "$TESTDIR"
         [[ -n "$STATEFILE" ]] && rm -vf "$STATEFILE"
-        [[ -n "$STATEDIR" ]] && rm -vfr "$STATEDIR"
     ) || :
 }
 
@@ -3255,7 +3254,8 @@ do_test() {
                 fi
                 test_cleanup
                 if [ $ret -eq 0 ]; then
-                    rm "$TESTLOG"
+                    # $TESTLOG is in $STATEDIR, so clean it up only on success
+                    [[ -n "$STATEDIR" ]] && rm -vfr "$STATEDIR"
                     echo "[OK]"
                 else
                     echo "[FAILED]"