diff options
| author | Sydney Vanda <[email protected]> | 2016-07-22 15:07:04 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-09-08 13:45:34 -0700 |
| commit | 7050a65d5c760aa039d195fe0b6773a20a81048b (patch) | |
| tree | 70bc4498bee7878d4abab11b95a7113c341b8152 /config/user-commands.m4 | |
| parent | 178acea364bc19da6cd30c6aaa7147f9a14fdb5a (diff) | |
Real disk partitioning now enabled in test suite for Linux
When using real devices, specify DISKS="sdb sdc sdd" opposed to
/dev/sdb in zfs-tests.sh - otherwise errors with directory names and
disk names registering as "/dev//dev/sdb" for some tests. The same
goes for mpath: DISK="mpatha mpathad mpathb"
Expected Usage:
$ DISKS="sdb sdc sdd" zfs-tests.sh
SLICE_PREFIX is now set as "p" for a loop device (ie loop0p2) or
"" for a real device (ie sdb2), or either for multipath devices
(ie mpatha1 or mpath1p1) instead of only "p" by default. Note that
kpartx partitioning is not currently supported in this patch
(ie "partx") and may need to be disabled on Debian distributions.
Functions added for determining test directory (/dev or /dev/mapper)
as well as slice prefix are determined and exported mostly in the cfg
file of each test group directory.
Currently zpools cannot be created on whole mpath devices that have
been partitioned. In order to fix this tests have either been revised
to use a partition instead, or if there is a size constraint and the
pool needs to be created on the whole disk, partitions are then deleted
if the device is a multipath device. This functionality is added to
default_cleanup() or to individual cleanup scripts if a non-default
cleanup method is used.
The max partitions is currently set at 8 to account for all of the
tests thus far.
Patch changes are generally encompassed in "if is_linux" construct.
Signed-off-by: Sydney Vanda <[email protected]>
Reviewed-by: John Salinas <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: David Quigley <[email protected]>
Closes #4447
Closes #4964
Closes #5074
Diffstat (limited to 'config/user-commands.m4')
| -rw-r--r-- | config/user-commands.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/user-commands.m4 b/config/user-commands.m4 index bda2b8652..112e4c18c 100644 --- a/config/user-commands.m4 +++ b/config/user-commands.m4 @@ -99,9 +99,11 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_LINUX], [ AC_PATH_TOOL(COMPRESS, gzip, "") AC_PATH_TOOL(FORMAT, parted, "") AC_PATH_TOOL(LOCKFS, lsof, "") + AC_PATH_TOOL(LSBLK, lsblk, "") AC_PATH_TOOL(MODUNLOAD, rmmod, "") AC_PATH_TOOL(NEWFS, mke2fs, "") AC_PATH_TOOL(PFEXEC, sudo, "") + AC_PATH_TOOL(READLINK, readlink, "") AC_PATH_TOOL(SHARE, exportfs, "") AC_PATH_TOOL(SWAP, swapon, "") AC_PATH_TOOL(SWAPADD, swapon, "") |