c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-30 18:56:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Fix a few defaults

Browse Source 
Linux was missing a default value for DEV_DSKDIR. Set it to /dev.
Fix resulting fallout.

SLICE_PREFIX seems like a good candidate for including in the defaults.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #9898
This commit is contained in:
Ryan Moeller
2020-01-31 11:51:23 -05:00
committed by GitHub
parent 9d8ce2457d
commit a3bddd49f8
14 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.cfg
-2
View File
@@ -73,8 +73,6 @@ if is_linux || is_freebsd; then
export SLICE5=6
export SLICE6=7
else
export DEV_DSKDIR="/dev"
export SLICE_PREFIX="s"
export SLICE0=0
export SLICE1=1
export SLICE3=3
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.cfg
-1
View File
@@ -78,7 +78,6 @@ if is_linux; then
delete_partitions
fi
else
export SLICE_PREFIX="s"
export SLICE0=0
export SLICE1=1
export SLICE2=2
tests/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy.cfg
-1
View File
@@ -38,7 +38,6 @@ if is_linux; then
export SLICE0=1
export SLICE1=2
else
export SLICE_PREFIX="s"
export SLICE0=0
export SLICE1=1
tests/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove.cfg
-1
View File
@@ -45,7 +45,6 @@ if is_linux; then
export SLICE6=7
export SLICE7=8
else
export SLICE_PREFIX="s"
export SLICE0=0
export SLICE1=1
export SLICE2=2
tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.cfg
-2
View File
@@ -40,6 +40,4 @@ if is_linux; then
devs_id[1]=$(get_persistent_disk_name $DISK2)
devs_id[2]=$(get_persistent_disk_name $DISK3)
export devs_id
else
DEV_DSKDIR="/dev"
fi
tests/zfs-tests/tests/functional/fault/fault.cfg
-2
View File
@@ -47,8 +47,6 @@ if is_linux; then
devs_id[1]=$(get_persistent_disk_name $DISK2)
devs_id[2]=$(get_persistent_disk_name $DISK3)
export devs_id
else
DEV_DSKDIR="/dev"
fi
export VDEV_FILES="$TEST_BASE_DIR/file-1 $TEST_BASE_DIR/file-2 \
tests/zfs-tests/tests/functional/inuse/inuse.cfg
-1
View File
@@ -38,7 +38,6 @@ if is_linux; then
export SLICE0=1
export SLICE1=2
else
export SLICE_PREFIX="s"
export SLICE0=0
export SLICE1=1
fi
tests/zfs-tests/tests/functional/migration/migration.cfg
-2
View File
@@ -60,7 +60,6 @@ case "${#disk_array[*]}" in
log_fail "$ZFS_DISK not supported for partitioning."
fi
else
export DEV_DSKDIR="/dev"
ZFSSIDE_DISK=${SINGLE_DISK}s0
NONZFSSIDE_DISK=${SINGLE_DISK}s1
fi
@@ -93,7 +92,6 @@ case "${#disk_array[*]}" in
log_fail "$NONZFS_DISK not supported for partitioning."
fi
else
export DEV_DSKDIR="/dev"
ZFSSIDE_DISK=${ZFS_DISK}s0
NONZFSSIDE_DISK=${NONZFS_DISK}s0
fi
tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg
-2
View File
@@ -41,7 +41,5 @@ if is_linux; then
set_device_dir
export SLICE=1
else
DEV_DSKDIR="/dev"
export SLICE_PREFIX="s"
export SLICE=0
fi
tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC.cfg
-7
View File
@@ -32,17 +32,10 @@
verify_runnable "global"
#export SIZE="1gb"
export DISK_ARRAY_NUM=$(echo ${DISKS} | nawk '{print NF}')
export DISKSARRAY=$DISKS
if is_linux; then
set_slice_prefix
set_device_dir
# export SLICE=1
else
DEV_DSKDIR="/dev"
export SLICE_PREFIX="s"
# export SLICE=0
fi
tests/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli.cfg
-4
View File
@@ -35,11 +35,7 @@ verify_runnable "global"
export DISK_ARRAY_NUM=$(echo ${DISKS} | nawk '{print NF}')
export DISKSARRAY=$DISKS
if is_linux; then
set_slice_prefix
set_device_dir
else
DEV_DSKDIR="/dev"
export SLICE_PREFIX="s"
fi