c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Replace /var/tmp with $TEST_BASE_DIR

Browse Source 
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 #9775
This commit is contained in:
Brian Behlendorf 2019-12-27 16:41:16 -08:00 committed by GitHub
parent a6f6ef8bda
commit edb24bec3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_dev_removal.ksh
View File

@ -37,10 +37,10 @@ function cleanup
log_onexit cleanup log_onexit cleanup
VIRTUAL_DISK1=/var/tmp/disk1 VIRTUAL_DISK1=$TEST_BASE_DIR/disk1
VIRTUAL_DISK2=/var/tmp/disk2 VIRTUAL_DISK2=$TEST_BASE_DIR/disk2
log_must mkfile $(($MINVDEVSIZE * 8)) $VIRTUAL_DISK1 log_must truncate -s $(($MINVDEVSIZE * 8)) $VIRTUAL_DISK1
log_must mkfile $(($MINVDEVSIZE * 16)) $VIRTUAL_DISK2 log_must truncate -s $(($MINVDEVSIZE * 16)) $VIRTUAL_DISK2
log_must zpool create $TESTPOOL2 $VIRTUAL_DISK1 log_must zpool create $TESTPOOL2 $VIRTUAL_DISK1
log_must poolexists $TESTPOOL2 log_must poolexists $TESTPOOL2

8
tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_dev_removal_condense.ksh
View File

@ -48,10 +48,10 @@ log_onexit cleanup
ORIGINAL_MAX=$(get_tunable $LIVELIST_MAX_ENTRIES) ORIGINAL_MAX=$(get_tunable $LIVELIST_MAX_ENTRIES)
set_tunable64 $LIVELIST_MAX_ENTRIES 20 set_tunable64 $LIVELIST_MAX_ENTRIES 20
VIRTUAL_DISK1=/var/tmp/disk1 VIRTUAL_DISK1=$TEST_BASE_DIR/disk1
VIRTUAL_DISK2=/var/tmp/disk2 VIRTUAL_DISK2=$TEST_BASE_DIR/disk2
log_must mkfile $(($MINVDEVSIZE * 8)) $VIRTUAL_DISK1 log_must truncate -s $(($MINVDEVSIZE * 8)) $VIRTUAL_DISK1
log_must mkfile $(($MINVDEVSIZE * 16)) $VIRTUAL_DISK2 log_must truncate -s $(($MINVDEVSIZE * 16)) $VIRTUAL_DISK2
log_must zpool create $TESTPOOL2 $VIRTUAL_DISK1 log_must zpool create $TESTPOOL2 $VIRTUAL_DISK1
log_must poolexists $TESTPOOL2 log_must poolexists $TESTPOOL2

2
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_001_pos.ksh
View File

@ -75,7 +75,7 @@ log_onexit cleanup
init_snap=$TESTPOOL/$TESTFS@init_snap init_snap=$TESTPOOL/$TESTFS@init_snap
inc_snap=$TESTPOOL/$TESTFS@inc_snap inc_snap=$TESTPOOL/$TESTFS@inc_snap
full_bkup=$TEST_BASE_DIR/fullbkup.$$ full_bkup=$TEST_BASE_DIR/fullbkup.$$
inc_bkup=/var/tmp/incbkup.$$ inc_bkup=$TEST_BASE_DIR/incbkup.$$
init_data=$TESTDIR/$TESTFILE1 init_data=$TESTDIR/$TESTFILE1
inc_data=$TESTDIR/$TESTFILE2 inc_data=$TESTDIR/$TESTFILE2
orig_sum="" orig_sum=""

5
tests/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_007_pos.ksh
View File

@ -57,9 +57,8 @@ function cleanup
log_onexit cleanup log_onexit cleanup
log_assert "'zfs list -d <n>' should get expected output." log_assert "'zfs list -d <n>' should get expected output."
mntpnt=/var/tmp DEPTH_OUTPUT="$TEST_BASE_DIR/depth_output"
DEPTH_OUTPUT="$mntpnt/depth_output" EXPECT_OUTPUT="$TEST_BASE_DIR/expect_output"
EXPECT_OUTPUT="$mntpnt/expect_output"
typeset -i old_val=0 typeset -i old_val=0
typeset -i j=0 typeset -i j=0
typeset -i fs=0 typeset -i fs=0