c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: clean up leftover ibackup_trunc files

Browse Source 
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 <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Closes #7430
This commit is contained in:
bunder2015 2018-04-13 13:35:55 -04:00 committed by Brian Behlendorf
parent d6bb22171b
commit 1e37dee03f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_incremental.ksh
View File

@ -49,14 +49,15 @@ function cleanup
log_must zfs destroy -r $TESTPOOL/$TESTFS2 log_must zfs destroy -r $TESTPOOL/$TESTFS2
[[ -f $ibackup ]] && log_must rm -f $ibackup [[ -f $ibackup ]] && log_must rm -f $ibackup
[[ -f $ibackup_trunc ]] && log_must rm -f $ibackup_trunc
} }
log_onexit cleanup log_onexit cleanup
log_assert "ZFS should receive streams from raw incremental sends" log_assert "ZFS should receive streams from raw incremental sends"
typeset ibackup="/var/tmp/ibackup.$$" typeset ibackup="$TEST_BASE_DIR/ibackup.$$"
typeset ibackup_trunc="/var/tmp/ibackup_trunc.$$" typeset ibackup_trunc="$TEST_BASE_DIR/ibackup_trunc.$$"
typeset passphrase="password" typeset passphrase="password"
typeset passphrase2="password2" typeset passphrase2="password2"
typeset snap1="$TESTPOOL/$TESTFS1@snap1" typeset snap1="$TESTPOOL/$TESTFS1@snap1"