Skip to content

Commit

Permalink
ZTS: Replace /var/tmp with $TEST_BASE_DIR
Browse files Browse the repository at this point in the history
Remove a few hardcoded instances of /var/tmp.  This should use
the $TEST_BASE_DIR in order to allow the ZTS to be optionally
run in an alternate directory using `zfs-tests.sh -d <path>`.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#9775
  • Loading branch information
behlendorf authored and tonyhutter committed Jan 2, 2020
1 parent fa5e83d commit b5580d6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ log_onexit cleanup
init_snap=$TESTPOOL/$TESTFS@init_snap
inc_snap=$TESTPOOL/$TESTFS@inc_snap
full_bkup=$TEST_BASE_DIR/fullbkup.$$
inc_bkup=/var/tmp/incbkup.$$
inc_bkup=$TEST_BASE_DIR/incbkup.$$
init_data=$TESTDIR/$TESTFILE1
inc_data=$TESTDIR/$TESTFILE2
orig_sum=""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ function cleanup
log_onexit cleanup
log_assert "'zfs list -d <n>' should get expected output."

mntpnt=/var/tmp
DEPTH_OUTPUT="$mntpnt/depth_output"
EXPECT_OUTPUT="$mntpnt/expect_output"
DEPTH_OUTPUT="$TEST_BASE_DIR/depth_output"
EXPECT_OUTPUT="$TEST_BASE_DIR/expect_output"
typeset -i old_val=0
typeset -i j=0
typeset -i fs=0
Expand Down

0 comments on commit b5580d6

Please sign in to comment.