diff options
| -rwxr-xr-x | tests/zfs-tests/tests/functional/history/cleanup.ksh | 4 | ||||
| -rw-r--r-- | tests/zfs-tests/tests/functional/history/history.cfg | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/zfs-tests/tests/functional/history/cleanup.ksh b/tests/zfs-tests/tests/functional/history/cleanup.ksh index 688174188..32ed921ff 100755 --- a/tests/zfs-tests/tests/functional/history/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/history/cleanup.ksh @@ -31,8 +31,6 @@ . $STF_SUITE/include/libtest.shlib -[[ -f $OLD_HISTORY ]] && rm -f $OLD_HISTORY -[[ -f $TMP_HISTORY ]] && rm -f $TMP_HISTORY -[[ -f $NEW_HISTORY ]] && rm -f $NEW_HISTORY +rm -f $TEST_BASE_DIR/{old,tmp,new}_history.* default_cleanup diff --git a/tests/zfs-tests/tests/functional/history/history.cfg b/tests/zfs-tests/tests/functional/history/history.cfg index e1ed76e1a..bbbd612a6 100644 --- a/tests/zfs-tests/tests/functional/history/history.cfg +++ b/tests/zfs-tests/tests/functional/history/history.cfg @@ -32,9 +32,9 @@ export ZFSROOT= export MPOOL=mpool.$$ -export OLD_HISTORY=/tmp/old_history.$$ -export TMP_HISTORY=/tmp/tmp_history.$$ -export NEW_HISTORY=/tmp/new_history.$$ +export OLD_HISTORY=$TEST_BASE_DIR/old_history.$$ +export TMP_HISTORY=$TEST_BASE_DIR/tmp_history.$$ +export NEW_HISTORY=$TEST_BASE_DIR/new_history.$$ export MIGRATEDPOOLNAME=${MIGRATEDPOOLNAME:-history_pool} export TIMEZONE=${TIMEZONE:-US/Mountain} |