From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 12 Mar 2019 21:44:25 +0000 (+0100)
Subject: test: don't overwrite TESTDIR if already set
X-Git-Tag: v242-rc1~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f50fff536d715aee5e5195ec60e2af047b73c7f;p=thirdparty%2Fsystemd.git

test: don't overwrite TESTDIR if already set
---

diff --git a/test/test-functions b/test/test-functions
index d8a3502a4ad..2f88be058b3 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -817,8 +817,13 @@ inst_libs() {
 
 import_testdir() {
     [[ -e $STATEFILE ]] && . $STATEFILE
-    if [[ -z "$TESTDIR" ]] || [[ ! -d "$TESTDIR" ]]; then
-        TESTDIR=$(mktemp --tmpdir=/var/tmp -d -t systemd-test.XXXXXX)
+    if [[ ! -d "$TESTDIR" ]]; then
+        if [[ -z "$TESTDIR" ]]; then
+            TESTDIR=$(mktemp --tmpdir=/var/tmp -d -t systemd-test.XXXXXX)
+        else
+            mkdir -p "$TESTDIR"
+        fi
+
         echo "TESTDIR=\"$TESTDIR\"" > $STATEFILE
         export TESTDIR
     fi