Page MenuHomeFreeBSD
Files F131544099

D29066.diff
No OneTemporary
Actions

D29066.diff
View Options

diff --git a/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh b/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh
--- a/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh
+++ b/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh
@@ -30,8 +30,8 @@
cifs_attr_001_pos_head()
{
atf_set "descr" "Verify set/clear DOS attributes will succeed while user haswrite_attributes permission or PRIV_FILE_OWNER privilege"
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" runwattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 runwattr"
}
cifs_attr_001_pos_body()
{
@@ -57,8 +57,8 @@
cifs_attr_002_pos_head()
{
atf_set "descr" "Verify set/clear BSD'ish attributes will succeed while user hasPRIV_FILE_FLAG_SET/PRIV_FILE_FLAG_CLEAR privilege"
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" runwattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 runwattr"
}
cifs_attr_002_pos_body()
{
@@ -84,8 +84,8 @@
cifs_attr_003_pos_head()
{
atf_set "descr" "Verify DOS & BSD'ish attributes will provide theaccess limitation as expected."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 runat"
}
cifs_attr_003_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh b/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh
--- a/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh
+++ b/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh
@@ -55,7 +55,7 @@
{
atf_set "descr" "Verify acl after upgrading."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_acl_chmod_002_pos_body()
{
@@ -80,7 +80,7 @@
{
atf_set "descr" "Verify chmod have correct behaviour to directory and file whenfilesystem has the different aclmode setting."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_acl_chmod_aclmode_001_pos_body()
{
@@ -177,7 +177,7 @@
{
atf_set "descr" "Verify chmod have correct behaviour to directory and file whenfilesystem has the different aclinherit setting."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_acl_chmod_inherit_002_pos_body()
{
@@ -202,7 +202,7 @@
{
atf_set "descr" "Verify chmod have correct behaviour to directory and file whenfilesystem has the different aclinherit setting."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_acl_chmod_inherit_003_pos_body()
{
@@ -227,7 +227,7 @@
{
atf_set "descr" "Verify aclinherit=passthrough-x will inherit the 'x' bits while mode request."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zfs_acl_chmod_inherit_004_pos_body()
{
@@ -395,8 +395,8 @@
zfs_acl_chmod_xattr_001_pos_head()
{
atf_set "descr" "Verify that the permission of read_xattr/write_xattr forowner/group/everyone are correct."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 runat"
}
zfs_acl_chmod_xattr_001_pos_body()
{
@@ -421,7 +421,7 @@
{
atf_set "descr" "Verify that the permission of write_xattr forowner/group/everyone while remove extended attributes are correct."
atf_set "require.config" zfs_xattr
- atf_set "require.progs" runat
+ atf_set "require.progs" "ksh93 runat"
}
zfs_acl_chmod_xattr_002_pos_body()
{
@@ -446,7 +446,7 @@
{
atf_set "descr" "Verify that '$CP [-p]' supports ZFS ACLs."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_acl_cp_001_pos_body()
{
@@ -470,8 +470,8 @@
zfs_acl_cp_002_pos_head()
{
atf_set "descr" "Verify that '$CP [-p]' supports ZFS ACLs."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" zfs runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 zfs runat"
}
zfs_acl_cp_002_pos_body()
{
@@ -496,7 +496,7 @@
{
atf_set "descr" "Verify that '$CPIO' command supports to archive ZFS ACLs."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_acl_cpio_001_pos_body()
{
@@ -520,8 +520,8 @@
zfs_acl_cpio_002_pos_head()
{
atf_set "descr" "Verify that '$CPIO' command supports to archive ZFS ACLs & xattrs."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" zfs runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 zfs runat"
}
zfs_acl_cpio_002_pos_body()
{
@@ -618,7 +618,7 @@
{
atf_set "descr" "Verify that '$TAR' command supports to archive ZFS ACLs."
atf_set "require.config" zfs_acl
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_acl_tar_001_pos_body()
{
@@ -642,8 +642,8 @@
zfs_acl_tar_002_pos_head()
{
atf_set "descr" "Verify that '$TAR' command supports to archive ZFS ACLs & xattrs."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" zfs runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 zfs runat"
}
zfs_acl_tar_002_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh b/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh
--- a/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh
+++ b/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh
@@ -53,7 +53,7 @@
zfs_acl_compress_001_pos_head()
{
atf_set "descr" "Compress will keep file attribute intact after the file iscompressed and uncompressed"
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_compress_001_pos_body()
{
@@ -77,7 +77,7 @@
zfs_acl_cp_001_pos_head()
{
atf_set "descr" "Verifies that cp will include file attribute when using the -@ flag"
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_cp_001_pos_body()
{
@@ -101,7 +101,7 @@
zfs_acl_cp_002_neg_head()
{
atf_set "descr" "Verifies that cp will not include file attribute when the -@ flagis not present."
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_cp_002_neg_body()
{
@@ -125,8 +125,8 @@
zfs_acl_cp_003_neg_head()
{
atf_set "descr" "Verifies that cp won't be able to include file attribute whenattribute is unreadable (except root)"
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 runat"
}
zfs_acl_cp_003_neg_body()
{
@@ -150,7 +150,7 @@
zfs_acl_find_001_pos_head()
{
atf_set "descr" "Verifies ability to find files with attribute with-xattr flag and using '-exec runat ls'"
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_find_001_pos_body()
{
@@ -174,8 +174,8 @@
zfs_acl_find_002_neg_head()
{
atf_set "descr" "verifies -xattr doesn't include files withoutattribute and using '-exec runat ls'"
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 runat"
}
zfs_acl_find_002_neg_body()
{
@@ -199,7 +199,7 @@
zfs_acl_ls_001_pos_head()
{
atf_set "descr" "Verifies that ls displays @ in the file permissions using ls -@for files with attribute."
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_ls_001_pos_body()
{
@@ -223,8 +223,8 @@
zfs_acl_ls_002_neg_head()
{
atf_set "descr" "Verifies that ls doesn't display @ in the filepermissions using ls -@ for files without attribute."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" runat
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 runat"
}
zfs_acl_ls_002_neg_body()
{
@@ -248,7 +248,7 @@
zfs_acl_mv_001_pos_head()
{
atf_set "descr" "Verifies that mv will include file attribute."
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_mv_001_pos_body()
{
@@ -272,8 +272,8 @@
zfs_acl_pack_001_pos_head()
{
atf_set "descr" "Verifies that pack will keep file attribute intact after the fileis packed and unpacked"
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" unpack pack
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 unpack pack"
}
zfs_acl_pack_001_pos_body()
{
@@ -297,8 +297,8 @@
zfs_acl_pax_001_pos_head()
{
atf_set "descr" "Verify include attribute in pax archive and restore with paxshould succeed."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" pax
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 pax"
}
zfs_acl_pax_001_pos_body()
{
@@ -322,8 +322,8 @@
zfs_acl_pax_002_pos_head()
{
atf_set "descr" "Verify include attribute in pax archive and restore with tarshould succeed."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" pax
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 pax"
}
zfs_acl_pax_002_pos_body()
{
@@ -347,8 +347,8 @@
zfs_acl_pax_003_pos_head()
{
atf_set "descr" "Verify include attribute in pax archive and restore with cpioshould succeed."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" pax
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 pax"
}
zfs_acl_pax_003_pos_body()
{
@@ -372,8 +372,8 @@
zfs_acl_pax_004_pos_head()
{
atf_set "descr" "Verify files include attribute in pax archive and restore with paxshould succeed."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" pax
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 pax"
}
zfs_acl_pax_004_pos_body()
{
@@ -397,8 +397,8 @@
zfs_acl_pax_005_pos_head()
{
atf_set "descr" "Verify files include attribute in cpio archive and restore withcpio should succeed."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" pax
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 pax"
}
zfs_acl_pax_005_pos_body()
{
@@ -422,8 +422,8 @@
zfs_acl_pax_006_pos_head()
{
atf_set "descr" "Verify files include attribute in tar archive and restore withtar should succeed."
- atf_set "require.config" zfs_acl zfs_xattr
- atf_set "require.progs" pax
+ atf_set "require.config" "zfs_acl zfs_xattr"
+ atf_set "require.progs" "ksh93 pax"
}
zfs_acl_pax_006_pos_body()
{
@@ -447,7 +447,7 @@
zfs_acl_tar_001_pos_head()
{
atf_set "descr" "Verifies that tar will include file attribute when @ flag ispresent."
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_tar_001_pos_body()
{
@@ -471,7 +471,7 @@
zfs_acl_tar_002_neg_head()
{
atf_set "descr" "Verifies that tar will not include files attribute when @ flag isnot present"
- atf_set "require.config" zfs_acl zfs_xattr
+ atf_set "require.config" "zfs_acl zfs_xattr"
}
zfs_acl_tar_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/atime/atime_test.sh b/tests/sys/cddl/zfs/tests/atime/atime_test.sh
--- a/tests/sys/cddl/zfs/tests/atime/atime_test.sh
+++ b/tests/sys/cddl/zfs/tests/atime/atime_test.sh
@@ -30,7 +30,7 @@
atime_001_pos_head()
{
atf_set "descr" "Setting atime=on, the access time for files is updated when read."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
atime_001_pos_body()
{
@@ -56,7 +56,7 @@
atime_002_neg_head()
{
atf_set "descr" "Setting atime=off, the access time for files will not be updatedwhen read."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
atime_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh b/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh
--- a/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh
+++ b/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh
@@ -30,7 +30,7 @@
bootfs_001_pos_head()
{
atf_set "descr" "Valid datasets are accepted as bootfs property values"
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
}
bootfs_001_pos_body()
{
@@ -45,7 +45,7 @@
bootfs_002_neg_head()
{
atf_set "descr" "Invalid datasets are rejected as boot property values"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
bootfs_002_neg_body()
{
@@ -61,7 +61,7 @@
bootfs_003_pos_head()
{
atf_set "descr" "Valid pool names are accepted by zpool set bootfs"
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
}
bootfs_003_pos_body()
{
@@ -76,7 +76,7 @@
bootfs_004_neg_head()
{
atf_set "descr" "Invalid pool names are rejected by zpool set bootfs"
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
}
bootfs_004_neg_body()
{
@@ -91,7 +91,7 @@
bootfs_005_neg_head()
{
atf_set "descr" "Boot properties cannot be set on pools with older versions"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
bootfs_005_neg_body()
{
@@ -107,7 +107,7 @@
bootfs_006_pos_head()
{
atf_set "descr" "Pools of correct vdev types accept boot property"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
bootfs_006_pos_body()
{
@@ -122,7 +122,7 @@
bootfs_007_pos_head()
{
atf_set "descr" "setting bootfs on a pool which was configured with the whole disk will succeed"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
bootfs_007_pos_body()
{
@@ -138,7 +138,7 @@
bootfs_008_neg_head()
{
atf_set "descr" "setting bootfs on a dataset which has gzip compression enabled will fail"
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
}
bootfs_008_neg_body()
{
@@ -154,7 +154,7 @@
{
atf_set "descr" "Valid encrypted datasets can't be set bootfs property values"
atf_set "require.config" zfs_encryption
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
bootfs_009_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cache/cache_test.sh b/tests/sys/cddl/zfs/tests/cache/cache_test.sh
--- a/tests/sys/cddl/zfs/tests/cache/cache_test.sh
+++ b/tests/sys/cddl/zfs/tests/cache/cache_test.sh
@@ -30,7 +30,7 @@
cache_001_pos_head()
{
atf_set "descr" "Creating a pool with a cache device succeeds."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_001_pos_body()
@@ -57,7 +57,7 @@
cache_002_pos_head()
{
atf_set "descr" "Adding a cache device to normal pool works."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_002_pos_body()
@@ -84,7 +84,7 @@
cache_003_pos_head()
{
atf_set "descr" "Adding an extra cache device works."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_003_pos_body()
@@ -111,7 +111,7 @@
cache_004_neg_head()
{
atf_set "descr" "Attaching a cache device fails."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_004_neg_body()
@@ -138,7 +138,7 @@
cache_005_neg_head()
{
atf_set "descr" "Replacing a cache device fails."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_005_neg_body()
@@ -165,7 +165,7 @@
cache_006_pos_head()
{
atf_set "descr" "Exporting and importing pool with cache devices passes."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_006_pos_body()
@@ -192,7 +192,7 @@
cache_007_neg_head()
{
atf_set "descr" "A mirror/raidz/raidz2 cache is not supported."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_007_neg_body()
@@ -219,7 +219,7 @@
cache_008_neg_head()
{
atf_set "descr" "A raidz/raidz2 cache can not be added to existed pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_008_neg_body()
@@ -246,7 +246,7 @@
cache_009_pos_head()
{
atf_set "descr" "Offline and online a cache device succeed."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_009_pos_body()
@@ -273,7 +273,7 @@
cache_010_neg_head()
{
atf_set "descr" "Cache device can only be disk or slice."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1200
}
cache_010_neg_body()
@@ -300,7 +300,7 @@
cache_011_pos_head()
{
atf_set "descr" "Remove cache device from pool with spare device should succeed"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
cache_011_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh b/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh
--- a/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh
+++ b/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh
@@ -30,7 +30,7 @@
cachefile_001_pos_head()
{
atf_set "descr" "Creating a pool with \cachefile\ set doesn't update zpool.cache"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
cachefile_001_pos_body()
{
@@ -47,7 +47,7 @@
cachefile_002_pos_head()
{
atf_set "descr" "Importing a pool with \cachefile\ set doesn't update zpool.cache"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
cachefile_002_pos_body()
{
@@ -64,7 +64,7 @@
cachefile_003_pos_head()
{
atf_set "descr" "Setting altroot=path and cachefile=$CPATH for zpool create succeed."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
cachefile_003_pos_body()
{
@@ -81,7 +81,7 @@
cachefile_004_pos_head()
{
atf_set "descr" "Verify set, export and destroy when cachefile is set on pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
cachefile_004_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh
@@ -30,7 +30,7 @@
zdb_001_neg_head()
{
atf_set "descr" "Execute zdb using invalid parameters."
- atf_set "require.progs" zdb
+ atf_set "require.progs" "ksh93 zdb"
}
zdb_001_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh
@@ -30,7 +30,7 @@
zfs_001_neg_head()
{
atf_set "descr" "Badly-formed zfs sub-command should return an error."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_001_neg_body()
{
@@ -54,7 +54,7 @@
zfs_002_pos_head()
{
atf_set "descr" "With ZFS_ABORT set, all zfs commands can abort and generate a core file."
- atf_set "require.progs" zfs coreadm
+ atf_set "require.progs" "ksh93 zfs coreadm"
}
zfs_002_pos_body()
{
@@ -78,7 +78,7 @@
zfs_003_neg_head()
{
atf_set "descr" "zfs fails with unexpected scenarios."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_003_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh
@@ -30,7 +30,7 @@
zfs_clone_001_neg_head()
{
atf_set "descr" "Badly-formed 'zfs clone' with inapplicable scenariosshould return an error."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_001_neg_body()
{
@@ -54,7 +54,7 @@
zfs_clone_002_pos_head()
{
atf_set "descr" "clone -p should work as expected."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_002_pos_body()
{
@@ -78,7 +78,7 @@
zfs_clone_003_pos_head()
{
atf_set "descr" "'zfs clone -o property=value filesystem' can successfully createa ZFS clone filesystem with correct property set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_003_pos_body()
{
@@ -102,7 +102,7 @@
zfs_clone_004_pos_head()
{
atf_set "descr" "'zfs clone -o property=value filesystem' can successfully createa ZFS clone filesystem with multiple properties set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_004_pos_body()
{
@@ -126,7 +126,7 @@
zfs_clone_005_pos_head()
{
atf_set "descr" "'zfs clone -o property=value -V size volume' can successfullycreate a ZFS clone volume with correct property set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_005_pos_body()
{
@@ -150,7 +150,7 @@
zfs_clone_006_pos_head()
{
atf_set "descr" "'zfs clone -o property=value volume' can successfullycreate a ZFS clone volume with multiple correct properties set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_006_pos_body()
{
@@ -174,7 +174,7 @@
zfs_clone_007_pos_head()
{
atf_set "descr" "'zfs clone -o version=' could upgrade version,but downgrade is denied."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_007_pos_body()
{
@@ -198,7 +198,7 @@
zfs_clone_008_neg_head()
{
atf_set "descr" "Verify 'zfs clone -o <filesystem>' fails with bad <filesystem> argument."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_008_neg_body()
{
@@ -222,7 +222,7 @@
zfs_clone_009_neg_head()
{
atf_set "descr" "Verify 'zfs clone -o <volume>' fails with bad <volume> argument."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_clone_009_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh
@@ -30,7 +30,7 @@
zfs_copies_001_pos_head()
{
atf_set "descr" "Verify 'copies' property with correct arguments works or not."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_copies_001_pos_body()
{
@@ -56,7 +56,7 @@
zfs_copies_002_pos_head()
{
atf_set "descr" "Verify that the space used by multiple copies is charged correctly."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_copies_002_pos_body()
{
@@ -82,7 +82,7 @@
zfs_copies_003_pos_head()
{
atf_set "descr" "Verify that ZFS volume space used by multiple copies is charged correctly."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_copies_003_pos_body()
{
@@ -108,7 +108,7 @@
zfs_copies_004_neg_head()
{
atf_set "descr" "Verify that copies property cannot be set to any value other than 1,2 or 3"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_copies_004_neg_body()
{
@@ -135,7 +135,7 @@
zfs_copies_005_neg_head()
{
atf_set "descr" "Verify that copies cannot be set with pool version 1"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zfs_copies_005_neg_body()
{
@@ -161,7 +161,7 @@
zfs_copies_006_pos_head()
{
atf_set "descr" "Verify that ZFS volume space used by multiple copies is charged correctly."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_copies_006_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh
@@ -30,7 +30,7 @@
zfs_create_001_pos_head()
{
atf_set "descr" "'zfs create <filesystem>' can create a ZFS filesystem in the namespace."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_001_pos_body()
{
@@ -58,7 +58,7 @@
zfs_create_002_pos_head()
{
atf_set "descr" "'zfs create -s -V <size> <volume>' succeeds"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_002_pos_body()
{
@@ -86,7 +86,7 @@
zfs_create_003_pos_head()
{
atf_set "descr" "Verify creating volume with specified blocksize works."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_003_pos_body()
{
@@ -114,7 +114,7 @@
zfs_create_004_pos_head()
{
atf_set "descr" "'zfs create -o property=value filesystem' can successfully createa ZFS filesystem with correct property set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_004_pos_body()
{
@@ -142,7 +142,7 @@
zfs_create_005_pos_head()
{
atf_set "descr" "'zfs create -o property=value filesystem' can successfully createa ZFS filesystem with multiple properties set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_005_pos_body()
{
@@ -170,7 +170,7 @@
zfs_create_006_pos_head()
{
atf_set "descr" "'zfs create -o property=value -V size volume' can successfullycreate a ZFS volume with correct property set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_006_pos_body()
{
@@ -198,7 +198,7 @@
zfs_create_007_pos_head()
{
atf_set "descr" "'zfs create -o property=value -V size volume' can successfullycreate a ZFS volume with correct property set."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_007_pos_body()
{
@@ -226,7 +226,7 @@
zfs_create_008_neg_head()
{
atf_set "descr" "'zfs create' should return an error with badly-formed parameters."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_008_neg_body()
{
@@ -255,7 +255,7 @@
zfs_create_009_neg_head()
{
atf_set "descr" "Verify 'zfs create <filesystem>' fails with bad <filesystem> argument."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_009_neg_body()
{
@@ -283,7 +283,7 @@
zfs_create_010_neg_head()
{
atf_set "descr" "Verify 'zfs create [-s] [-b <blocksize> ] -V <size> <volume>' fails withbadly-formed <size> or <volume> arguments."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_010_neg_body()
{
@@ -311,7 +311,7 @@
zfs_create_011_pos_head()
{
atf_set "descr" "'zfs create -p' works as expected."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_011_pos_body()
{
@@ -339,7 +339,7 @@
zfs_create_012_pos_head()
{
atf_set "descr" "'zfs create -p -o version=1' only cause the leaf filesystem to be version=1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_012_pos_body()
{
@@ -367,7 +367,7 @@
zfs_create_013_pos_head()
{
atf_set "descr" "'zfs create -s -V <size> <volume>' succeeds"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_create_013_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh
@@ -30,7 +30,7 @@
zfs_destroy_001_pos_head()
{
atf_set "descr" "'zfs destroy -r|-R|-f|-rf|-Rf <fs|ctr|vol|snap>' shouldrecursively destroy all children."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 3600
}
zfs_destroy_001_pos_body()
@@ -57,7 +57,7 @@
zfs_destroy_002_pos_head()
{
atf_set "descr" "Verify 'zfs destroy' can destroy the specified datasets without activedependents."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 3600
}
zfs_destroy_002_pos_body()
@@ -84,7 +84,7 @@
zfs_destroy_003_pos_head()
{
atf_set "descr" "Verify that 'zfs destroy [-rR]' succeeds as root."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 3600
}
zfs_destroy_003_pos_body()
@@ -111,7 +111,7 @@
zfs_destroy_004_pos_head()
{
atf_set "descr" "Verify that 'zfs destroy -f' succeeds as root."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 3600
}
zfs_destroy_004_pos_body()
@@ -138,7 +138,7 @@
zfs_destroy_005_neg_head()
{
atf_set "descr" "Separately verify 'zfs destroy -f|-r|-rf|-R|-rR <dataset>' willfail in different conditions."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 3600
}
zfs_destroy_005_neg_body()
@@ -165,7 +165,7 @@
zfs_destroy_006_neg_head()
{
atf_set "descr" "'zfs destroy' should return an error with badly-formed parameters."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 3600
}
zfs_destroy_006_neg_body()
@@ -192,7 +192,7 @@
zfs_destroy_007_neg_head()
{
atf_set "descr" "Destroy dataset which is namespace-parent of origin should failed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 3600
}
zfs_destroy_007_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh
@@ -30,7 +30,7 @@
zfs_diff_001_pos_head()
{
atf_set "descr" "zfs diff output for typical operations"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_diff_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh
@@ -30,7 +30,7 @@
zfs_get_001_pos_head()
{
atf_set "descr" "Setting the valid options and properties 'zfs get' should returnthe correct property value."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_001_pos_body()
{
@@ -58,7 +58,7 @@
zfs_get_002_pos_head()
{
atf_set "descr" "Setting the valid options and properties 'zfs get' return correctvalue. It should be successful."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_002_pos_body()
{
@@ -86,7 +86,7 @@
zfs_get_003_pos_head()
{
atf_set "descr" "'zfs get' should get consistent report with different option."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_003_pos_body()
{
@@ -114,7 +114,7 @@
zfs_get_004_pos_head()
{
atf_set "descr" "Verify the functions of 'zfs get all' work."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zfs_get_004_pos_body()
{
@@ -142,7 +142,7 @@
zfs_get_005_neg_head()
{
atf_set "descr" "Setting the invalid option and properties, 'zfs get' should befailed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_005_neg_body()
{
@@ -170,7 +170,7 @@
zfs_get_006_neg_head()
{
atf_set "descr" "Verify 'zfs get all' fails with invalid combination scenarios."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_006_neg_body()
{
@@ -198,7 +198,7 @@
zfs_get_007_neg_head()
{
atf_set "descr" "'zfs get -o' fails with invalid options or column names"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_007_neg_body()
{
@@ -226,7 +226,7 @@
zfs_get_008_pos_head()
{
atf_set "descr" "Verify '-d <n>' can work with other options"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_008_pos_body()
{
@@ -254,7 +254,7 @@
zfs_get_009_pos_head()
{
atf_set "descr" "'zfs get -d <n>' should get expected output."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
zfs_get_009_pos_body()
@@ -283,7 +283,7 @@
zfs_get_010_neg_head()
{
atf_set "descr" "A negative depth or a non numeric depth should fail in 'zfs get -d <n>'"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_get_010_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh
@@ -30,7 +30,7 @@
zfs_inherit_001_neg_head()
{
atf_set "descr" "'zfs inherit' should return an error when attempting to inherit un-inheritable properties."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_inherit_001_neg_body()
{
@@ -54,7 +54,7 @@
zfs_inherit_002_neg_head()
{
atf_set "descr" "'zfs inherit' should return an error with bad parameters in one command."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_inherit_002_neg_body()
{
@@ -78,7 +78,7 @@
zfs_inherit_003_pos_head()
{
atf_set "descr" "'zfs inherit' should inherit user property."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_inherit_003_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh
@@ -30,7 +30,7 @@
zfs_mount_001_pos_head()
{
atf_set "descr" "Verify that '$ZFS $mountcmd <filesystem>' succeeds as root."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_001_pos_body()
{
@@ -60,7 +60,7 @@
zfs_mount_002_pos_head()
{
atf_set "descr" "Verify that '$ZFS $mountcmd' with a filesystemwhose name is not in 'zfs list' will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_002_pos_body()
{
@@ -86,7 +86,7 @@
zfs_mount_003_pos_head()
{
atf_set "descr" "Verify that '$ZFS $mountcmd' with a filesystemwhose mountpoint property is 'legacy' or 'none' \will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_003_pos_body()
{
@@ -112,7 +112,7 @@
zfs_mount_004_pos_head()
{
atf_set "descr" "Verify that '$ZFS $mountcmd <filesystem>'with a mounted filesystem will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_004_pos_body()
{
@@ -138,7 +138,7 @@
zfs_mount_005_pos_head()
{
atf_set "descr" "Verify that '$ZFS $mountcmd' with a filesystemwhose mountpoint is currently in use will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_005_pos_body()
{
@@ -165,7 +165,7 @@
zfs_mount_006_pos_head()
{
atf_set "descr" "Verify that '$ZFS $mountcmd <filesystem>'which mountpoint be the identical or the top of an existing one \will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_006_pos_body()
{
@@ -192,7 +192,7 @@
zfs_mount_007_pos_head()
{
atf_set "descr" "Verify '-o' will set filesystem property temporarily,without affecting the property that is stored on disk."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_007_pos_body()
{
@@ -219,7 +219,7 @@
zfs_mount_008_pos_head()
{
atf_set "descr" "Verify 'zfs mount -O' will override existing mount point."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_008_pos_body()
{
@@ -245,7 +245,7 @@
zfs_mount_009_neg_head()
{
atf_set "descr" "Badly-formed 'zfs $mountcmd' with inapplicable scenariosshould return an error."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_009_neg_body()
{
@@ -275,7 +275,7 @@
zfs_mount_010_neg_head()
{
atf_set "descr" "zfs mount fails with mounted filesystem or busy mountpoint"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_010_neg_body()
{
@@ -302,7 +302,7 @@
zfs_mount_011_neg_head()
{
atf_set "descr" "zfs mount fails with bad parameters"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_011_neg_body()
{
@@ -328,7 +328,7 @@
zfs_mount_all_001_pos_head()
{
atf_set "descr" "Verify that 'zfs $mountall' succeeds as root,and all available ZFS filesystems are mounted."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_mount_all_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh
@@ -30,7 +30,7 @@
zfs_promote_001_pos_head()
{
atf_set "descr" "'zfs promote' can promote a clone filesystem."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_001_pos_body()
{
@@ -56,7 +56,7 @@
zfs_promote_002_pos_head()
{
atf_set "descr" "'zfs promote' can deal with multiple snapshots in a filesystem."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_002_pos_body()
{
@@ -82,7 +82,7 @@
zfs_promote_003_pos_head()
{
atf_set "descr" "'zfs promote' can deal with multi-point snapshots."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_003_pos_body()
{
@@ -108,7 +108,7 @@
zfs_promote_004_pos_head()
{
atf_set "descr" "'zfs promote' can deal with multi-level clone."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_004_pos_body()
{
@@ -134,7 +134,7 @@
zfs_promote_005_pos_head()
{
atf_set "descr" "The original fs was unmounted, 'zfs promote' still should succeed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_005_pos_body()
{
@@ -160,7 +160,7 @@
zfs_promote_006_neg_head()
{
atf_set "descr" "'zfs promote' will fail with invalid arguments."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_006_neg_body()
{
@@ -186,7 +186,7 @@
zfs_promote_007_neg_head()
{
atf_set "descr" "'zfs promote' can deal with name conflicts."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_007_neg_body()
{
@@ -212,7 +212,7 @@
zfs_promote_008_pos_head()
{
atf_set "descr" "'zfs promote' can promote a volume clone."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_promote_008_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property_test.sh
@@ -30,7 +30,7 @@
zfs_set_property_001_pos_head()
{
atf_set "descr" "Verify each of the file system properties."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_set_property_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh
@@ -30,7 +30,7 @@
zfs_receive_001_pos_head()
{
atf_set "descr" "Verifying 'zfs receive [<filesystem|snapshot>] -d <filesystem>' works."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_001_pos_body()
{
@@ -54,7 +54,7 @@
zfs_receive_002_pos_head()
{
atf_set "descr" "Verifying 'zfs receive <volume>' works."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_002_pos_body()
{
@@ -78,7 +78,7 @@
zfs_receive_003_pos_head()
{
atf_set "descr" "'zfs recv -F' to force rollback."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_003_pos_body()
{
@@ -102,7 +102,7 @@
zfs_receive_004_neg_head()
{
atf_set "descr" "Verify that invalid parameters to 'zfs receive' are caught."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_004_neg_body()
{
@@ -126,7 +126,7 @@
zfs_receive_005_neg_head()
{
atf_set "descr" "Verify 'zfs receive' fails with unsupported scenarios."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_005_neg_body()
{
@@ -150,7 +150,7 @@
zfs_receive_006_pos_head()
{
atf_set "descr" "'zfs recv -d <fs>' should succeed no matter ancestor filesystemexists."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_006_pos_body()
{
@@ -174,7 +174,7 @@
zfs_receive_007_neg_head()
{
atf_set "descr" "'zfs recv -F' should fail if the incremental stream does not match"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_007_neg_body()
{
@@ -198,7 +198,7 @@
zfs_receive_008_pos_head()
{
atf_set "descr" "Verifying 'zfs receive -vn [<filesystem|snapshot>]and zfs receive -vn -d <filesystem>'"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_008_pos_body()
{
@@ -222,7 +222,7 @@
zfs_receive_009_neg_head()
{
atf_set "descr" "Verify 'zfs receive' fails with bad option, missing or too many arguments"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_receive_009_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh
@@ -30,7 +30,7 @@
zfs_rename_001_pos_head()
{
atf_set "descr" "'zfs rename' should successfully rename valid datasets"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_001_pos_body()
{
@@ -56,7 +56,7 @@
zfs_rename_002_pos_head()
{
atf_set "descr" "'zfs rename' should successfully rename valid datasets"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_002_pos_body()
{
@@ -82,7 +82,7 @@
zfs_rename_003_pos_head()
{
atf_set "descr" "'zfs rename' can address the abbreviated snapshot name."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_003_pos_body()
{
@@ -108,7 +108,7 @@
zfs_rename_004_neg_head()
{
atf_set "descr" "'zfs rename' should fail when datasets are of a different type."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_004_neg_body()
{
@@ -134,7 +134,7 @@
zfs_rename_005_neg_head()
{
atf_set "descr" "'zfs rename' should fail while datasets are within different pool."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_005_neg_body()
{
@@ -160,7 +160,7 @@
zfs_rename_006_pos_head()
{
atf_set "descr" "'zfs rename' can successfully rename a volume snapshot."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_006_pos_body()
{
@@ -186,7 +186,7 @@
zfs_rename_007_pos_head()
{
atf_set "descr" "Rename dataset, verify that the data haven't changed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_007_pos_body()
{
@@ -212,7 +212,7 @@
zfs_rename_008_pos_head()
{
atf_set "descr" "zfs rename -r can rename snapshot recursively."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_008_pos_body()
{
@@ -238,7 +238,7 @@
zfs_rename_009_neg_head()
{
atf_set "descr" "zfs rename -r failed, when snapshot name is already existing."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_009_neg_body()
{
@@ -264,7 +264,7 @@
zfs_rename_010_neg_head()
{
atf_set "descr" "The recursive flag -r can only be used for snapshots."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_010_neg_body()
{
@@ -290,7 +290,7 @@
zfs_rename_011_pos_head()
{
atf_set "descr" "'zfs rename -p' should work as expected"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_011_pos_body()
{
@@ -316,7 +316,7 @@
zfs_rename_012_neg_head()
{
atf_set "descr" "'zfs rename' should fail with bad option, null target dataset andtoo long target dataset name."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_012_neg_body()
{
@@ -342,7 +342,7 @@
zfs_rename_013_pos_head()
{
atf_set "descr" "zfs rename -r can rename snapshot when child datasetsdon't have a snapshot of the given name."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_rename_013_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh
@@ -30,7 +30,7 @@
zfs_reservation_001_pos_head()
{
atf_set "descr" "Verify that a reservation > 2^64 -1 fails."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_reservation_001_pos_body()
{
@@ -54,7 +54,7 @@
zfs_reservation_002_pos_head()
{
atf_set "descr" "Ensure a reservation of 0 or 'none' is allowed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_reservation_002_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh
@@ -30,7 +30,7 @@
zfs_rollback_001_pos_head()
{
atf_set "descr" "'zfs rollback -r|-rf|-R|-Rf' will recursively destroy anysnapshots more recent than the one specified."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1800
}
zfs_rollback_001_pos_body()
@@ -57,7 +57,7 @@
zfs_rollback_002_pos_head()
{
atf_set "descr" "'zfs rollback -f' will force unmount any filesystems."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1800
}
zfs_rollback_002_pos_body()
@@ -84,7 +84,7 @@
zfs_rollback_003_neg_head()
{
atf_set "descr" "Separately verify 'zfs rollback ''|-f|-r|-rf will fail indifferent conditions."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1800
}
zfs_rollback_003_neg_body()
@@ -111,7 +111,7 @@
zfs_rollback_004_neg_head()
{
atf_set "descr" "'zfs rollback' should fail with bad options,too many arguments,non-snapshot datasets or missing datasets."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1800
}
zfs_rollback_004_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh
@@ -30,7 +30,7 @@
zfs_send_001_pos_head()
{
atf_set "descr" "Verify 'zfs send' can create valid send streams as expected."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_send_001_pos_body()
{
@@ -54,7 +54,7 @@
zfs_send_002_pos_head()
{
atf_set "descr" "Verify 'zfs send' generates valid streams with a property setup"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_send_002_pos_body()
{
@@ -78,7 +78,7 @@
zfs_send_003_pos_head()
{
atf_set "descr" "'zfs send -i' can deal with abbreviated snapshot name."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_send_003_pos_body()
{
@@ -102,7 +102,7 @@
zfs_send_004_neg_head()
{
atf_set "descr" "Verify that invalid parameters to 'zfs send' are caught."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_send_004_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh
@@ -56,7 +56,7 @@
cache_002_neg_head()
{
atf_set "descr" "Setting invalid {primary|secondary}cache on fs and volume,It should fail."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
cache_002_neg_body()
@@ -83,7 +83,7 @@
canmount_001_pos_head()
{
atf_set "descr" "Setting a valid property of canmount to file system, it must be successful."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
canmount_001_pos_body()
@@ -110,7 +110,7 @@
canmount_002_pos_head()
{
atf_set "descr" "Setting canmount=noauto to file system, it must be successful."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
canmount_002_pos_body()
@@ -141,7 +141,7 @@
canmount_003_pos_head()
{
atf_set "descr" "While canmount=noauto and the dataset is mounted, zfs must not attempt to unmount it"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
canmount_003_pos_body()
@@ -172,7 +172,7 @@
canmount_004_pos_head()
{
atf_set "descr" "Verify canmount=noauto work fine when setting sharenfs or sharesmb."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
canmount_004_pos_body()
@@ -251,7 +251,7 @@
mountpoint_001_pos_head()
{
atf_set "descr" "Setting a valid mountpoint to file system, it must be successful."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
mountpoint_001_pos_body()
@@ -278,7 +278,7 @@
mountpoint_002_pos_head()
{
atf_set "descr" "Setting a valid mountpoint for an unmounted file system,it remains unmounted."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
mountpoint_002_pos_body()
@@ -305,7 +305,7 @@
mountpoint_003_pos_head()
{
atf_set "descr" "With legacy mount, FSType-specific option works well."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
mountpoint_003_pos_body()
@@ -333,7 +333,7 @@
onoffs_001_pos_head()
{
atf_set "descr" "Setting a valid value to atime, readonly, setuid or zoned on filesystem or volume. It should be successful."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
onoffs_001_pos_body()
@@ -360,7 +360,7 @@
property_alias_001_pos_head()
{
atf_set "descr" "Properties with aliases also work with those aliases."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
property_alias_001_pos_body()
@@ -387,7 +387,7 @@
readonly_001_pos_head()
{
atf_set "descr" "Setting a valid readonly property on a dataset succeeds."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
readonly_001_pos_body()
@@ -414,7 +414,7 @@
reservation_001_neg_head()
{
atf_set "descr" "Verify invalid reservation values are rejected"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
reservation_001_neg_body()
@@ -441,7 +441,7 @@
ro_props_001_pos_head()
{
atf_set "descr" "Verify that read-only properties are immutable."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
ro_props_001_pos_body()
@@ -468,7 +468,7 @@
share_mount_001_neg_head()
{
atf_set "descr" "Verify that we cannot share or mount legacy filesystems."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
share_mount_001_neg_body()
@@ -495,7 +495,7 @@
snapdir_001_pos_head()
{
atf_set "descr" "Setting a valid snapdir property on a dataset succeeds."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
snapdir_001_pos_body()
@@ -522,7 +522,7 @@
user_property_001_pos_head()
{
atf_set "descr" "ZFS can set any valid user defined property to the non-readonlydataset."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
user_property_001_pos_body()
@@ -549,7 +549,7 @@
user_property_002_pos_head()
{
atf_set "descr" "User defined property inherited from its parent."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
user_property_002_pos_body()
@@ -576,7 +576,7 @@
user_property_003_neg_head()
{
atf_set "descr" "ZFS can handle invalid user property."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
user_property_003_neg_body()
@@ -603,7 +603,7 @@
user_property_004_pos_head()
{
atf_set "descr" "User property has no effect to snapshot until 'Snapshot properties' supported."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1200
}
user_property_004_pos_body()
@@ -630,7 +630,7 @@
version_001_neg_head()
{
atf_set "descr" "Verify invalid version values are rejected"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
version_001_neg_body()
@@ -683,7 +683,7 @@
zfs_set_002_neg_head()
{
atf_set "descr" "'zfs set' fails with invalid arguments"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
zfs_set_002_neg_body()
@@ -710,7 +710,7 @@
zfs_set_003_neg_head()
{
atf_set "descr" "'zfs set mountpoint/sharenfs' fails with invalid scenarios"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
zfs_set_003_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_test.sh
@@ -30,7 +30,7 @@
zfs_share_001_pos_head()
{
atf_set "descr" "Verify that 'zfs share' succeeds as root."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_001_pos_body()
{
@@ -53,7 +53,7 @@
zfs_share_002_pos_head()
{
atf_set "descr" "Verify that zfs share with a non-existent file system fails."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_002_pos_body()
{
@@ -76,7 +76,7 @@
zfs_share_003_pos_head()
{
atf_set "descr" "Verify that '$ZFS share' with a file systemwhose sharenfs property is 'off' \will fail with return code 1."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_003_pos_body()
{
@@ -99,7 +99,7 @@
zfs_share_004_pos_head()
{
atf_set "descr" "Verify that a file system and its snapshot are shared."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_004_pos_body()
{
@@ -122,7 +122,7 @@
zfs_share_005_pos_head()
{
atf_set "descr" "Verify that NFS share options are propagated correctly."
- atf_set "require.progs" zfs share svcs
+ atf_set "require.progs" "ksh93 zfs share svcs"
}
zfs_share_005_pos_body()
{
@@ -145,7 +145,7 @@
zfs_share_006_pos_head()
{
atf_set "descr" "Verify that a dataset could not be shared,but its sub-filesystems could be shared."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_006_pos_body()
{
@@ -168,7 +168,7 @@
zfs_share_007_neg_head()
{
atf_set "descr" "Verify that invalid share parameters and options are caught."
- atf_set "require.progs" zfs share svcs
+ atf_set "require.progs" "ksh93 zfs share svcs"
}
zfs_share_007_neg_body()
{
@@ -191,7 +191,7 @@
zfs_share_008_neg_head()
{
atf_set "descr" "Verify that sharing a dataset other than filesystem fails."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_008_neg_body()
{
@@ -214,7 +214,7 @@
zfs_share_009_neg_head()
{
atf_set "descr" "zfs share fails with shared filesystem"
- atf_set "require.progs" zfs share svcs
+ atf_set "require.progs" "ksh93 zfs share svcs"
}
zfs_share_009_neg_body()
{
@@ -237,7 +237,7 @@
zfs_share_009_pos_head()
{
atf_set "descr" "Verify umount/rollback/destroy fails does not unshare the sharedfile system"
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_009_pos_body()
{
@@ -260,7 +260,7 @@
zfs_share_010_neg_head()
{
atf_set "descr" "zfs share fails with bad parameters"
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_share_010_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_test.sh
@@ -30,7 +30,7 @@
zfs_snapshot_001_neg_head()
{
atf_set "descr" "Badly-formed 'zfs snapshot' with inapplicable scenariosshould return an error."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_snapshot_001_neg_body()
{
@@ -54,7 +54,7 @@
zfs_snapshot_002_neg_head()
{
atf_set "descr" "'zfs snapshot -r' fails with invalid arguments or scenarios."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_snapshot_002_neg_body()
{
@@ -78,7 +78,7 @@
zfs_snapshot_003_neg_head()
{
atf_set "descr" "'zfs snapshot' fails with bad options, or too many arguments."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_snapshot_003_neg_body()
{
@@ -102,7 +102,7 @@
zfs_snapshot_004_neg_head()
{
atf_set "descr" "Verify recursive snapshotting could not break ZFS."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_snapshot_004_neg_body()
{
@@ -126,7 +126,7 @@
zfs_snapshot_005_neg_head()
{
atf_set "descr" "Verify long name filesystem with snapshot should not break ZFS."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_snapshot_005_neg_body()
{
@@ -150,7 +150,7 @@
zfs_snapshot_006_pos_head()
{
atf_set "descr" "User property could be set upon snapshot via 'zfs snapshot -o'."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zfs_snapshot_006_pos_body()
{
@@ -174,7 +174,7 @@
zfs_snapshot_007_neg_head()
{
atf_set "descr" "'zfs snapshot -o' cannot set properties other than user property."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_snapshot_007_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh
@@ -30,7 +30,7 @@
zfs_unmount_001_pos_head()
{
atf_set "descr" "Verify the u[n]mount [-f] sub-command."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_001_pos_body()
{
@@ -56,7 +56,7 @@
zfs_unmount_002_pos_head()
{
atf_set "descr" "Verify that '$ZFS $unmountcmd [-f] <filesystem|mountpoint>'whose name is not in 'zfs list' will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_002_pos_body()
{
@@ -82,7 +82,7 @@
zfs_unmount_003_pos_head()
{
atf_set "descr" "Verify that '$ZFS $unmountcmd [-f] <filesystem|mountpoint>'whose mountpoint property is 'legacy' or 'none' \will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_003_pos_body()
{
@@ -108,7 +108,7 @@
zfs_unmount_004_pos_head()
{
atf_set "descr" "Verify that '$ZFS $unmountcmd [-f] <filesystem|mountpoint>'with an unmounted filesystem will fail with return code 1."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_004_pos_body()
{
@@ -134,7 +134,7 @@
zfs_unmount_005_pos_head()
{
atf_set "descr" "Verify that '$ZFS $unmountcmd <filesystem|mountpoint>'with a filesystem which mountpoint is currently in use \will fail with return code 1, and forcefully will succeeds as root."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_005_pos_body()
{
@@ -160,7 +160,7 @@
zfs_unmount_006_pos_head()
{
atf_set "descr" "Re-creating zfs files, 'zfs unmount' still succeed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_006_pos_body()
{
@@ -186,7 +186,7 @@
zfs_unmount_007_neg_head()
{
atf_set "descr" "Badly-formed 'zfs $unmountcmd' with inapplicable scenariosshould return an error."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_007_neg_body()
{
@@ -212,7 +212,7 @@
zfs_unmount_008_neg_head()
{
atf_set "descr" "zfs unmount fails with bad parameters or scenarios"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_008_neg_body()
{
@@ -238,7 +238,7 @@
zfs_unmount_009_pos_head()
{
atf_set "descr" "zfs fource unmount and destroy in snapshot directory will not cause error."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zfs_unmount_009_pos_body()
{
@@ -268,7 +268,7 @@
zfs_unmount_all_001_pos_head()
{
atf_set "descr" "Verify that 'zfs $unmountall' succeeds as root,and all available ZFS filesystems are unmounted."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_unmount_all_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_test.sh
@@ -30,7 +30,7 @@
zfs_unshare_001_pos_head()
{
atf_set "descr" "Verify that 'zfs unshare [-a] <filesystem|mountpoint>' succeeds as root."
- atf_set "require.progs" zfs unshare svcs
+ atf_set "require.progs" "ksh93 zfs unshare svcs"
}
zfs_unshare_001_pos_body()
{
@@ -53,7 +53,7 @@
zfs_unshare_002_pos_head()
{
atf_set "descr" "Verify that 'zfs unshare [-a]' is aware of legacy share."
- atf_set "require.progs" zfs unshare share svcs
+ atf_set "require.progs" "ksh93 zfs unshare share svcs"
}
zfs_unshare_002_pos_body()
{
@@ -76,7 +76,7 @@
zfs_unshare_003_pos_head()
{
atf_set "descr" "Verify that a file system and its dependent are unshared."
- atf_set "require.progs" zfs unshare svcs
+ atf_set "require.progs" "ksh93 zfs unshare svcs"
}
zfs_unshare_003_pos_body()
{
@@ -99,7 +99,7 @@
zfs_unshare_004_neg_head()
{
atf_set "descr" "Verify that '$ZFS unshare' issue error message with badly formed parameter."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_unshare_004_neg_body()
{
@@ -122,7 +122,7 @@
zfs_unshare_005_neg_head()
{
atf_set "descr" "Verify that unsharing a dataset other than filesystem fails."
- atf_set "require.progs" zfs svcs
+ atf_set "require.progs" "ksh93 zfs svcs"
}
zfs_unshare_005_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh
@@ -30,7 +30,7 @@
zfs_upgrade_001_pos_head()
{
atf_set "descr" "Executing 'zfs upgrade' command succeeds."
- atf_set "require.progs" zfs nawk
+ atf_set "require.progs" "ksh93 zfs nawk"
}
zfs_upgrade_001_pos_body()
{
@@ -56,7 +56,7 @@
zfs_upgrade_002_pos_head()
{
atf_set "descr" "Executing 'zfs upgrade -v' command succeeds."
- atf_set "require.progs" zfs nawk
+ atf_set "require.progs" "ksh93 zfs nawk"
}
zfs_upgrade_002_pos_body()
{
@@ -82,7 +82,7 @@
zfs_upgrade_003_pos_head()
{
atf_set "descr" "Executing 'zfs upgrade [-V version] filesystem' command succeeds."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_upgrade_003_pos_body()
{
@@ -108,7 +108,7 @@
zfs_upgrade_004_pos_head()
{
atf_set "descr" "Executing 'zfs upgrade -r [-V version] filesystem' command succeeds."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_upgrade_004_pos_body()
{
@@ -134,7 +134,7 @@
zfs_upgrade_005_pos_head()
{
atf_set "descr" "Executing 'zfs upgrade [-V version] -a' command succeeds."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_upgrade_005_pos_body()
{
@@ -164,7 +164,7 @@
zfs_upgrade_006_neg_head()
{
atf_set "descr" "Badly-formed 'zfs upgrade' should return an error."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_upgrade_006_neg_body()
{
@@ -190,7 +190,7 @@
zfs_upgrade_007_neg_head()
{
atf_set "descr" "Set invalid value or non-digit version should fail as expected."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zfs_upgrade_007_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh
@@ -30,7 +30,7 @@
zpool_001_neg_head()
{
atf_set "descr" "Execute zpool sub-command without proper parameters."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_001_neg_body()
{
@@ -54,7 +54,7 @@
zpool_002_pos_head()
{
atf_set "descr" "With ZFS_ABORT set, all zpool commands can abort and generate a core file."
- atf_set "require.progs" zpool coreadm
+ atf_set "require.progs" "ksh93 zpool coreadm"
}
zpool_002_pos_body()
{
@@ -78,7 +78,7 @@
zpool_003_pos_head()
{
atf_set "descr" "Debugging features of zpool should succeed."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_003_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
@@ -30,7 +30,7 @@
zpool_add_001_pos_head()
{
atf_set "descr" "'zpool add <pool> <vdev> ...' can add devices to the pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_add_001_pos_body()
@@ -57,7 +57,7 @@
zpool_add_002_pos_head()
{
atf_set "descr" "'zpool add -f <pool> <vdev> ...' can successfully add devices to the pool in some cases."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_add_002_pos_body()
@@ -84,7 +84,7 @@
zpool_add_003_pos_head()
{
atf_set "descr" "'zpool add -n <pool> <vdev> ...' can display the configuration without actually adding devices to the pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_add_003_pos_body()
@@ -111,7 +111,7 @@
zpool_add_004_pos_head()
{
atf_set "descr" "'zpool add <pool> <vdev> ...' can add zfs volume to the pool."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2400
}
zpool_add_004_pos_body()
@@ -139,7 +139,7 @@
zpool_add_005_pos_head()
{
atf_set "descr" "'zpool add' should fail with inapplicable scenarios."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_add_005_pos_body()
@@ -167,7 +167,7 @@
zpool_add_006_pos_head()
{
atf_set "descr" "'zpool add [-f]' can add large numbers of vdevs to the specified pool without any errors."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2400
}
zpool_add_006_pos_body()
@@ -194,7 +194,7 @@
zpool_add_007_neg_head()
{
atf_set "descr" "'zpool add' should return an error with badly-formed parameters."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_add_007_neg_body()
@@ -221,7 +221,7 @@
zpool_add_008_neg_head()
{
atf_set "descr" "'zpool add' should return an error with nonexistent pools and vdevs"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_add_008_neg_body()
@@ -248,7 +248,7 @@
zpool_add_009_neg_head()
{
atf_set "descr" "'zpool add' should fail if vdevs are the same or vdev iscontained in the given pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_add_009_neg_body()
@@ -277,7 +277,7 @@
zpool_add_010_pos_head()
{
atf_set "descr" "'zpool add' can add devices, even if a replacing vdev with a spare child is present"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_add_010_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh
@@ -30,7 +30,7 @@
zpool_attach_001_neg_head()
{
atf_set "descr" "Executing 'zpool attach' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_attach_001_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
@@ -30,7 +30,7 @@
zpool_clear_001_pos_head()
{
atf_set "descr" "Verify 'zpool clear' can clear errors of a storage pool."
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
atf_set "timeout" 2100
}
zpool_clear_001_pos_body()
@@ -53,7 +53,7 @@
zpool_clear_002_neg_head()
{
atf_set "descr" "Execute 'zpool clear' using invalid parameters."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2100
}
zpool_clear_002_neg_body()
@@ -76,7 +76,7 @@
zpool_clear_003_neg_head()
{
atf_set "descr" "Verify 'zpool clear' cannot clear error for available spare devices."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2100
}
zpool_clear_003_neg_body()
@@ -98,7 +98,7 @@
zpool_clear_004_pos_head()
{
atf_set "descr" "Verify 'zpool clear' can work on spare vdevs"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2100
}
zpool_clear_004_pos_body()
@@ -120,7 +120,7 @@
zpool_clear_005_pos_head()
{
atf_set "descr" "'zpool clear' can online an UNAVAIL pool after all vdevs have reappeared"
- atf_set "require.progs" gnop zpool
+ atf_set "require.progs" "ksh93 gnop zpool"
}
zpool_clear_005_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh
@@ -30,7 +30,7 @@
zpool_create_001_pos_head()
{
atf_set "descr" "'zpool create <pool> <vspec> ...' can successfully createa new pool with a name in ZFS namespace."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_001_pos_body()
@@ -57,7 +57,7 @@
zpool_create_002_pos_head()
{
atf_set "descr" "'zpool create -f <pool> <vspec> ...' can successfully createa new pool in some cases."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_002_pos_body()
@@ -84,7 +84,7 @@
zpool_create_003_pos_head()
{
atf_set "descr" "'zpool create -n <pool> <vspec> ...' can display the configureationwithout actually creating the pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_003_pos_body()
@@ -111,7 +111,7 @@
zpool_create_004_pos_head()
{
atf_set "descr" "'zpool create [-f]' can create a storage pool with large numbers of vdevswithout any errors."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2400
}
zpool_create_004_pos_body()
@@ -138,7 +138,7 @@
zpool_create_005_pos_head()
{
atf_set "descr" "'zpool create [-R root][-m mountpoint] <pool> <vdev> ...' can createan alternate pool or a new pool mounted at the specified mountpoint."
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
atf_set "timeout" 2400
}
zpool_create_005_pos_body()
@@ -165,7 +165,7 @@
zpool_create_006_pos_head()
{
atf_set "descr" "Verify 'zpool create' succeed with keywords combination."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_006_pos_body()
@@ -192,7 +192,7 @@
zpool_create_007_neg_head()
{
atf_set "descr" "'zpool create' should return an error with badly-formed parameters."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_007_neg_body()
@@ -219,7 +219,7 @@
zpool_create_008_pos_head()
{
atf_set "descr" "'zpool create' have to use '-f' scenarios"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_008_pos_body()
@@ -246,7 +246,7 @@
zpool_create_009_neg_head()
{
atf_set "descr" "Create a pool with same devices twice or create two pools withsame devices, 'zpool create' should fail."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_009_neg_body()
@@ -273,7 +273,7 @@
zpool_create_010_neg_head()
{
atf_set "descr" "'zpool create' should return an error with VDEVs <64mb"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2400
}
zpool_create_010_neg_body()
@@ -300,7 +300,7 @@
zpool_create_011_neg_head()
{
atf_set "descr" "'zpool create' should be failed with inapplicable scenarios."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_011_neg_body()
@@ -328,7 +328,7 @@
zpool_create_012_neg_head()
{
atf_set "descr" "'zpool create' should fail with disk slice in swap."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_create_012_neg_body()
{
@@ -345,7 +345,7 @@
zpool_create_015_neg_head()
{
atf_set "descr" "'zpool create' should fail with zfs vol device in swap."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_create_015_neg_body()
{
@@ -371,7 +371,7 @@
zpool_create_017_neg_head()
{
atf_set "descr" "'zpool create' should fail with mountpoint exists and not empty."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_017_neg_body()
@@ -400,7 +400,7 @@
zpool_create_018_pos_head()
{
atf_set "descr" "zpool create can create pools with specified properties"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_018_pos_body()
@@ -427,7 +427,7 @@
zpool_create_019_pos_head()
{
atf_set "descr" "zpool create cannot create pools specifying readonly properties"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_019_pos_body()
@@ -454,7 +454,7 @@
zpool_create_020_pos_head()
{
atf_set "descr" "zpool create -R works as expected"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2400
}
zpool_create_020_pos_body()
@@ -481,7 +481,7 @@
zpool_create_021_pos_head()
{
atf_set "descr" "'zpool create -O property=value pool' can successfully create a poolwith correct filesystem property set."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_021_pos_body()
@@ -508,7 +508,7 @@
zpool_create_022_pos_head()
{
atf_set "descr" "'zpool create -O property=value pool' can successfully create a poolwith multiple filesystem properties set."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_022_pos_body()
@@ -535,7 +535,7 @@
zpool_create_023_neg_head()
{
atf_set "descr" "'zpool create -O' should return an error with badly formed parameters."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 2400
}
zpool_create_023_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh
@@ -30,7 +30,7 @@
zpool_destroy_001_pos_head()
{
atf_set "descr" "'zpool destroy <pool>' can destroy a specified pool."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_destroy_001_pos_body()
{
@@ -54,7 +54,7 @@
zpool_destroy_002_pos_head()
{
atf_set "descr" "'zpool destroy -f <pool>' can forcely destroy the specified pool"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_destroy_002_pos_body()
{
@@ -77,7 +77,7 @@
zpool_destroy_003_neg_head()
{
atf_set "descr" "'zpool destroy' should return an error with badly-formed parameters."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_destroy_003_neg_body()
{
@@ -99,7 +99,7 @@
zpool_destroy_004_pos_head()
{
atf_set "descr" "'zpool destroy -f' should work on active pools."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2000
}
zpool_destroy_004_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh
@@ -30,7 +30,7 @@
zpool_detach_001_neg_head()
{
atf_set "descr" "Executing 'zpool detach' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_detach_001_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh
@@ -30,7 +30,7 @@
zpool_expand_001_pos_head()
{
atf_set "descr" "zpool can be autoexpanded after set autoexpand=on on LUN expansion"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_expand_001_pos_body()
{
@@ -55,7 +55,7 @@
zpool_expand_002_pos_head()
{
atf_set "descr" "zpool can expand after zpool online -e zvol vdevs on LUN expansion"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_expand_002_pos_body()
{
@@ -80,7 +80,7 @@
zpool_expand_003_neg_head()
{
atf_set "descr" "zpool can not expand if set autoexpand=off after LUN expansion"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_expand_003_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh
@@ -30,7 +30,7 @@
zpool_export_001_pos_head()
{
atf_set "descr" "Verify a pool can be exported."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_export_001_pos_body()
{
@@ -54,7 +54,7 @@
zpool_export_002_pos_head()
{
atf_set "descr" "Verify a busy ZPOOL cannot be exported."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_export_002_pos_body()
{
@@ -78,7 +78,7 @@
zpool_export_003_neg_head()
{
atf_set "descr" "'zpool export' should return an error with badly-formed parameters."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_export_003_neg_body()
{
@@ -102,7 +102,7 @@
zpool_export_004_pos_head()
{
atf_set "descr" "Verify zpool export succeed or fail with spare."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_export_004_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh
@@ -30,7 +30,7 @@
zpool_get_001_pos_head()
{
atf_set "descr" "Zpool get usage message is displayed when called with no arguments."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_get_001_pos_body()
{
@@ -52,7 +52,7 @@
zpool_get_002_pos_head()
{
atf_set "descr" "Zpool get all works as expected"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_get_002_pos_body()
{
@@ -76,7 +76,7 @@
zpool_get_003_pos_head()
{
atf_set "descr" "Zpool get returns values for all known properties"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_get_003_pos_body()
{
@@ -100,7 +100,7 @@
zpool_get_004_neg_head()
{
atf_set "descr" "Malformed zpool get commands are rejected"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_get_004_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh
@@ -30,7 +30,7 @@
zpool_history_001_neg_head()
{
atf_set "descr" "Verify 'zpool history' can deal with non-existent pools andgarbage to the command."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_history_001_neg_body()
{
@@ -54,7 +54,7 @@
zpool_history_002_pos_head()
{
atf_set "descr" "Verify zpool history can handle options [-il] correctly."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_history_002_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh
@@ -30,7 +30,7 @@
zpool_import_002_pos_head()
{
atf_set "descr" "Verify that an exported pool can be imported and cannot be imported more than once."
- atf_set "require.progs" zfs zpool sum zdb
+ atf_set "require.progs" "ksh93 zfs zpool sum zdb"
atf_set "timeout" 2400
}
zpool_import_002_pos_body()
@@ -55,7 +55,7 @@
zpool_import_003_pos_head()
{
atf_set "descr" "Destroyed pools are not listed unless with -D option is specified."
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
atf_set "timeout" 2400
}
zpool_import_003_pos_body()
@@ -80,7 +80,7 @@
zpool_import_004_pos_head()
{
atf_set "descr" "Destroyed pools devices was moved to another directory,it still can be imported correctly."
- atf_set "require.progs" zpool zfs zdb
+ atf_set "require.progs" "ksh93 zpool zfs zdb"
atf_set "timeout" 2400
}
zpool_import_004_pos_body()
@@ -105,7 +105,7 @@
zpool_import_005_pos_head()
{
atf_set "descr" "Destroyed pools devices was renamed, it still can be importedcorrectly."
- atf_set "require.progs" zpool zfs zdb
+ atf_set "require.progs" "ksh93 zpool zfs zdb"
atf_set "timeout" 2400
}
zpool_import_005_pos_body()
@@ -130,7 +130,7 @@
zpool_import_006_pos_head()
{
atf_set "descr" "For mirror, N-1 destroyed pools devices was removed or usedby other pool, it still can be imported correctly."
- atf_set "require.progs" zpool zfs zdb
+ atf_set "require.progs" "ksh93 zpool zfs zdb"
atf_set "timeout" 2400
}
zpool_import_006_pos_body()
@@ -155,7 +155,7 @@
zpool_import_007_pos_head()
{
atf_set "descr" "For raidz, one destroyed pools devices was removed or used byother pool, it still can be imported correctly."
- atf_set "require.progs" zpool zfs zdb
+ atf_set "require.progs" "ksh93 zpool zfs zdb"
atf_set "timeout" 2400
}
zpool_import_007_pos_body()
@@ -180,7 +180,7 @@
zpool_import_008_pos_head()
{
atf_set "descr" "For raidz2, two destroyed pools devices was removed or used byother pool, it still can be imported correctly."
- atf_set "require.progs" zpool zfs zdb
+ atf_set "require.progs" "ksh93 zpool zfs zdb"
atf_set "timeout" 2400
}
zpool_import_008_pos_body()
@@ -205,7 +205,7 @@
zpool_import_009_neg_head()
{
atf_set "descr" "Badly-formed 'zpool import' with inapplicable scenariosshould return an error."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2400
}
zpool_import_009_neg_body()
@@ -230,7 +230,7 @@
zpool_import_010_pos_head()
{
atf_set "descr" "'zpool -D -a' can import all the specified directoriesdestroyed pools."
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
atf_set "timeout" 2400
}
zpool_import_010_pos_body()
@@ -255,7 +255,7 @@
zpool_import_011_neg_head()
{
atf_set "descr" "For strip pool, any destroyed pool devices was demaged,zpool import -D will failed."
- atf_set "require.progs" zpool zfs zdb
+ atf_set "require.progs" "ksh93 zpool zfs zdb"
atf_set "timeout" 2400
}
zpool_import_011_neg_body()
@@ -280,7 +280,7 @@
zpool_import_012_pos_head()
{
atf_set "descr" "Verify all mount & share status of sub-filesystems within a poolcan be restored after import [-Df]."
- atf_set "require.progs" zfs zpool zdb share
+ atf_set "require.progs" "ksh93 zfs zpool zdb share"
atf_set "timeout" 2400
}
zpool_import_012_pos_body()
@@ -305,7 +305,7 @@
zpool_import_013_neg_head()
{
atf_set "descr" "'zpool import' fails for pool that was not cleanly exported"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_import_013_neg_body()
{
@@ -320,7 +320,7 @@
zpool_import_014_pos_head()
{
atf_set "descr" "'zpool import' can import destroyed disk-backed pools"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
zpool_import_014_pos_body()
{
@@ -343,7 +343,7 @@
zpool_import_all_001_pos_head()
{
atf_set "descr" "Verify that 'zpool import -a' succeeds as root."
- atf_set "require.progs" zfs zpool sum
+ atf_set "require.progs" "ksh93 zfs zpool sum"
atf_set "timeout" 2400
}
zpool_import_all_001_pos_body()
@@ -369,7 +369,7 @@
zpool_import_missing_001_pos_head()
{
atf_set "descr" "Verify that import could handle damaged or missing device."
- atf_set "require.progs" zfs sum zpool zdb
+ atf_set "require.progs" "ksh93 zfs sum zpool zdb"
atf_set "timeout" 2400
}
zpool_import_missing_001_pos_body()
@@ -394,7 +394,7 @@
zpool_import_missing_002_pos_head()
{
atf_set "descr" "Verify that import could handle moving device."
- atf_set "require.progs" zpool zfs zdb
+ atf_set "require.progs" "ksh93 zpool zfs zdb"
atf_set "timeout" 2400
}
zpool_import_missing_002_pos_body()
@@ -419,7 +419,7 @@
zpool_import_missing_003_pos_head()
{
atf_set "descr" "Verify that import could handle device overlapped."
- atf_set "require.progs" zpool sum zfs
+ atf_set "require.progs" "ksh93 zpool sum zfs"
atf_set "timeout" 2400
}
zpool_import_missing_003_pos_body()
@@ -443,7 +443,7 @@
zpool_import_missing_004_pos_head()
{
atf_set "descr" "Verify that zpool import succeeds when devices are missing"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 300
}
zpool_import_missing_004_pos_body()
@@ -458,7 +458,7 @@
zpool_import_missing_005_pos_head()
{
atf_set "descr" "Verify that zpool import succeeds when devices of all types have been renamed"
- atf_set "require.progs" mdconfig zfs zpool
+ atf_set "require.progs" "ksh93 mdconfig zfs zpool"
atf_set "timeout" 300
}
zpool_import_missing_005_pos_body()
@@ -474,7 +474,7 @@
zpool_import_rename_001_pos_head()
{
atf_set "descr" "Verify that an imported pool can be renamed."
- atf_set "require.progs" zfs zpool sum zdb
+ atf_set "require.progs" "ksh93 zfs zpool sum zdb"
atf_set "timeout" 2400
}
zpool_import_rename_001_pos_body()
@@ -498,7 +498,7 @@
zpool_import_corrupt_001_pos_head()
{
atf_set "descr" "Verify that a disk-backed exported pool with some of its vdev labels corrupted can still be imported"
- atf_set "require.progs" zfs zpool zdb
+ atf_set "require.progs" "ksh93 zfs zpool zdb"
atf_set "timeout" 2400
}
zpool_import_corrupt_001_pos_body()
@@ -521,7 +521,7 @@
zpool_import_destroyed_001_neg_head()
{
atf_set "descr" "'zpool import' will not show destroyed pools, even if an out-of-date non-destroyed label remains"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_import_destroyed_001_neg_body()
{
@@ -542,7 +542,7 @@
zpool_import_destroyed_002_neg_head()
{
atf_set "descr" "'zpool import' will not show destroyed pools, even if an out-of-date non-destroyed label remains"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_import_destroyed_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh
@@ -30,7 +30,7 @@
zpool_offline_001_pos_head()
{
atf_set "descr" "Executing 'zpool offline' with correct options succeeds"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_offline_001_pos_body()
{
@@ -54,7 +54,7 @@
zpool_offline_002_neg_head()
{
atf_set "descr" "Executing 'zpool offline' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_offline_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh
@@ -30,7 +30,7 @@
zpool_online_001_pos_head()
{
atf_set "descr" "Executing 'zpool online' with correct options succeeds"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_online_001_pos_body()
{
@@ -54,7 +54,7 @@
zpool_online_002_neg_head()
{
atf_set "descr" "Executing 'zpool online' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_online_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh
@@ -30,7 +30,7 @@
zpool_remove_001_neg_head()
{
atf_set "descr" "Check zpool remove <pool> <device> can not removeactive device from pool"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_remove_001_neg_body()
{
@@ -54,7 +54,7 @@
zpool_remove_002_pos_head()
{
atf_set "descr" "zpool remove can only remove inactive hotspare device from pool"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_remove_002_pos_body()
{
@@ -78,7 +78,7 @@
zpool_remove_003_pos_head()
{
atf_set "descr" "zpool remove can remove hotspare device which state go though active to inactive in pool"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_remove_003_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh
@@ -30,7 +30,7 @@
zpool_replace_001_neg_head()
{
atf_set "descr" "Executing 'zpool replace' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_replace_001_neg_body()
{
@@ -53,7 +53,7 @@
zpool_replace_002_neg_head()
{
atf_set "descr" "'zpool replace' should fail if the new device is too small"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_replace_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh
@@ -30,7 +30,7 @@
zpool_scrub_001_neg_head()
{
atf_set "descr" "Execute 'zpool scrub' using invalid parameters."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_scrub_001_neg_body()
{
@@ -54,7 +54,7 @@
zpool_scrub_002_pos_head()
{
atf_set "descr" "Verify scrub -s works correctly."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_scrub_002_pos_body()
{
@@ -78,7 +78,7 @@
zpool_scrub_003_pos_head()
{
atf_set "descr" "scrub command terminates the existing scrub process and starts a new scrub."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_scrub_003_pos_body()
{
@@ -102,7 +102,7 @@
zpool_scrub_004_pos_head()
{
atf_set "descr" "Resilver prevent scrub from starting until the resilver completes"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_scrub_004_pos_body()
{
@@ -126,7 +126,7 @@
zpool_scrub_005_pos_head()
{
atf_set "descr" "When scrubbing, detach device should not break system."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_scrub_005_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh
@@ -30,7 +30,7 @@
zpool_set_001_pos_head()
{
atf_set "descr" "zpool set usage message is displayed when called with no arguments"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_set_001_pos_body()
{
@@ -44,7 +44,7 @@
zpool_set_002_neg_head()
{
atf_set "descr" "Malformed zpool set commands are rejected"
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
}
zpool_set_002_neg_body()
{
@@ -58,7 +58,7 @@
zpool_set_003_neg_head()
{
atf_set "descr" "zpool set cannot set a readonly property"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_set_003_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_test.sh
@@ -30,7 +30,7 @@
zpool_status_001_pos_head()
{
atf_set "descr" "Executing 'zpool status' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_status_001_pos_body()
{
@@ -54,7 +54,7 @@
zpool_status_002_pos_head()
{
atf_set "descr" "Executing 'zpool status' with correct options succeeds"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
zpool_status_002_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
@@ -30,7 +30,7 @@
zpool_upgrade_001_pos_head()
{
atf_set "descr" "Executing 'zpool upgrade -v' command succeeds."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_001_pos_body()
@@ -57,7 +57,7 @@
zpool_upgrade_002_pos_head()
{
atf_set "descr" "Import pools of all versions - zpool upgrade on each pools works"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_002_pos_body()
@@ -84,7 +84,7 @@
zpool_upgrade_003_pos_head()
{
atf_set "descr" "Upgrading a pool that has already been upgraded succeeds."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_003_pos_body()
@@ -111,7 +111,7 @@
zpool_upgrade_004_pos_head()
{
atf_set "descr" "zpool upgrade -a works"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_004_pos_body()
@@ -142,7 +142,7 @@
zpool_upgrade_005_neg_head()
{
atf_set "descr" "Variations of upgrade -v print usage message,return with non-zero status"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_005_neg_body()
@@ -169,7 +169,7 @@
zpool_upgrade_006_neg_head()
{
atf_set "descr" "Attempting to upgrade a non-existent pool will return an error"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_006_neg_body()
@@ -196,7 +196,7 @@
zpool_upgrade_007_pos_head()
{
atf_set "descr" "Import pools of all versions - 'zfs upgrade' on each pools works"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
# This test can take quite a while, especially on debug builds
atf_set "timeout" 7200
}
@@ -224,7 +224,7 @@
zpool_upgrade_008_pos_head()
{
atf_set "descr" "Zpool upgrade should be able to upgrade pools to a given version using -V"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_008_pos_body()
@@ -251,7 +251,7 @@
zpool_upgrade_009_neg_head()
{
atf_set "descr" "Zpool upgrade -V shouldn't be able to upgrade a pool to an unknown version"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
zpool_upgrade_009_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh b/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
@@ -30,7 +30,7 @@
zdb_001_neg_head()
{
atf_set "descr" "zdb can't run as a user on datasets, but can run without arguments"
- atf_set "require.progs" zfs fgrep zpool zdb
+ atf_set "require.progs" "ksh93 zfs fgrep zpool zdb"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -56,7 +56,7 @@
zfs_001_neg_head()
{
atf_set "descr" "zfs shows a usage message when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -82,7 +82,7 @@
zfs_allow_001_neg_head()
{
atf_set "descr" "zfs allow returns an error when run as a user"
- atf_set "require.progs" zfs fgrep logname zpool
+ atf_set "require.progs" "ksh93 zfs fgrep logname zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -108,7 +108,7 @@
zfs_clone_001_neg_head()
{
atf_set "descr" "zfs clone returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -134,7 +134,7 @@
zfs_create_001_neg_head()
{
atf_set "descr" "Verify zfs create without parameters fails."
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -160,7 +160,7 @@
zfs_destroy_001_neg_head()
{
atf_set "descr" "zfs destroy [-f|-r] [fs|snap]"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -186,7 +186,7 @@
zfs_get_001_neg_head()
{
atf_set "descr" "zfs get works when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -212,7 +212,7 @@
zfs_inherit_001_neg_head()
{
atf_set "descr" "zfs inherit returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -238,7 +238,7 @@
zfs_mount_001_neg_head()
{
atf_set "descr" "zfs mount returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -264,7 +264,7 @@
zfs_promote_001_neg_head()
{
atf_set "descr" "zfs promote returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -290,7 +290,7 @@
zfs_receive_001_neg_head()
{
atf_set "descr" "zfs receive returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -316,7 +316,7 @@
zfs_rename_001_neg_head()
{
atf_set "descr" "zfs rename returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -342,7 +342,7 @@
zfs_rollback_001_neg_head()
{
atf_set "descr" "zfs rollback returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -368,7 +368,7 @@
zfs_send_001_neg_head()
{
atf_set "descr" "zfs send returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -394,7 +394,7 @@
zfs_set_001_neg_head()
{
atf_set "descr" "zfs set returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -420,7 +420,7 @@
zfs_share_001_neg_head()
{
atf_set "descr" "zfs share returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -446,7 +446,7 @@
zfs_snapshot_001_neg_head()
{
atf_set "descr" "zfs snapshot returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -472,7 +472,7 @@
zfs_unallow_001_neg_head()
{
atf_set "descr" "zfs unallow returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -498,7 +498,7 @@
zfs_unmount_001_neg_head()
{
atf_set "descr" "zfs u[n]mount [-f] [mountpoint|fs|snap]"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -524,7 +524,7 @@
zfs_unshare_001_neg_head()
{
atf_set "descr" "zfs unshare returns an error when run as a user"
- atf_set "require.progs" zfs fgrep share zpool
+ atf_set "require.progs" "ksh93 zfs fgrep share zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -550,7 +550,7 @@
zfs_upgrade_001_neg_head()
{
atf_set "descr" "zfs upgrade returns an error when run as a user"
- atf_set "require.progs" zfs fgrep zpool
+ atf_set "require.progs" "ksh93 zfs fgrep zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -576,7 +576,7 @@
zpool_001_neg_head()
{
atf_set "descr" "zpool shows a usage message when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -602,7 +602,7 @@
zpool_add_001_neg_head()
{
atf_set "descr" "zpool add [-fn] pool_name vdev"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -628,7 +628,7 @@
zpool_add_002_pos_head()
{
atf_set "descr" "zpool add [-f] -n succeeds for unpriveleged users"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -654,7 +654,7 @@
zpool_attach_001_neg_head()
{
atf_set "descr" "zpool attach returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -680,7 +680,7 @@
zpool_clear_001_neg_head()
{
atf_set "descr" "zpool clear returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -706,7 +706,7 @@
zpool_create_001_neg_head()
{
atf_set "descr" "zpool create [-f] fails for unpriveleged users"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "require.user" unprivileged
}
zpool_create_001_neg_body()
@@ -723,7 +723,7 @@
zpool_create_002_pos_head()
{
atf_set "descr" "zpool create [-f] -n succeeds for unpriveleged users"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "require.user" unprivileged
}
zpool_create_002_pos_body()
@@ -739,7 +739,7 @@
zpool_destroy_001_neg_head()
{
atf_set "descr" "zpool destroy [-f] [pool_name ...]"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -765,7 +765,7 @@
zpool_detach_001_neg_head()
{
atf_set "descr" "zpool detach returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -791,7 +791,7 @@
zpool_export_001_neg_head()
{
atf_set "descr" "zpool export returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -817,7 +817,7 @@
zpool_get_001_neg_head()
{
atf_set "descr" "zpool get works when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -843,7 +843,7 @@
zpool_history_001_neg_head()
{
atf_set "descr" "zpool history returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -869,7 +869,7 @@
zpool_import_001_neg_head()
{
atf_set "descr" "zpool import returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -895,7 +895,7 @@
zpool_import_002_neg_head()
{
atf_set "descr" "Executing 'zpool import' by regular user fails"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -921,7 +921,7 @@
zpool_offline_001_neg_head()
{
atf_set "descr" "zpool offline returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -947,7 +947,7 @@
zpool_online_001_neg_head()
{
atf_set "descr" "zpool online returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -973,7 +973,7 @@
zpool_remove_001_neg_head()
{
atf_set "descr" "zpool remove returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -999,7 +999,7 @@
zpool_replace_001_neg_head()
{
atf_set "descr" "zpool replace returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -1025,7 +1025,7 @@
zpool_scrub_001_neg_head()
{
atf_set "descr" "zpool scrub returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -1051,7 +1051,7 @@
zpool_set_001_neg_head()
{
atf_set "descr" "zpool set returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -1077,7 +1077,7 @@
zpool_status_001_neg_head()
{
atf_set "descr" "zpool status works when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -1103,7 +1103,7 @@
zpool_upgrade_001_neg_head()
{
atf_set "descr" "zpool upgrade returns an error when run as a user"
- atf_set "require.progs" zfs zpool fgrep
+ atf_set "require.progs" "ksh93 zfs zpool fgrep"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
diff --git a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh
@@ -30,7 +30,7 @@
zfs_list_001_pos_head()
{
atf_set "descr" "Verify 'zfs list [-rH] [-o property[,prop]*] [fs|clct|vol]'."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
@@ -58,7 +58,7 @@
zfs_list_002_pos_head()
{
atf_set "descr" "The sort functionality in 'zfs list' works as expected."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
@@ -86,7 +86,7 @@
zfs_list_003_pos_head()
{
atf_set "descr" "Verify 'zfs list -r' could display any children recursively."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
@@ -114,7 +114,7 @@
zfs_list_004_neg_head()
{
atf_set "descr" "Verify 'zfs list [-r]' should fail while the givendataset/path does not exist or not belong to zfs."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
@@ -142,7 +142,7 @@
zfs_list_005_pos_head()
{
atf_set "descr" "Verify 'zfs list' evaluate multiple '-s' optionsfrom left to right in decreasing order of importance."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
@@ -171,7 +171,7 @@
zfs_list_006_pos_head()
{
atf_set "descr" "Verify 'zfs list' exclude list of snapshot."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
@@ -199,7 +199,7 @@
zfs_list_007_pos_head()
{
atf_set "descr" "'zfs list -d <n>' should get expected output."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
@@ -227,7 +227,7 @@
zfs_list_008_neg_head()
{
atf_set "descr" "A negative depth or a non numeric depth should fail in 'zfs list -d <n>'"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "require.user" root
atf_set "require.config" "unprivileged_user"
}
diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh
@@ -30,7 +30,7 @@
zpool_iostat_001_neg_head()
{
atf_set "descr" "zpool iostat [pool_name ...] [interval]"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -56,7 +56,7 @@
zpool_iostat_002_pos_head()
{
atf_set "descr" "zpool iostat [pool_name ...] [interval] [count]"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -82,7 +82,7 @@
zpool_iostat_003_neg_head()
{
atf_set "descr" "Executing 'zpool iostat' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "require.user" unprivileged
}
zpool_iostat_003_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh
--- a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh
@@ -30,7 +30,7 @@
zpool_list_001_pos_head()
{
atf_set "descr" "zpool list [-H] [-o filed[,filed]*] [<pool_name> ...]"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "require.user" root
atf_set "require.config" unprivileged_user
}
@@ -56,7 +56,7 @@
zpool_list_002_neg_head()
{
atf_set "descr" "Executing 'zpool list' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "require.user" unprivileged
}
zpool_list_002_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/compression/compression_test.sh b/tests/sys/cddl/zfs/tests/compression/compression_test.sh
--- a/tests/sys/cddl/zfs/tests/compression/compression_test.sh
+++ b/tests/sys/cddl/zfs/tests/compression/compression_test.sh
@@ -30,7 +30,7 @@
compress_001_pos_head()
{
atf_set "descr" "Ensure that compressed files are smaller."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
compress_001_pos_body()
{
@@ -54,7 +54,7 @@
compress_003_pos_head()
{
atf_set "descr" "Changing blocksize doesn't casue system panic with compression settings"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
compress_003_pos_body()
{
@@ -78,7 +78,7 @@
compress_004_pos_head()
{
atf_set "descr" "Creating non-power-of-2 blocksize file and freeing the filestorage space at will should work normally with compression setting"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
compress_004_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh b/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh
--- a/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh
+++ b/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh
@@ -30,7 +30,7 @@
ctime_001_pos_head()
{
atf_set "descr" "A file's ctime should change when the file is modified"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
ctime_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh b/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh
--- a/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh
+++ b/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh
@@ -30,7 +30,7 @@
zfs_allow_001_pos_head()
{
atf_set "descr" "everyone' is interpreted as a keyword even if a useror group named 'everyone' exists."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_001_pos_body()
{
@@ -56,7 +56,7 @@
zfs_allow_002_pos_head()
{
atf_set "descr" "<user|group> is interpreted as user if possible, then as group."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_002_pos_body()
{
@@ -82,7 +82,7 @@
zfs_allow_003_pos_head()
{
atf_set "descr" "Verify option '-l' only allow permission to the dataset itself."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_003_pos_body()
{
@@ -108,7 +108,7 @@
zfs_allow_004_pos_head()
{
atf_set "descr" "Verify option '-d' allow permission to the descendent datasets."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_004_pos_body()
{
@@ -134,7 +134,7 @@
zfs_allow_005_pos_head()
{
atf_set "descr" "Verify option '-c' will be granted locally to the creator."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_005_pos_body()
{
@@ -160,7 +160,7 @@
zfs_allow_006_pos_head()
{
atf_set "descr" "Changing permissions in a set will change what is allowedwherever the set is used."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_006_pos_body()
{
@@ -186,7 +186,7 @@
zfs_allow_007_pos_head()
{
atf_set "descr" "Verify permission set can be masked on descendent dataset."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_007_pos_body()
{
@@ -212,7 +212,7 @@
zfs_allow_008_pos_head()
{
atf_set "descr" "Verify non-root user can allow permissions."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_008_pos_body()
{
@@ -238,7 +238,7 @@
zfs_allow_009_neg_head()
{
atf_set "descr" "Verify invalid arguments are handled correctly."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_009_neg_body()
{
@@ -264,7 +264,7 @@
zfs_allow_010_pos_head()
{
atf_set "descr" "Verify privileged user has correct permissions once which was delegated to him in datasets"
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_010_pos_body()
{
@@ -290,7 +290,7 @@
zfs_allow_011_neg_head()
{
atf_set "descr" "Verify zpool subcmds and system readonly properties can't be delegated."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_011_neg_body()
{
@@ -316,7 +316,7 @@
zfs_allow_012_neg_head()
{
atf_set "descr" "Verify privileged user can not use permissions properly when delegation property is set off"
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_allow_012_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh b/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh
--- a/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh
+++ b/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh
@@ -30,7 +30,7 @@
zfs_unallow_001_pos_head()
{
atf_set "descr" "Verify '-l' only removed the local permissions."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_001_pos_body()
{
@@ -56,7 +56,7 @@
zfs_unallow_002_pos_head()
{
atf_set "descr" "Verify '-d' only removed the descendent permissions."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_002_pos_body()
{
@@ -82,7 +82,7 @@
zfs_unallow_003_pos_head()
{
atf_set "descr" "Verify options '-r' and '-l'+'-d' will unallow permission tothis dataset and the descendent datasets."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_003_pos_body()
{
@@ -108,7 +108,7 @@
zfs_unallow_004_pos_head()
{
atf_set "descr" "Verify '-s' will remove permissions from the named set."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_004_pos_body()
{
@@ -134,7 +134,7 @@
zfs_unallow_005_pos_head()
{
atf_set "descr" "Verify option '-c' will remove the created permission set."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_005_pos_body()
{
@@ -160,7 +160,7 @@
zfs_unallow_006_pos_head()
{
atf_set "descr" "Verify option '-u', '-g' and '-e' only removed the specified typepermissions set."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_006_pos_body()
{
@@ -186,7 +186,7 @@
zfs_unallow_007_neg_head()
{
atf_set "descr" "zfs unallow won't remove those permissions which inherited fromits parent dataset."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_007_neg_body()
{
@@ -212,7 +212,7 @@
zfs_unallow_008_neg_head()
{
atf_set "descr" "zfs unallow can handle invalid arguments."
- atf_set "require.progs" zfs sudo
+ atf_set "require.progs" "ksh93 zfs sudo"
}
zfs_unallow_008_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/devices/devices_test.sh b/tests/sys/cddl/zfs/tests/devices/devices_test.sh
--- a/tests/sys/cddl/zfs/tests/devices/devices_test.sh
+++ b/tests/sys/cddl/zfs/tests/devices/devices_test.sh
@@ -30,7 +30,7 @@
devices_001_pos_head()
{
atf_set "descr" "Setting devices=on on file system, the devices files in this filesystem can be used."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
devices_001_pos_body()
{
@@ -57,7 +57,7 @@
devices_002_neg_head()
{
atf_set "descr" "Setting devices=off on file system, the devices files in this filesystem can not be used."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
devices_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/exec/exec_test.sh b/tests/sys/cddl/zfs/tests/exec/exec_test.sh
--- a/tests/sys/cddl/zfs/tests/exec/exec_test.sh
+++ b/tests/sys/cddl/zfs/tests/exec/exec_test.sh
@@ -30,7 +30,7 @@
exec_001_pos_head()
{
atf_set "descr" "Setting exec=on on a filesystem, processes can be executed fromthis file system."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
exec_001_pos_body()
{
@@ -53,7 +53,7 @@
exec_002_neg_head()
{
atf_set "descr" "Setting exec=off on a filesystem, processes can not be executedfrom this file system."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
exec_002_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh b/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh
--- a/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh
+++ b/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh
@@ -30,7 +30,7 @@
grow_pool_001_pos_head()
{
atf_set "descr" "A zpool may be increased in capacity by adding a disk"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
grow_pool_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh b/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh
--- a/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh
+++ b/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh
@@ -30,7 +30,7 @@
grow_replicas_001_pos_head()
{
atf_set "descr" "A zpool mirror/raidz may be increased in capacity by adding a disk."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
grow_replicas_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/history/history_test.sh b/tests/sys/cddl/zfs/tests/history/history_test.sh
--- a/tests/sys/cddl/zfs/tests/history/history_test.sh
+++ b/tests/sys/cddl/zfs/tests/history/history_test.sh
@@ -30,7 +30,7 @@
history_001_pos_head()
{
atf_set "descr" "Verify zpool sub-commands which modify state are logged."
- atf_set "require.progs" zpool nawk
+ atf_set "require.progs" "ksh93 zpool nawk"
atf_set "timeout" 1800
}
history_001_pos_body()
@@ -46,7 +46,7 @@
history_002_pos_head()
{
atf_set "descr" "Verify zfs sub-commands which modify state are logged."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
history_002_pos_body()
@@ -73,7 +73,7 @@
history_003_pos_head()
{
atf_set "descr" "zpool history limitation test."
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
atf_set "timeout" 1800
}
history_003_pos_body()
@@ -100,7 +100,7 @@
history_004_pos_head()
{
atf_set "descr" "'zpool history' can copes with many simultaneous command."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
history_004_pos_body()
@@ -127,7 +127,7 @@
history_005_neg_head()
{
atf_set "descr" "Verify 'zpool list|status|iostat' will not be logged."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
history_005_neg_body()
@@ -154,7 +154,7 @@
history_006_neg_head()
{
atf_set "descr" "Verify 'zfs list|get|mount|unmount|share|unshare|send' will notbe logged."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
history_006_neg_body()
@@ -181,7 +181,7 @@
history_007_pos_head()
{
atf_set "descr" "Verify command history moves with pool while migrating."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
history_007_pos_body()
@@ -208,7 +208,7 @@
history_008_pos_head()
{
atf_set "descr" "Internal journal records all the recursively operations."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
history_008_pos_body()
@@ -235,7 +235,7 @@
history_009_pos_head()
{
atf_set "descr" "Verify the delegation internal history are correctly."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
history_009_pos_body()
@@ -262,7 +262,7 @@
history_010_pos_head()
{
atf_set "descr" "Verify internal long history information are correct."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
history_010_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh b/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh
--- a/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh
+++ b/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh
@@ -30,7 +30,7 @@
hotplug_001_pos_head()
{
atf_set "descr" "When removing a device from a redundant pool, the device'sstate will be indicated as 'REMOVED'."
- atf_set "require.progs" zpool gnop
+ atf_set "require.progs" "ksh93 zpool gnop"
}
hotplug_001_pos_body()
{
@@ -55,7 +55,7 @@
hotplug_008_pos_head()
{
atf_set "descr" "When removing hotspare device, verify device status is 'REMOVED'."
- atf_set "require.progs" zpool gnop
+ atf_set "require.progs" "ksh93 zpool gnop"
}
hotplug_008_pos_body()
{
@@ -80,7 +80,7 @@
hotplug_011_pos_head()
{
atf_set "descr" "Removing device offlined, verify device status is UNAVAIL,when the system is onlined."
- atf_set "require.progs" zpool gnop
+ atf_set "require.progs" "ksh93 zpool gnop"
}
hotplug_011_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh b/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh
--- a/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh
+++ b/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh
@@ -55,7 +55,7 @@
hotspare_add_002_pos_head()
{
atf_set "descr" "'zpool add <pool> spare <vdev> ...' can add devices to the pool while it has spare-in device."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_add_002_pos_body()
@@ -81,7 +81,7 @@
hotspare_add_003_neg_head()
{
atf_set "descr" "'zpool add [-f]' with hot spares should fail with inapplicable scenarios."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_add_003_neg_body()
@@ -107,7 +107,7 @@
hotspare_add_004_neg_head()
{
atf_set "descr" "'zpool add [-f]' will not allow a swap device to be used as a hotspare'"
- atf_set "require.progs" zpool swapon swapoff swapctl
+ atf_set "require.progs" "ksh93 zpool swapon swapoff swapctl"
}
hotspare_add_004_neg_body()
{
@@ -133,7 +133,7 @@
hotspare_clone_001_pos_head()
{
atf_set "descr" "'zpool detach <pool> <vdev> ...' against hotspare should do no harm to clone."
- atf_set "require.progs" zfs zpool sum
+ atf_set "require.progs" "ksh93 zfs zpool sum"
atf_set "timeout" 3600
}
hotspare_clone_001_pos_body()
@@ -159,7 +159,7 @@
hotspare_clone_002_pos_head()
{
atf_set "descr" "'zpool detach <pool> <vdev> ...' against basic vdev should do no harm to clone."
- atf_set "require.progs" zfs zpool sum
+ atf_set "require.progs" "ksh93 zfs zpool sum"
atf_set "timeout" 3600
}
hotspare_clone_002_pos_body()
@@ -185,7 +185,7 @@
hotspare_create_001_neg_head()
{
atf_set "descr" "'zpool create [-f]' with hot spares should be failedwith inapplicable scenarios."
- atf_set "require.progs" dumpadm zpool
+ atf_set "require.progs" "ksh93 dumpadm zpool"
atf_set "timeout" 3600
}
hotspare_create_001_neg_body()
@@ -211,7 +211,7 @@
hotspare_detach_001_pos_head()
{
atf_set "descr" "'zpool detach <pool> <vdev> ...' should deactivate the spared-in hot spare device successfully."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_detach_001_pos_body()
@@ -237,7 +237,7 @@
hotspare_detach_002_pos_head()
{
atf_set "descr" "'zpool detach <pool> <vdev> ...' against a functioning device that have spared should take the hot spare permanently swapping in successfully."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_detach_002_pos_body()
@@ -263,7 +263,7 @@
hotspare_detach_003_pos_head()
{
atf_set "descr" "'zpool replace <pool> <vdev> <ndev>' against a functioning device that have spared should complete and the hot spare should return to available."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_detach_003_pos_body()
@@ -289,7 +289,7 @@
hotspare_detach_004_pos_head()
{
atf_set "descr" "'zpool replace <pool> <vdev> <ndev>' against a hot spare device that have been activated should successful while the another dev is a available hot spare."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_detach_004_pos_body()
@@ -315,7 +315,7 @@
hotspare_detach_005_neg_head()
{
atf_set "descr" "'zpool detach <pool> <vdev>' against a hot spare device that NOT activated should fail and issue an error message."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_detach_005_neg_body()
@@ -341,7 +341,7 @@
hotspare_export_001_neg_head()
{
atf_set "descr" "export pool that using shared hotspares will fail"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_export_001_neg_body()
@@ -367,7 +367,7 @@
hotspare_import_001_pos_head()
{
atf_set "descr" "'zpool export/import <pool>' should runs successfully regardless the hotspare is only in list, activated, or offline."
- atf_set "require.progs" zpool sum
+ atf_set "require.progs" "ksh93 zpool sum"
atf_set "timeout" 3600
}
hotspare_import_001_pos_body()
@@ -393,7 +393,7 @@
hotspare_onoffline_003_neg_head()
{
atf_set "descr" "'zpool offline/online <pool> <vdev>' should fail on inactive spares"
- atf_set "require.progs" zpool zdb
+ atf_set "require.progs" "ksh93 zpool zdb"
atf_set "timeout" 3600
}
hotspare_onoffline_003_neg_body()
@@ -419,7 +419,7 @@
hotspare_onoffline_004_neg_head()
{
atf_set "descr" "'zpool offline/online <pool> <vdev>' against a spared basic vdev during I/O completes."
- atf_set "require.progs" zfs zpool zdb
+ atf_set "require.progs" "ksh93 zfs zpool zdb"
atf_set "timeout" 3600
}
hotspare_onoffline_004_neg_body()
@@ -445,7 +445,7 @@
hotspare_remove_001_pos_head()
{
atf_set "descr" "'zpool remove <pool> <vdev> ...' can remove spare device from the pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_remove_001_pos_body()
@@ -471,7 +471,7 @@
hotspare_remove_002_neg_head()
{
atf_set "descr" "'zpool remove <pool> <vdev> ...' should fail with inapplicable scenarios."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_remove_002_neg_body()
@@ -497,7 +497,7 @@
hotspare_remove_003_neg_head()
{
atf_set "descr" "Executing 'zpool remove' with bad options fails"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_remove_003_neg_body()
@@ -523,7 +523,7 @@
hotspare_remove_004_pos_head()
{
atf_set "descr" "'zpool remove <pool> <vdev> ...' can remove spare device from the pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_remove_004_pos_body()
@@ -549,7 +549,7 @@
hotspare_replace_001_neg_head()
{
atf_set "descr" "'zpool replace <pool> <odev> <ndev>' should fail with inapplicable scenarios."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_replace_001_neg_body()
@@ -575,7 +575,7 @@
hotspare_replace_002_neg_head()
{
atf_set "descr" "'zpool replace <pool> <odev> <ndev>' should fail while the hot spares smaller than the basic vdev."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_replace_002_neg_body()
@@ -601,7 +601,7 @@
hotspare_scrub_001_pos_head()
{
atf_set "descr" "'zpool scrub <pool>' should runs successfully regardlessthe hotspare is only in list or activated."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_scrub_001_pos_body()
@@ -627,7 +627,7 @@
hotspare_scrub_002_pos_head()
{
atf_set "descr" "'zpool scrub' scans spare vdevs"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
hotspare_scrub_002_pos_body()
{
@@ -653,7 +653,7 @@
hotspare_shared_001_pos_head()
{
atf_set "descr" "'zpool add <pool> spare <vdev> ...' can add a disk as a shared spare to multiple pools."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 3600
}
hotspare_shared_001_pos_body()
@@ -680,7 +680,7 @@
hotspare_snapshot_001_pos_head()
{
atf_set "descr" "'zpool detach <pool> <vdev> ...' against hotspare should do no harm to snapshot."
- atf_set "require.progs" zfs zpool sum
+ atf_set "require.progs" "ksh93 zfs zpool sum"
atf_set "timeout" 3600
}
hotspare_snapshot_001_pos_body()
@@ -706,7 +706,7 @@
hotspare_snapshot_002_pos_head()
{
atf_set "descr" "'zpool detach <pool> <vdev> ...' against basic vdev do no harm to snapshot."
- atf_set "require.progs" zfs zpool sum
+ atf_set "require.progs" "ksh93 zfs zpool sum"
atf_set "timeout" 3600
}
hotspare_snapshot_002_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh b/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh
--- a/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh
+++ b/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh
@@ -31,7 +31,7 @@
{
atf_set "descr" "Test properties are inherited correctly"
atf_set "timeout" 1800
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
inherit_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/interop/interop_test.sh b/tests/sys/cddl/zfs/tests/interop/interop_test.sh
--- a/tests/sys/cddl/zfs/tests/interop/interop_test.sh
+++ b/tests/sys/cddl/zfs/tests/interop/interop_test.sh
@@ -30,7 +30,7 @@
interop_001_pos_head()
{
atf_set "descr" "Create a SVM device and add this to an existing ZFS pool"
- atf_set "require.progs" metadb zfs metaclear metastat metainit zpool
+ atf_set "require.progs" "ksh93 metadb zfs metaclear metastat metainit zpool"
}
interop_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh b/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh
--- a/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh
+++ b/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh
@@ -30,7 +30,7 @@
inuse_005_pos_head()
{
atf_set "descr" "Verify newfs over active pool fails."
- atf_set "require.progs" newfs zpool
+ atf_set "require.progs" "ksh93 newfs zpool"
atf_set "require.user" root
}
inuse_005_pos_body()
@@ -47,7 +47,7 @@
inuse_010_neg_head()
{
atf_set "descr" "ZFS shouldn't be able to use a disk with a mounted filesystem"
- atf_set "require.progs" newfs zpool
+ atf_set "require.progs" "ksh93 newfs zpool"
atf_set "require.user" root
}
inuse_010_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh b/tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh
--- a/tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh
+++ b/tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh
@@ -30,7 +30,7 @@
iscsi_001_pos_head()
{
atf_set "descr" "Verify that setting shareiscsi property on volume will make itan iSCSI target as expected."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
iscsi_001_pos_body()
{
@@ -55,7 +55,7 @@
iscsi_002_neg_head()
{
atf_set "descr" "Verify file systems and snapshots can not be shared via iSCSI."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
iscsi_002_neg_body()
{
@@ -80,7 +80,7 @@
iscsi_003_neg_head()
{
atf_set "descr" "Verify invalid value of shareiscsi can not be set"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
iscsi_003_neg_body()
{
@@ -105,7 +105,7 @@
iscsi_004_pos_head()
{
atf_set "descr" "Verify renaming a volume does not change target's iSCSI name."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
iscsi_004_pos_body()
{
@@ -130,7 +130,7 @@
iscsi_005_pos_head()
{
atf_set "descr" "Verify export/import have right effects on iSCSI targets."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
iscsi_005_pos_body()
{
@@ -155,7 +155,7 @@
iscsi_006_neg_head()
{
atf_set "descr" "Verify iscsioptions can not be changed by zfs command."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
iscsi_006_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_test.sh b/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_test.sh
--- a/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_test.sh
+++ b/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_test.sh
@@ -30,7 +30,7 @@
largest_pool_001_pos_head()
{
atf_set "descr" "The largest pool can be created and a dataset in thatpool can be created and mounted."
- atf_set "require.progs" zfs zpool isainfo
+ atf_set "require.progs" "ksh93 zfs zpool isainfo"
atf_set "timeout" 1800
}
largest_pool_001_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/link_count/link_count_test.sh b/tests/sys/cddl/zfs/tests/link_count/link_count_test.sh
--- a/tests/sys/cddl/zfs/tests/link_count/link_count_test.sh
+++ b/tests/sys/cddl/zfs/tests/link_count/link_count_test.sh
@@ -30,7 +30,7 @@
link_count_001_head()
{
atf_set "descr" "Verify file link count is zero on zfs"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
link_count_001_body()
{
diff --git a/tests/sys/cddl/zfs/tests/migration/migration_test.sh b/tests/sys/cddl/zfs/tests/migration/migration_test.sh
--- a/tests/sys/cddl/zfs/tests/migration/migration_test.sh
+++ b/tests/sys/cddl/zfs/tests/migration/migration_test.sh
@@ -30,7 +30,7 @@
migration_001_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to ZFS fs using tar"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_001_pos_body()
{
@@ -56,7 +56,7 @@
migration_002_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to UFS fs using tar"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_002_pos_body()
{
@@ -82,7 +82,7 @@
migration_003_pos_head()
{
atf_set "descr" "Migrating test file from UFS fs to ZFS fs using tar"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_003_pos_body()
{
@@ -108,7 +108,7 @@
migration_004_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to ZFS fs using cpio"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_004_pos_body()
{
@@ -134,7 +134,7 @@
migration_005_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to uFS fs using cpio"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_005_pos_body()
{
@@ -160,7 +160,7 @@
migration_006_pos_head()
{
atf_set "descr" "Migrating test file from UFS fs to ZFS fs using cpio"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_006_pos_body()
{
@@ -186,7 +186,7 @@
migration_007_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to ZFS fs using dd"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_007_pos_body()
{
@@ -212,7 +212,7 @@
migration_008_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to UFS fs using dd"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_008_pos_body()
{
@@ -238,7 +238,7 @@
migration_009_pos_head()
{
atf_set "descr" "Migrating test file from UFS fs to ZFS fs using dd"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_009_pos_body()
{
@@ -264,7 +264,7 @@
migration_010_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to ZFS fs using cp"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_010_pos_body()
{
@@ -290,7 +290,7 @@
migration_011_pos_head()
{
atf_set "descr" "Migrating test file from ZFS fs to UFS fs using cp"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_011_pos_body()
{
@@ -316,7 +316,7 @@
migration_012_pos_head()
{
atf_set "descr" "Migrating test file from UFS fs to ZFS fs using cp"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
migration_012_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh b/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh
--- a/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh
+++ b/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh
@@ -30,7 +30,7 @@
mmap_read_001_pos_head()
{
atf_set "descr" "read()s from mmap()'ed file contain correct data."
- atf_set "require.progs" zfs zdb
+ atf_set "require.progs" "ksh93 zfs zdb"
}
mmap_read_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/mount/mount_test.sh b/tests/sys/cddl/zfs/tests/mount/mount_test.sh
--- a/tests/sys/cddl/zfs/tests/mount/mount_test.sh
+++ b/tests/sys/cddl/zfs/tests/mount/mount_test.sh
@@ -30,7 +30,7 @@
umount_001_head()
{
atf_set "descr" "zfs umount should unmount a file system"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
umount_001_body()
{
@@ -54,7 +54,7 @@
umountall_001_head()
{
atf_set "descr" "zfs umount -a should unmount all ZFS file systems"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
umountall_001_body()
{
diff --git a/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh b/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh
--- a/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh
+++ b/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh
@@ -30,7 +30,7 @@
mv_files_001_pos_head()
{
atf_set "descr" "Doing a 'mv' of a large amount of files within a zfs filesystemworks without errors."
- atf_set "require.progs" zfs zdb
+ atf_set "require.progs" "ksh93 zfs zdb"
atf_set "timeout" 1200
}
mv_files_001_pos_body()
@@ -57,7 +57,7 @@
mv_files_002_pos_head()
{
atf_set "descr" "Doing a 'mv' of a large amount of files across two zfs filesystemsworks without errors."
- atf_set "require.progs" zfs zdb
+ atf_set "require.progs" "ksh93 zfs zdb"
atf_set "timeout" 1200
}
mv_files_002_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh b/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh
--- a/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh
+++ b/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh
@@ -30,7 +30,7 @@
nestedfs_001_pos_head()
{
atf_set "descr" "Verify a nested file system can be created/destroyed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
nestedfs_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh b/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
--- a/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
+++ b/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
@@ -30,7 +30,7 @@
enospc_001_pos_head()
{
atf_set "descr" "ENOSPC is returned when file system is full."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
enospc_001_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh b/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh
--- a/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh
+++ b/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh
@@ -30,7 +30,7 @@
online_offline_001_pos_head()
{
atf_set "descr" "Turning a disk offline and back online during I/O completes."
- atf_set "require.progs" zpool zdb
+ atf_set "require.progs" "ksh93 zpool zdb"
atf_set "timeout" 3600
}
online_offline_001_pos_body()
@@ -54,7 +54,7 @@
online_offline_002_neg_head()
{
atf_set "descr" "Offlining a disk should fail if the pool would go critical"
- atf_set "require.progs" zpool zdb
+ atf_set "require.progs" "ksh93 zpool zdb"
atf_set "timeout" 3600
}
online_offline_002_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh b/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh
--- a/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh
+++ b/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh
@@ -30,7 +30,7 @@
pool_names_001_pos_head()
{
atf_set "descr" "Ensure that pool names can use the ASCII subset of UTF-8"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1200
}
pool_names_001_pos_body()
@@ -47,7 +47,7 @@
pool_names_002_neg_head()
{
atf_set "descr" "Ensure that a set of invalid names cannot be used to create pools."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
pool_names_002_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh b/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh
--- a/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh
+++ b/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh
@@ -30,7 +30,7 @@
poolversion_001_pos_head()
{
atf_set "descr" "zpool set version can upgrade a pool"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
poolversion_001_pos_body()
{
@@ -52,7 +52,7 @@
poolversion_002_pos_head()
{
atf_set "descr" "zpool set version can only increment pool version"
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
}
poolversion_002_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/quota/quota_test.sh b/tests/sys/cddl/zfs/tests/quota/quota_test.sh
--- a/tests/sys/cddl/zfs/tests/quota/quota_test.sh
+++ b/tests/sys/cddl/zfs/tests/quota/quota_test.sh
@@ -30,7 +30,7 @@
quota_001_pos_head()
{
atf_set "descr" "Verify that file size is limited by the file system quota"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
quota_001_pos_body()
{
@@ -56,7 +56,7 @@
quota_002_pos_head()
{
atf_set "descr" "Verify that a file write cannot exceed the file system quota"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
quota_002_pos_body()
{
@@ -82,7 +82,7 @@
quota_003_pos_head()
{
atf_set "descr" "Verify that file size is limited by the file system quota(dataset version)"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
quota_003_pos_body()
{
@@ -108,7 +108,7 @@
quota_004_pos_head()
{
atf_set "descr" "Verify that a file write cannot exceed the file system quota(dataset version)"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
quota_004_pos_body()
{
@@ -134,7 +134,7 @@
quota_005_pos_head()
{
atf_set "descr" "Verify that quota does not inherit its value from parent."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
quota_005_pos_body()
{
@@ -160,7 +160,7 @@
quota_006_neg_head()
{
atf_set "descr" "Verify cannot set quota lower than the space currently in use"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
quota_006_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/redundancy/redundancy_test.sh b/tests/sys/cddl/zfs/tests/redundancy/redundancy_test.sh
--- a/tests/sys/cddl/zfs/tests/redundancy/redundancy_test.sh
+++ b/tests/sys/cddl/zfs/tests/redundancy/redundancy_test.sh
@@ -105,7 +105,7 @@
redundancy_004_neg_head()
{
atf_set "descr" "Verify striped pool have no data redundancy."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1800
}
redundancy_004_neg_body()
diff --git a/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh b/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh
--- a/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh
+++ b/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh
@@ -30,7 +30,7 @@
refquota_001_pos_head()
{
atf_set "descr" "refquota limits the amount of space a dataset can consume,but does not include space used by descendents."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refquota_001_pos_body()
{
@@ -54,7 +54,7 @@
refquota_002_pos_head()
{
atf_set "descr" "Quotas are enforced using the minimum of the two properties"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refquota_002_pos_body()
{
@@ -78,7 +78,7 @@
refquota_003_pos_head()
{
atf_set "descr" "Sub-filesystem quotas are not enforced by property 'refquota'"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refquota_003_pos_body()
{
@@ -102,7 +102,7 @@
refquota_004_pos_head()
{
atf_set "descr" "refquotas are not limited by snapshots."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refquota_004_pos_body()
{
@@ -126,7 +126,7 @@
refquota_005_pos_head()
{
atf_set "descr" "refquotas are not limited by sub-filesystem snapshots."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refquota_005_pos_body()
{
@@ -150,7 +150,7 @@
refquota_006_neg_head()
{
atf_set "descr" "'zfs set refquota' can handle incorrect arguments correctly."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refquota_006_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh b/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh
--- a/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh
+++ b/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh
@@ -30,7 +30,7 @@
refreserv_001_pos_head()
{
atf_set "descr" "Reservations are enforced using the maximum of'reserv' and 'refreserv'"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refreserv_001_pos_body()
{
@@ -54,7 +54,7 @@
refreserv_002_pos_head()
{
atf_set "descr" "Setting full size as refreservation, verify no snapshotcan be created."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refreserv_002_pos_body()
{
@@ -78,7 +78,7 @@
refreserv_003_pos_head()
{
atf_set "descr" "Verify a snapshot will only be allowed if there is enoughfree space outside of this refreservation."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refreserv_003_pos_body()
{
@@ -102,7 +102,7 @@
refreserv_004_pos_head()
{
atf_set "descr" "Verify refreservation is limited by available space."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refreserv_004_pos_body()
{
@@ -126,7 +126,7 @@
refreserv_005_pos_head()
{
atf_set "descr" "Volume refreservation is limited by volsize"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
refreserv_005_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh b/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh
--- a/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh
+++ b/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh
@@ -30,7 +30,7 @@
replacement_001_pos_head()
{
atf_set "descr" "Replacing a disk during I/O completes."
- atf_set "require.progs" zfs zpool zdb
+ atf_set "require.progs" "ksh93 zfs zpool zdb"
atf_set "timeout" 3600
}
replacement_001_pos_body()
@@ -52,7 +52,7 @@
replacement_002_pos_head()
{
atf_set "descr" "Replacing a disk during I/O completes."
- atf_set "require.progs" zfs zpool zdb
+ atf_set "require.progs" "ksh93 zfs zpool zdb"
atf_set "timeout" 3600
}
replacement_002_pos_body()
@@ -74,7 +74,7 @@
replacement_003_pos_head()
{
atf_set "descr" "Replacing a disk during I/O completes."
- atf_set "require.progs" zfs zpool zdb
+ atf_set "require.progs" "ksh93 zfs zpool zdb"
atf_set "timeout" 3600
}
replacement_003_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh b/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh
--- a/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh
+++ b/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh
@@ -30,7 +30,7 @@
reservation_001_pos_head()
{
atf_set "descr" "Verify that to set a reservation on a filesystem or volume must use value smaller than space \ available property of pool"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_001_pos_body()
{
@@ -56,7 +56,7 @@
reservation_002_pos_head()
{
atf_set "descr" "Reservation values cannot exceed the amount of space available in the pool"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_002_pos_body()
{
@@ -82,7 +82,7 @@
reservation_003_pos_head()
{
atf_set "descr" "Verify it is possible to set reservations multiple times on a filesystem regular and sparse volume"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_003_pos_body()
{
@@ -108,7 +108,7 @@
reservation_004_pos_head()
{
atf_set "descr" "Verify space released when a dataset with reservation is destroyed"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_004_pos_body()
{
@@ -134,7 +134,7 @@
reservation_005_pos_head()
{
atf_set "descr" "Verify space released when reservation on a dataset is setto 'none'"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_005_pos_body()
{
@@ -160,7 +160,7 @@
reservation_006_pos_head()
{
atf_set "descr" "Verify can create files both inside and outside reserved areas"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_006_pos_body()
{
@@ -186,7 +186,7 @@
reservation_007_pos_head()
{
atf_set "descr" "Verify reservations on data sets doesn't affect other data sets at same level except for consuming space from common pool"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_007_pos_body()
{
@@ -212,7 +212,7 @@
reservation_008_pos_head()
{
atf_set "descr" "Verify reducing reservation allows other datasets to use space"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 600
}
reservation_008_pos_body()
@@ -239,7 +239,7 @@
reservation_009_pos_head()
{
atf_set "descr" "Setting top level dataset reservation to 'none' allows more data to be written to top level filesystem"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 600
}
reservation_009_pos_body()
@@ -266,7 +266,7 @@
reservation_010_pos_head()
{
atf_set "descr" "Destroying top level filesystem with reservation allows more data to be written to another top level filesystem"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 600
}
reservation_010_pos_body()
@@ -293,7 +293,7 @@
reservation_011_pos_head()
{
atf_set "descr" "Verify reservation settings do not affect quota settings"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_011_pos_body()
{
@@ -319,7 +319,7 @@
reservation_012_pos_head()
{
atf_set "descr" "Verify reservations protect space"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 600
}
reservation_012_pos_body()
@@ -346,7 +346,7 @@
reservation_013_pos_head()
{
atf_set "descr" "Reservation properties preserved across exports and imports"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
reservation_013_pos_body()
{
@@ -372,7 +372,7 @@
reservation_014_pos_head()
{
atf_set "descr" "Verify cannot set reservation larger than quota"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_014_pos_body()
{
@@ -398,7 +398,7 @@
reservation_015_pos_head()
{
atf_set "descr" "Setting volume reservation to 'none' allows more data to be written to top level filesystem"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 600
}
reservation_015_pos_body()
@@ -425,7 +425,7 @@
reservation_016_pos_head()
{
atf_set "descr" "Destroying a regular volume with reservation allows more data to be written to top level filesystem"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 600
}
reservation_016_pos_body()
@@ -452,7 +452,7 @@
reservation_017_pos_head()
{
atf_set "descr" "Verify that the volsize changes of sparse volume are not reflectedin the reservation"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_017_pos_body()
{
@@ -478,7 +478,7 @@
reservation_018_pos_head()
{
atf_set "descr" "Verify that reservation doesnot inherit its value from parent."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
reservation_018_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh b/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh
--- a/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh
+++ b/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh
@@ -54,7 +54,7 @@
rootpool_002_neg_head()
{
atf_set "descr" "zpool/zfs destory <rootpool> should return error"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
}
rootpool_002_neg_body()
{
@@ -78,7 +78,7 @@
rootpool_007_neg_head()
{
atf_set "descr" "the zfs rootfs's compression property can not set to gzip and gzip[1-9]"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
rootpool_007_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh b/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh
--- a/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh
+++ b/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh
@@ -30,7 +30,7 @@
rsend_001_pos_head()
{
atf_set "descr" "zfs send -R send replication stream up to the named snap."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_001_pos_body()
@@ -57,7 +57,7 @@
rsend_002_pos_head()
{
atf_set "descr" "zfs send -I sends all incrementals from fs@init to fs@final."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_002_pos_body()
@@ -84,7 +84,7 @@
rsend_003_pos_head()
{
atf_set "descr" "zfs send -I send all incrementals from dataset@init to clone@snap"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_003_pos_body()
@@ -111,7 +111,7 @@
rsend_004_pos_head()
{
atf_set "descr" "zfs send -R -i send incremental from fs@init to fs@final."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_004_pos_body()
@@ -138,7 +138,7 @@
rsend_005_pos_head()
{
atf_set "descr" "zfs send -R -I send all the incremental between @init with @final"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_005_pos_body()
@@ -165,7 +165,7 @@
rsend_006_pos_head()
{
atf_set "descr" "Rename snapshot name will not change the dependent order."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_006_pos_body()
@@ -192,7 +192,7 @@
rsend_007_pos_head()
{
atf_set "descr" "Rename parent filesystem name will not change the dependent order."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_007_pos_body()
@@ -219,7 +219,7 @@
rsend_008_pos_head()
{
atf_set "descr" "Changes made by 'zfs promote' can be properly received."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_008_pos_body()
@@ -246,7 +246,7 @@
rsend_009_pos_head()
{
atf_set "descr" "Verify zfs receive can handle out of space correctly."
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
atf_set "timeout" 2700
}
rsend_009_pos_body()
@@ -273,7 +273,7 @@
rsend_010_pos_head()
{
atf_set "descr" "ZFS can handle stream with multiple identical (same GUID) snapshots"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_010_pos_body()
@@ -300,7 +300,7 @@
rsend_011_pos_head()
{
atf_set "descr" "Verify changes made by 'zfs inherit' can be properly received."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_011_pos_body()
@@ -327,7 +327,7 @@
rsend_012_pos_head()
{
atf_set "descr" "Verify zfs send -R will backup all the filesystem propertiescorrectly."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_012_pos_body()
@@ -354,7 +354,7 @@
rsend_013_pos_head()
{
atf_set "descr" "zfs receive -dF will destroy all the dataset that not existon the sender side"
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 2700
}
rsend_013_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh b/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
--- a/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
+++ b/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
@@ -30,7 +30,7 @@
scrub_mirror_001_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
scrub_mirror_001_pos_body()
{
@@ -56,7 +56,7 @@
scrub_mirror_002_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
scrub_mirror_002_pos_body()
{
@@ -82,7 +82,7 @@
scrub_mirror_003_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
scrub_mirror_003_pos_body()
{
@@ -108,7 +108,7 @@
scrub_mirror_004_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
scrub_mirror_004_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/slog/slog_test.sh b/tests/sys/cddl/zfs/tests/slog/slog_test.sh
--- a/tests/sys/cddl/zfs/tests/slog/slog_test.sh
+++ b/tests/sys/cddl/zfs/tests/slog/slog_test.sh
@@ -30,7 +30,7 @@
slog_001_pos_head()
{
atf_set "descr" "Creating a pool with a log device succeeds."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_001_pos_body()
@@ -56,7 +56,7 @@
slog_002_pos_head()
{
atf_set "descr" "Adding a log device to normal pool works."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_002_pos_body()
@@ -82,7 +82,7 @@
slog_003_pos_head()
{
atf_set "descr" "Adding an extra log device works."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_003_pos_body()
@@ -108,7 +108,7 @@
slog_004_pos_head()
{
atf_set "descr" "Attaching a log device passes."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_004_pos_body()
@@ -134,7 +134,7 @@
slog_005_pos_head()
{
atf_set "descr" "Detaching a log device passes."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_005_pos_body()
@@ -160,7 +160,7 @@
slog_006_pos_head()
{
atf_set "descr" "Replacing a log device passes."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_006_pos_body()
@@ -186,7 +186,7 @@
slog_007_pos_head()
{
atf_set "descr" "Exporting and importing pool with log devices passes."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_007_pos_body()
@@ -212,7 +212,7 @@
slog_008_neg_head()
{
atf_set "descr" "A raidz/raidz2 log is not supported."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_008_neg_body()
@@ -238,7 +238,7 @@
slog_009_neg_head()
{
atf_set "descr" "A raidz/raidz2 log can not be added to existed pool."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_009_neg_body()
@@ -264,7 +264,7 @@
slog_010_neg_head()
{
atf_set "descr" "Slog device can not be replaced with spare device."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_010_neg_body()
@@ -290,7 +290,7 @@
slog_011_neg_head()
{
atf_set "descr" "Offline and online a log device passes."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_011_neg_body()
@@ -316,7 +316,7 @@
slog_012_neg_head()
{
atf_set "descr" "Pool can survive when one of mirror log device get corrupted."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_012_neg_body()
@@ -342,7 +342,7 @@
slog_013_pos_head()
{
atf_set "descr" "Verify slog device can be disk, file, lofi device or any devicethat presents a block interface."
- atf_set "require.progs" zpool lofiadm
+ atf_set "require.progs" "ksh93 zpool lofiadm"
atf_set "timeout" 1200
}
slog_013_pos_body()
@@ -369,7 +369,7 @@
slog_014_pos_head()
{
atf_set "descr" "log device can survive when one of the pool device get corrupted."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
slog_014_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh b/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
--- a/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
+++ b/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
@@ -30,7 +30,7 @@
clone_001_pos_head()
{
atf_set "descr" "Verify a cloned file system is writable."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
clone_001_pos_body()
{
@@ -55,7 +55,7 @@
rollback_001_pos_head()
{
atf_set "descr" "Verify that a rollback to a previous snapshot succeeds."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
rollback_001_pos_body()
{
@@ -79,7 +79,7 @@
rollback_002_pos_head()
{
atf_set "descr" "Verify rollback is with respect to latest snapshot."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
rollback_002_pos_body()
{
@@ -103,7 +103,7 @@
rollback_003_pos_head()
{
atf_set "descr" "Verify rollback succeeds when there are nested file systems."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
rollback_003_pos_body()
{
@@ -127,7 +127,7 @@
snapshot_001_pos_head()
{
atf_set "descr" "Verify a file system snapshot is identical to original."
- atf_set "require.progs" zfs sum
+ atf_set "require.progs" "ksh93 zfs sum"
}
snapshot_001_pos_body()
{
@@ -151,7 +151,7 @@
snapshot_002_pos_head()
{
atf_set "descr" "Verify an archive of a file system is identical toan archive of its snapshot."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_002_pos_body()
{
@@ -175,7 +175,7 @@
snapshot_003_pos_head()
{
atf_set "descr" "Verify many snapshots of a file system can be taken."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_003_pos_body()
{
@@ -199,7 +199,7 @@
snapshot_004_pos_head()
{
atf_set "descr" "Verify that a snapshot of an empty file system remains empty."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_004_pos_body()
{
@@ -223,7 +223,7 @@
snapshot_005_pos_head()
{
atf_set "descr" "Verify that a snapshot of a dataset is identical tothe original dataset."
- atf_set "require.progs" zfs sum
+ atf_set "require.progs" "ksh93 zfs sum"
}
snapshot_005_pos_body()
{
@@ -247,7 +247,7 @@
snapshot_006_pos_head()
{
atf_set "descr" "Verify that an archive of a dataset is identical toan archive of the dataset's snapshot."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_006_pos_body()
{
@@ -271,7 +271,7 @@
snapshot_007_pos_head()
{
atf_set "descr" "Verify that many snapshots can be made on a zfs dataset."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_007_pos_body()
{
@@ -295,7 +295,7 @@
snapshot_008_pos_head()
{
atf_set "descr" "Verify that destroying snapshots returns space to the pool."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_008_pos_body()
{
@@ -319,7 +319,7 @@
snapshot_009_pos_head()
{
atf_set "descr" "Verify snapshot -r can correctly create a snapshot tree."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_009_pos_body()
{
@@ -343,7 +343,7 @@
snapshot_010_pos_head()
{
atf_set "descr" "Verify 'destroy -r' can correctly destroy a snapshot subtree at any point."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_010_pos_body()
{
@@ -367,7 +367,7 @@
snapshot_011_pos_head()
{
atf_set "descr" "Verify that rollback to a snapshot created by snapshot -r succeeds."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_011_pos_body()
{
@@ -391,7 +391,7 @@
snapshot_012_pos_head()
{
atf_set "descr" "Verify that 'snapshot -r' can work with 'zfs promote'."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_012_pos_body()
{
@@ -415,7 +415,7 @@
snapshot_013_pos_head()
{
atf_set "descr" "Verify snapshots from 'snapshot -r' can be used for zfs send/recv"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_013_pos_body()
{
@@ -439,7 +439,7 @@
snapshot_014_pos_head()
{
atf_set "descr" "Verify creating/destroying snapshots do things clean"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_014_pos_body()
{
@@ -463,7 +463,7 @@
snapshot_015_pos_head()
{
atf_set "descr" "Verify snapshot can be created via mkdir in .zfs/snapshot."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_015_pos_body()
{
@@ -488,7 +488,7 @@
snapshot_016_pos_head()
{
atf_set "descr" "Verify renamed snapshots via mv can be destroyed."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_016_pos_body()
{
@@ -513,7 +513,7 @@
snapshot_017_pos_head()
{
atf_set "descr" "Directory structure of snapshots reflects filesystem structure."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_017_pos_body()
{
@@ -537,7 +537,7 @@
snapshot_018_pos_head()
{
atf_set "descr" "Snapshot directory supports ACL operations"
- atf_set "require.progs" zfs getfacl getconf sha1
+ atf_set "require.progs" "ksh93 zfs getfacl getconf sha1"
}
snapshot_018_pos_body()
{
@@ -561,7 +561,7 @@
snapshot_019_pos_head()
{
atf_set "descr" "Accessing snapshots and unmounting them in parallel does not panic"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
snapshot_019_pos_body()
@@ -585,7 +585,7 @@
snapshot_020_pos_head()
{
atf_set "descr" "Verify mounted snapshots can be renamed and destroyed"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapshot_020_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh b/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh
--- a/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh
+++ b/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh
@@ -30,7 +30,7 @@
snapused_001_pos_head()
{
atf_set "descr" "Verify used is correct."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapused_001_pos_body()
{
@@ -56,7 +56,7 @@
snapused_002_pos_head()
{
atf_set "descr" "Verify usedbychildren is correct."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapused_002_pos_body()
{
@@ -82,7 +82,7 @@
snapused_003_pos_head()
{
atf_set "descr" "Verify usedbydataset is correct."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapused_003_pos_body()
{
@@ -108,7 +108,7 @@
snapused_004_pos_head()
{
atf_set "descr" "Verify usedbyrefreservation is correct."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapused_004_pos_body()
{
@@ -134,7 +134,7 @@
snapused_005_pos_head()
{
atf_set "descr" "Verify usedbysnapshots is correct."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
snapused_005_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/sparse/sparse_test.sh b/tests/sys/cddl/zfs/tests/sparse/sparse_test.sh
--- a/tests/sys/cddl/zfs/tests/sparse/sparse_test.sh
+++ b/tests/sys/cddl/zfs/tests/sparse/sparse_test.sh
@@ -30,7 +30,7 @@
sparse_001_pos_head()
{
atf_set "descr" "Ensure random blocks are read back correctly"
- atf_set "require.progs" zdb
+ atf_set "require.progs" "ksh93 zdb"
atf_set "timeout" 3600
}
sparse_001_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh b/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh
--- a/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh
+++ b/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh
@@ -30,7 +30,7 @@
truncate_001_pos_head()
{
atf_set "descr" "Ensure file with random blocks is truncated properly"
- atf_set "require.progs" zdb
+ atf_set "require.progs" "ksh93 zdb"
atf_set "timeout" 3600
}
truncate_001_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh b/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh
--- a/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh
+++ b/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh
@@ -30,7 +30,7 @@
groupspace_001_pos_head()
{
atf_set "descr" "Check the zfs groupspace with all possible parameters"
- atf_set "require.progs" zfs runwattr
+ atf_set "require.progs" "ksh93 zfs runwattr"
}
groupspace_001_pos_body()
{
@@ -56,7 +56,7 @@
groupspace_002_pos_head()
{
atf_set "descr" "Check the zfs groupspace used and quota"
- atf_set "require.progs" zfs runwattr
+ atf_set "require.progs" "ksh93 zfs runwattr"
}
groupspace_002_pos_body()
{
@@ -82,7 +82,7 @@
userquota_001_pos_head()
{
atf_set "descr" "If write operation overwrite {user|group}quota size, it will fail"
- atf_set "require.progs" zfs runwattr
+ atf_set "require.progs" "ksh93 zfs runwattr"
}
userquota_001_pos_body()
{
@@ -108,7 +108,7 @@
userquota_002_pos_head()
{
atf_set "descr" "the userquota and groupquota can be set during zpool,zfs creation"
- atf_set "require.progs" zpool zfs
+ atf_set "require.progs" "ksh93 zpool zfs"
}
userquota_002_pos_body()
{
@@ -134,7 +134,7 @@
userquota_003_pos_head()
{
atf_set "descr" "Check the basic function of set/get userquota and groupquota on fs"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
userquota_003_pos_body()
{
@@ -160,7 +160,7 @@
userquota_004_pos_head()
{
atf_set "descr" "Check the basic function of {user|group} used"
- atf_set "require.progs" runwattr
+ atf_set "require.progs" "ksh93 runwattr"
}
userquota_004_pos_body()
{
@@ -186,7 +186,7 @@
userquota_005_neg_head()
{
atf_set "descr" "Check the invalid parameter of zfs set user|group quota"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
userquota_005_neg_body()
{
@@ -212,7 +212,7 @@
userquota_006_pos_head()
{
atf_set "descr" "Check the invalid parameter of zfs get user|group quota"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
userquota_006_pos_body()
{
@@ -238,7 +238,7 @@
userquota_007_pos_head()
{
atf_set "descr" "Check set user|group quota to larger than the quota size of a fs"
- atf_set "require.progs" zfs runwattr
+ atf_set "require.progs" "ksh93 zfs runwattr"
}
userquota_007_pos_body()
{
@@ -264,7 +264,7 @@
userquota_008_pos_head()
{
atf_set "descr" "Check zfs get all will not print out user|group quota"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
userquota_008_pos_body()
{
@@ -290,7 +290,7 @@
userquota_009_pos_head()
{
atf_set "descr" "Check the snapshot's user|group quota"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
userquota_009_pos_body()
{
@@ -316,7 +316,7 @@
userquota_010_pos_head()
{
atf_set "descr" "overwrite any of the {user|group}quota size, it will fail"
- atf_set "require.progs" zfs runwattr
+ atf_set "require.progs" "ksh93 zfs runwattr"
}
userquota_010_pos_body()
{
@@ -342,7 +342,7 @@
userquota_011_pos_head()
{
atf_set "descr" "the userquota and groupquota can't change during zfs actions"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
userquota_011_pos_body()
{
@@ -368,7 +368,7 @@
userquota_012_neg_head()
{
atf_set "descr" "Check set userquota and groupquota on snapshot"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
userquota_012_neg_body()
{
@@ -394,7 +394,7 @@
userspace_001_pos_head()
{
atf_set "descr" "Check the zfs userspace with all possible parameters"
- atf_set "require.progs" zfs runwattr
+ atf_set "require.progs" "ksh93 zfs runwattr"
}
userspace_001_pos_body()
{
@@ -420,7 +420,7 @@
userspace_002_pos_head()
{
atf_set "descr" "Check the zfs userspace used and quota"
- atf_set "require.progs" zfs runwattr
+ atf_set "require.progs" "ksh93 zfs runwattr"
}
userspace_002_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh b/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
--- a/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
+++ b/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
@@ -30,7 +30,7 @@
utils_test_001_pos_head()
{
atf_set "descr" "Ensure that the clri(1M) utility fails on a ZFS file system."
- atf_set "require.progs" clri
+ atf_set "require.progs" "ksh93 clri"
}
utils_test_001_pos_body()
{
@@ -56,7 +56,7 @@
utils_test_002_pos_head()
{
atf_set "descr" "Ensure that the labelit(1M) utility fails on a ZFS file system."
- atf_set "require.progs" zfs labelit
+ atf_set "require.progs" "ksh93 zfs labelit"
}
utils_test_002_pos_body()
{
@@ -82,7 +82,7 @@
utils_test_003_pos_head()
{
atf_set "descr" "Ensure that the fsdb(1M) utility fails on a ZFS file system."
- atf_set "require.progs" fsdb
+ atf_set "require.progs" "ksh93 fsdb"
}
utils_test_003_pos_body()
{
@@ -108,7 +108,7 @@
utils_test_004_pos_head()
{
atf_set "descr" "Ensure that the quotaon(1M) utility fails on a ZFS file system."
- atf_set "require.progs" zfs quotaon
+ atf_set "require.progs" "ksh93 zfs quotaon"
}
utils_test_004_pos_body()
{
@@ -135,7 +135,7 @@
utils_test_005_pos_head()
{
atf_set "descr" "Ensure that the ff(1M) utility fails on a ZFS file system."
- atf_set "require.progs" ff
+ atf_set "require.progs" "ksh93 ff"
}
utils_test_005_pos_body()
{
@@ -161,7 +161,7 @@
utils_test_006_pos_head()
{
atf_set "descr" "Ensure that the fsirand(1M) utility fails on a ZFS file system."
- atf_set "require.progs" zfs fsirand
+ atf_set "require.progs" "ksh93 zfs fsirand"
}
utils_test_006_pos_body()
{
@@ -187,7 +187,7 @@
utils_test_007_pos_head()
{
atf_set "descr" "Ensure that the fstyp(1M) utility succeeds on a ZFS file system."
- atf_set "require.progs" zfs fstyp
+ atf_set "require.progs" "ksh93 zfs fstyp"
}
utils_test_007_pos_body()
{
@@ -213,7 +213,7 @@
utils_test_008_pos_head()
{
atf_set "descr" "Ensure that the ncheck(1M) utility fails on a ZFS file system."
- atf_set "require.progs" zfs ncheck
+ atf_set "require.progs" "ksh93 zfs ncheck"
}
utils_test_008_pos_body()
{
@@ -239,7 +239,7 @@
utils_test_009_pos_head()
{
atf_set "descr" "Ensure that the tunefs(1M) utility fails on a ZFS file system."
- atf_set "require.progs" tunefs
+ atf_set "require.progs" "ksh93 tunefs"
}
utils_test_009_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh b/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
--- a/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
+++ b/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
@@ -30,7 +30,7 @@
write_dirs_001_pos_head()
{
atf_set "descr" "Creating directories with 50 big files in each, until file systemis full."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
write_dirs_001_pos_body()
@@ -55,7 +55,7 @@
write_dirs_002_pos_head()
{
atf_set "descr" "Creating directories with 5000 files in each, until file systemis full."
- atf_set "require.progs" zpool
+ atf_set "require.progs" "ksh93 zpool"
atf_set "timeout" 1200
}
write_dirs_002_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/xattr/xattr_test.sh b/tests/sys/cddl/zfs/tests/xattr/xattr_test.sh
--- a/tests/sys/cddl/zfs/tests/xattr/xattr_test.sh
+++ b/tests/sys/cddl/zfs/tests/xattr/xattr_test.sh
@@ -30,7 +30,7 @@
xattr_001_pos_head()
{
atf_set "descr" "Create/read/write/append of xattrs works"
- atf_set "require.progs" svcadm svcs
+ atf_set "require.progs" "ksh93 svcadm svcs"
}
xattr_001_pos_body()
{
@@ -55,7 +55,7 @@
xattr_002_neg_head()
{
atf_set "descr" "A read of a non-existent xattr fails"
- atf_set "require.progs" svcadm svcs
+ atf_set "require.progs" "ksh93 svcadm svcs"
}
xattr_002_neg_body()
{
@@ -80,7 +80,7 @@
xattr_003_neg_head()
{
atf_set "descr" "read/write xattr on a file with no permissions fails"
- atf_set "require.progs" svcs svcadm runat runwattr
+ atf_set "require.progs" "ksh93 svcs svcadm runat runwattr"
}
xattr_003_neg_body()
{
@@ -105,7 +105,7 @@
xattr_004_pos_head()
{
atf_set "descr" "Files from ufs,tmpfs with xattrs copied to zfs retain xattr info."
- atf_set "require.progs" zfs svcadm runat svcs
+ atf_set "require.progs" "ksh93 zfs svcadm runat svcs"
}
xattr_004_pos_body()
{
@@ -130,7 +130,7 @@
xattr_005_pos_head()
{
atf_set "descr" "read/write/create/delete xattr on a clone filesystem"
- atf_set "require.progs" zfs svcadm svcs
+ atf_set "require.progs" "ksh93 zfs svcadm svcs"
}
xattr_005_pos_body()
{
@@ -155,7 +155,7 @@
xattr_006_pos_head()
{
atf_set "descr" "read xattr on a snapshot"
- atf_set "require.progs" zfs svcadm svcs
+ atf_set "require.progs" "ksh93 zfs svcadm svcs"
}
xattr_006_pos_body()
{
@@ -180,7 +180,7 @@
xattr_007_neg_head()
{
atf_set "descr" "create/write xattr on a snapshot fails"
- atf_set "require.progs" zfs svcadm runat svcs
+ atf_set "require.progs" "ksh93 zfs svcadm runat svcs"
}
xattr_007_neg_body()
{
@@ -205,7 +205,7 @@
xattr_008_pos_head()
{
atf_set "descr" "special . and .. dirs work as expected for xattrs"
- atf_set "require.progs" svcadm runat svcs
+ atf_set "require.progs" "ksh93 svcadm runat svcs"
}
xattr_008_pos_body()
{
@@ -230,7 +230,7 @@
xattr_009_neg_head()
{
atf_set "descr" "links between xattr and normal file namespace fail"
- atf_set "require.progs" svcadm runat svcs
+ atf_set "require.progs" "ksh93 svcadm runat svcs"
}
xattr_009_neg_body()
{
@@ -255,7 +255,7 @@
xattr_010_neg_head()
{
atf_set "descr" "mkdir, mknod fail"
- atf_set "require.progs" svcadm runat svcs
+ atf_set "require.progs" "ksh93 svcadm runat svcs"
}
xattr_010_neg_body()
{
@@ -280,7 +280,7 @@
xattr_011_pos_head()
{
atf_set "descr" "Basic applications work with xattrs: cpio cp find mv pax tar"
- atf_set "require.progs" pax svcadm runat svcs
+ atf_set "require.progs" "ksh93 pax svcadm runat svcs"
}
xattr_011_pos_body()
{
@@ -305,7 +305,7 @@
xattr_012_pos_head()
{
atf_set "descr" "xattr file sizes count towards normal disk usage"
- atf_set "require.progs" svcadm zfs runat zpool svcs
+ atf_set "require.progs" "ksh93 svcadm zfs runat zpool svcs"
}
xattr_012_pos_body()
{
@@ -330,7 +330,7 @@
xattr_013_pos_head()
{
atf_set "descr" "The noxattr mount option functions as expected"
- atf_set "require.progs" zfs svcadm runat svcs
+ atf_set "require.progs" "ksh93 zfs svcadm runat svcs"
}
xattr_013_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
--- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
+++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
@@ -30,7 +30,7 @@
zfsd_fault_001_pos_head()
{
atf_set "descr" "ZFS will fault a vdev that produces IO errors"
- atf_set "require.progs" zfs zpool zfsd
+ atf_set "require.progs" "ksh93 zfs zpool zfsd"
atf_set "timeout" 300
}
zfsd_fault_001_pos_body()
@@ -60,7 +60,7 @@
zfsd_degrade_001_pos_head()
{
atf_set "descr" "ZFS will degrade a vdev that produces checksum errors"
- atf_set "require.progs" zpool zfsd
+ atf_set "require.progs" "ksh93 zpool zfsd"
atf_set "timeout" 600
}
zfsd_degrade_001_pos_body()
@@ -89,7 +89,7 @@
zfsd_degrade_002_pos_head()
{
atf_set "descr" "ZFS will degrade a spare that produces checksum errors"
- atf_set "require.progs" zpool zfsd
+ atf_set "require.progs" "ksh93 zpool zfsd"
atf_set "timeout" 600
}
zfsd_degrade_002_pos_body()
@@ -120,7 +120,7 @@
zfsd_hotspare_001_pos_head()
{
atf_set "descr" "An active, damaged spare will be replaced by an available spare"
- atf_set "require.progs" zpool zfsd
+ atf_set "require.progs" "ksh93 zpool zfsd"
atf_set "timeout" 3600
}
zfsd_hotspare_001_pos_body()
@@ -150,7 +150,7 @@
zfsd_hotspare_002_pos_head()
{
atf_set "descr" "If a vdev becomes degraded, the spare will be activated."
- atf_set "require.progs" zpool zfsd zinject
+ atf_set "require.progs" "ksh93 zpool zfsd zinject"
atf_set "timeout" 3600
}
zfsd_hotspare_002_pos_body()
@@ -181,7 +181,7 @@
zfsd_hotspare_003_pos_head()
{
atf_set "descr" "A faulted vdev will be replaced by an available spare"
- atf_set "require.progs" zpool zfsd zinject
+ atf_set "require.progs" "ksh93 zpool zfsd zinject"
atf_set "timeout" 3600
}
zfsd_hotspare_003_pos_body()
@@ -212,7 +212,7 @@
zfsd_hotspare_004_pos_head()
{
atf_set "descr" "Removing a disk from a pool results in the spare activating"
- atf_set "require.progs" gnop zpool camcontrol zfsd
+ atf_set "require.progs" "ksh93 gnop zpool camcontrol zfsd"
atf_set "timeout" 3600
}
zfsd_hotspare_004_pos_body()
@@ -243,7 +243,7 @@
zfsd_hotspare_005_pos_head()
{
atf_set "descr" "A spare that is added to a degraded pool will be activated"
- atf_set "require.progs" zpool zfsd zinject
+ atf_set "require.progs" "ksh93 zpool zfsd zinject"
atf_set "timeout" 3600
}
zfsd_hotspare_005_pos_body()
@@ -273,7 +273,7 @@
zfsd_hotspare_006_pos_head()
{
atf_set "descr" "zfsd will replace two vdevs that fail simultaneously"
- atf_set "require.progs" zpool zfsd zinject
+ atf_set "require.progs" "ksh93 zpool zfsd zinject"
atf_set "timeout" 3600
}
zfsd_hotspare_006_pos_body()
@@ -303,7 +303,7 @@
zfsd_hotspare_007_pos_head()
{
atf_set "descr" "zfsd will swap failed drives at startup"
- atf_set "require.progs" gnop zpool camcontrol zfsd
+ atf_set "require.progs" "ksh93 gnop zpool camcontrol zfsd"
atf_set "timeout" 3600
}
zfsd_hotspare_007_pos_body()
@@ -334,7 +334,7 @@
zfsd_hotspare_008_neg_head()
{
atf_set "descr" "zfsd will not use newly added spares on replacing vdevs"
- atf_set "require.progs" zpool zfsd
+ atf_set "require.progs" "ksh93 zpool zfsd"
atf_set "timeout" 3600
}
zfsd_hotspare_008_neg_body()
@@ -364,7 +364,7 @@
zfsd_autoreplace_001_neg_head()
{
atf_set "descr" "A pool without autoreplace set will not replace by physical path"
- atf_set "require.progs" zpool camcontrol zfsd gnop
+ atf_set "require.progs" "ksh93 zpool camcontrol zfsd gnop"
atf_set "timeout" 3600
}
zfsd_autoreplace_001_neg_body()
@@ -394,7 +394,7 @@
zfsd_autoreplace_002_pos_head()
{
atf_set "descr" "A pool with autoreplace set will replace by physical path"
- atf_set "require.progs" gnop zpool zfsd
+ atf_set "require.progs" "ksh93 gnop zpool zfsd"
atf_set "timeout" 3600
}
zfsd_autoreplace_002_pos_body()
@@ -425,7 +425,7 @@
zfsd_autoreplace_003_pos_head()
{
atf_set "descr" "A pool with autoreplace set will replace by physical path even if a spare is active"
- atf_set "require.progs" zpool camcontrol zfsd gnop
+ atf_set "require.progs" "ksh93 zpool camcontrol zfsd gnop"
atf_set "timeout" 3600
}
zfsd_autoreplace_003_pos_body()
@@ -456,7 +456,7 @@
zfsd_replace_001_pos_head()
{
atf_set "descr" "ZFSD will automatically replace a SAS disk that disappears and reappears in the same location, with the same devname"
- atf_set "require.progs" zpool camcontrol zfsd zfs gnop
+ atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs gnop"
}
zfsd_replace_001_pos_body()
{
@@ -485,7 +485,7 @@
zfsd_replace_002_pos_head()
{
atf_set "descr" "zfsd will reactivate a pool after all disks are failed and reappeared"
- atf_set "require.progs" zpool camcontrol zfsd zfs
+ atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs"
}
zfsd_replace_002_pos_body()
{
@@ -514,7 +514,7 @@
zfsd_replace_003_pos_head()
{
atf_set "descr" "ZFSD will correctly replace disks that dissapear and reappear with different devnames"
- atf_set "require.progs" zpool camcontrol zfsd zfs gnop
+ atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs gnop"
}
zfsd_replace_003_pos_body()
{
@@ -542,7 +542,7 @@
zfsd_import_001_pos_head()
{
atf_set "descr" "If a removed drive gets reinserted while the pool is exported, it will detach its spare when imported."
- atf_set "require.progs" gnop zfsd zpool
+ atf_set "require.progs" "ksh93 gnop zfsd zpool"
atf_set "timeout" 3600
}
zfsd_import_001_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/zil/zil_test.sh b/tests/sys/cddl/zfs/tests/zil/zil_test.sh
--- a/tests/sys/cddl/zfs/tests/zil/zil_test.sh
+++ b/tests/sys/cddl/zfs/tests/zil/zil_test.sh
@@ -30,7 +30,7 @@
zil_001_pos_head()
{
atf_set "descr" "Verify that basic files and directory operations work"
- atf_set "require.progs" zfs zpool zdb
+ atf_set "require.progs" "ksh93 zfs zpool zdb"
}
zil_001_pos_body()
{
@@ -56,7 +56,7 @@
zil_002_pos_head()
{
atf_set "descr" "Verify that creating and deleting content works"
- atf_set "require.progs" zfs zpool zdb
+ atf_set "require.progs" "ksh93 zfs zpool zdb"
}
zil_002_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh b/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh
--- a/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh
+++ b/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh
@@ -30,7 +30,7 @@
zinject_001_pos_head()
{
atf_set "descr" "Verify fault inject handle content error successfully."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
zinject_001_pos_body()
@@ -56,7 +56,7 @@
zinject_002_pos_head()
{
atf_set "descr" "Verify fault inject handle metadnode error successfully."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
zinject_002_pos_body()
@@ -82,7 +82,7 @@
zinject_003_pos_head()
{
atf_set "descr" "Verify fault inject handle into first metadnodecause filesystem unmountable."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
zinject_003_pos_body()
@@ -108,7 +108,7 @@
zinject_004_pos_head()
{
atf_set "descr" "Verify fault inject handle device error successfully."
- atf_set "require.progs" zfs zpool
+ atf_set "require.progs" "ksh93 zfs zpool"
atf_set "timeout" 1800
}
zinject_004_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/zones/zones_test.sh b/tests/sys/cddl/zfs/tests/zones/zones_test.sh
--- a/tests/sys/cddl/zfs/tests/zones/zones_test.sh
+++ b/tests/sys/cddl/zfs/tests/zones/zones_test.sh
@@ -30,7 +30,7 @@
zones_001_pos_head()
{
atf_set "descr" "Local zone contains ZFS datasets as expected."
- atf_set "require.progs" zfs zoneadm zonecfg
+ atf_set "require.progs" "ksh93 zfs zoneadm zonecfg"
atf_set "timeout" 3600
}
zones_001_pos_body()
@@ -56,7 +56,7 @@
zones_002_pos_head()
{
atf_set "descr" "A ZFS fs is created when the parent dir of zonepath is a ZFS fs."
- atf_set "require.progs" zfs zoneadm zonecfg
+ atf_set "require.progs" "ksh93 zfs zoneadm zonecfg"
atf_set "timeout" 3600
}
zones_002_pos_body()
@@ -82,7 +82,7 @@
zones_003_pos_head()
{
atf_set "descr" "Zone cloning via ZFS snapshots works as expected."
- atf_set "require.progs" zfs zoneadm zonecfg
+ atf_set "require.progs" "ksh93 zfs zoneadm zonecfg"
atf_set "timeout" 3600
}
zones_003_pos_body()
@@ -108,7 +108,7 @@
zones_004_pos_head()
{
atf_set "descr" "A ZFS fs is destroyed when the zone it was created for is deleted."
- atf_set "require.progs" zfs zoneadm zonecfg
+ atf_set "require.progs" "ksh93 zfs zoneadm zonecfg"
atf_set "timeout" 3600
}
zones_004_pos_body()
@@ -134,7 +134,7 @@
zones_005_pos_head()
{
atf_set "descr" "Pool properties can be read but can't be set within a zone"
- atf_set "require.progs" zpool zonecfg zoneadm
+ atf_set "require.progs" "ksh93 zpool zonecfg zoneadm"
atf_set "timeout" 3600
}
zones_005_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh
--- a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh
+++ b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh
@@ -30,7 +30,7 @@
zvol_cli_001_pos_head()
{
atf_set "descr" "Executing well-formed 'zfs list' commands should return success"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zvol_cli_001_pos_body()
{
@@ -54,7 +54,7 @@
zvol_cli_002_pos_head()
{
atf_set "descr" "Creating a volume a 50 letter name should work."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zvol_cli_002_pos_body()
{
@@ -78,7 +78,7 @@
zvol_cli_003_neg_head()
{
atf_set "descr" "Try each ZFS volume sub-command without parameters to make sure it returns an error."
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zvol_cli_003_neg_body()
{
diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
--- a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
+++ b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
@@ -53,7 +53,7 @@
zvol_misc_002_pos_head()
{
atf_set "descr" "Verify that ZFS volume snapshot could be fscked"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
}
zvol_misc_002_pos_body()
{
@@ -77,7 +77,7 @@
zvol_misc_003_neg_head()
{
atf_set "descr" "Verify create storage pool or newfs over dump volume is denied."
- atf_set "require.progs" dumpadm zpool
+ atf_set "require.progs" "ksh93 dumpadm zpool"
}
zvol_misc_003_neg_body()
{
@@ -102,7 +102,7 @@
zvol_misc_004_pos_head()
{
atf_set "descr" "Verify permit to create snapshot over dumpswap."
- atf_set "require.progs" zfs swap
+ atf_set "require.progs" "ksh93 zfs swap"
}
zvol_misc_004_pos_body()
{
@@ -127,7 +127,7 @@
zvol_misc_005_neg_head()
{
atf_set "descr" "Verify a device cannot be dump and swap at the same time."
- atf_set "require.progs" dumpadm swap
+ atf_set "require.progs" "ksh93 dumpadm swap"
}
zvol_misc_005_neg_body()
{
@@ -152,7 +152,7 @@
zvol_misc_006_pos_head()
{
atf_set "descr" "zfs volume as dumpdevice should have 128k volblocksize"
- atf_set "require.progs" dumpadm zfs
+ atf_set "require.progs" "ksh93 dumpadm zfs"
}
zvol_misc_006_pos_body()
{
@@ -177,7 +177,7 @@
zvol_misc_007_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
zvol_misc_007_pos_body()
@@ -203,7 +203,7 @@
zvol_misc_008_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
zvol_misc_008_pos_body()
@@ -229,7 +229,7 @@
zvol_misc_009_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.progs" zfs
+ atf_set "require.progs" "ksh93 zfs"
atf_set "timeout" 1200
}
zvol_misc_009_pos_body()
diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_test.sh b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_test.sh
--- a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_test.sh
+++ b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_test.sh
@@ -30,7 +30,7 @@
zvol_swap_001_pos_head()
{
atf_set "descr" "Verify that a zvol can be used as a swap device"
- atf_set "require.progs" swap swapadd
+ atf_set "require.progs" "ksh93 swap swapadd"
}
zvol_swap_001_pos_body()
{
@@ -53,7 +53,7 @@
zvol_swap_002_pos_head()
{
atf_set "descr" "Using a zvol as swap space, fill with files until ENOSPC returned."
- atf_set "require.progs" swap swapadd
+ atf_set "require.progs" "ksh93 swap swapadd"
}
zvol_swap_002_pos_body()
{
@@ -76,7 +76,7 @@
zvol_swap_003_pos_head()
{
atf_set "descr" "Verify that a zvol device can be used as a swap devicethrough /etc/vfstab configuration."
- atf_set "require.progs" swapadd swap
+ atf_set "require.progs" "ksh93 swapadd swap"
}
zvol_swap_003_pos_body()
{
@@ -99,7 +99,7 @@
zvol_swap_004_pos_head()
{
atf_set "descr" "The minimum volume size should be a multiple of 2 pagesize bytes."
- atf_set "require.progs" zfs swap pagesize swapadd
+ atf_set "require.progs" "ksh93 zfs swap pagesize swapadd"
}
zvol_swap_004_pos_body()
{
@@ -122,7 +122,7 @@
zvol_swap_005_pos_head()
{
atf_set "descr" "swaplow + swaplen must be less than or equal to the volume size."
- atf_set "require.progs" swap pagesize swapadd
+ atf_set "require.progs" "ksh93 swap pagesize swapadd"
}
zvol_swap_005_pos_body()
{
@@ -145,7 +145,7 @@
zvol_swap_006_pos_head()
{
atf_set "descr" "Verify volume can be add as several segments, but overlappingare not allowed."
- atf_set "require.progs" swap pagesize swapadd
+ atf_set "require.progs" "ksh93 swap pagesize swapadd"
}
zvol_swap_006_pos_body()
{
diff --git a/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh b/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh
--- a/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh
+++ b/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh
@@ -30,7 +30,7 @@
zvol_thrash_001_pos_head()
{
atf_set "descr" "Cause frequent device removal and arrival in the prescence of zvols. ZFS should not misbehave while tasting them for VDev GUIDs."
- atf_set "require.progs" zfs zpool gnop
+ atf_set "require.progs" "ksh93 zfs zpool gnop"
atf_set "timeout" 900
}
zvol_thrash_001_pos_body()

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 10, 3:02 AM (21 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23515665
Default Alt Text
D29066.diff (198 KB)

Event Timeline