diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-03-12 22:44:25 +0100 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2020-02-12 13:15:21 +0100 |
| commit | c26e3de1c6ec220b8829090e44aafe8413e75df7 (patch) | |
| tree | b28a8977fb504c3c02c80264198c51c6a4f37a5b | |
| parent | 62dc259a1a0cc2e852ae3e2afb13e0450259b0a8 (diff) | |
| download | systemd-c26e3de1c6ec220b8829090e44aafe8413e75df7.tar.gz | |
test: don't overwrite TESTDIR if already set
Related: #1794787
(cherry picked from commit 3f50fff536d715aee5e5195ec60e2af047b73c7f)
(cherry picked from commit 9cf9680910544638129bf083bca902881d9ab5bc)
| -rw-r--r-- | test/test-functions | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/test-functions b/test/test-functions index d3dd9524d3..fe25a501da 100644 --- a/test/test-functions +++ b/test/test-functions @@ -711,8 +711,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 |