Skip to content

Commit 2f3d42b

Browse files
behlendorftonyhutter
authored andcommitted
ZTS: Replace /var/tmp with $TEST_BASE_DIR
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 <[email protected]> Reviewed-by: John Kennedy <[email protected]> Reviewed-by: Igor Kozhukhov <[email protected]> Reviewed-by: Kjeld Schouten <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#9775
1 parent 162a2ec commit 2f3d42b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_001_pos.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ log_onexit cleanup
7575
init_snap=$TESTPOOL/$TESTFS@init_snap
7676
inc_snap=$TESTPOOL/$TESTFS@inc_snap
7777
full_bkup=$TEST_BASE_DIR/fullbkup.$$
78-
inc_bkup=/var/tmp/incbkup.$$
78+
inc_bkup=$TEST_BASE_DIR/incbkup.$$
7979
init_data=$TESTDIR/$TESTFILE1
8080
inc_data=$TESTDIR/$TESTFILE2
8181
orig_sum=""

tests/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_007_pos.ksh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ function cleanup
5757
log_onexit cleanup
5858
log_assert "'zfs list -d <n>' should get expected output."
5959

60-
mntpnt=/var/tmp
61-
DEPTH_OUTPUT="$mntpnt/depth_output"
62-
EXPECT_OUTPUT="$mntpnt/expect_output"
60+
DEPTH_OUTPUT="$TEST_BASE_DIR/depth_output"
61+
EXPECT_OUTPUT="$TEST_BASE_DIR/expect_output"
6362
typeset -i old_val=0
6463
typeset -i j=0
6564
typeset -i fs=0

0 commit comments

Comments
 (0)