From 1e37dee03f6ecc01362f8e18607737db693790d7 Mon Sep 17 00:00:00 2001 From: bunder2015 Date: Fri, 13 Apr 2018 13:35:55 -0400 Subject: [PATCH] ZTS: clean up leftover ibackup_trunc files zfs_receive_raw_incremental did not clean up ibackup_trunc.* files left over from running the test. Also changing the path of the ibackup files so they can be placed in the correct directories when /var/tmp is not the temporary directory. Reviewed-by: Giuseppe Di Natale Reviewed-by: Brian Behlendorf Signed-off-by: bunder2015 Closes #7430 --- .../cli_root/zfs_receive/zfs_receive_raw_incremental.ksh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_incremental.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_incremental.ksh index 48878327b..1e91c6262 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_incremental.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_incremental.ksh @@ -49,14 +49,15 @@ function cleanup log_must zfs destroy -r $TESTPOOL/$TESTFS2 [[ -f $ibackup ]] && log_must rm -f $ibackup + [[ -f $ibackup_trunc ]] && log_must rm -f $ibackup_trunc } log_onexit cleanup log_assert "ZFS should receive streams from raw incremental sends" -typeset ibackup="/var/tmp/ibackup.$$" -typeset ibackup_trunc="/var/tmp/ibackup_trunc.$$" +typeset ibackup="$TEST_BASE_DIR/ibackup.$$" +typeset ibackup_trunc="$TEST_BASE_DIR/ibackup_trunc.$$" typeset passphrase="password" typeset passphrase2="password2" typeset snap1="$TESTPOOL/$TESTFS1@snap1"