Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZTS: clean up leftover ibackup_trunc files #7430

Merged
merged 1 commit into from
Apr 13, 2018
Merged

ZTS: clean up leftover ibackup_trunc files #7430

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_incremental.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also change ibackup and ibackup_trunc's location to $TEST_BASE_DIR. Which is normally /var/tmp but it set by the buildbot to an alternate path for its testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done thanks!

}

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"
Expand Down