diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-03-12 22:44:25 +0100 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-03-13 20:55:34 +0100 |
| commit | 9cf9680910544638129bf083bca902881d9ab5bc (patch) | |
| tree | 8d40c425bc9c7a1f8057a8a48ff184295173af5d | |
| parent | 91bd0b915aa17f44625a0c0ce84ed73b6d33968e (diff) | |
| download | systemd-9cf9680910544638129bf083bca902881d9ab5bc.tar.gz | |
test: don't overwrite TESTDIR if already set
(cherry picked from commit 3f50fff536d715aee5e5195ec60e2af047b73c7f)
| -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 670c2625f7..af9d16140f 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 |