git: 0b86424c31ec - main - tests/sys/cddl: correctly quote atf_set "require.progs"
Alex Richardson
arichardson at FreeBSD.org
Mon Mar 8 09:44:08 UTC 2021
The branch main has been updated by arichardson:
URL: https://cgit.FreeBSD.org/src/commit/?id=0b86424c31ece31190c94d55feb5d190be4de5df
commit 0b86424c31ece31190c94d55feb5d190be4de5df
Author: Alex Richardson <arichardson at FreeBSD.org>
AuthorDate: 2021-03-08 09:38:24 +0000
Commit: Alex Richardson <arichardson at FreeBSD.org>
CommitDate: 2021-03-08 09:38:27 +0000
tests/sys/cddl: correctly quote atf_set "require.progs"
The argument has to be a single whitespace-separate value. While touching
all these lines also add ksh93, since `atf_set "require.progs"` overrides
the default value specified in the Kyuafile. This then results in tests
being executed despite ksh93 not being installed.
Reviewed By: asomers
Differential Revision: https://reviews.freebsd.org/D29066
---
tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh | 12 +--
.../zfs/tests/acl/nontrivial/nontrivial_test.sh | 34 ++++-----
.../sys/cddl/zfs/tests/acl/trivial/trivial_test.sh | 56 +++++++-------
tests/sys/cddl/zfs/tests/atime/atime_test.sh | 4 +-
tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh | 18 ++---
tests/sys/cddl/zfs/tests/cache/cache_test.sh | 22 +++---
.../sys/cddl/zfs/tests/cachefile/cachefile_test.sh | 8 +-
tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh | 2 +-
tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh | 6 +-
.../zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh | 18 ++---
.../tests/cli_root/zfs_copies/zfs_copies_test.sh | 12 +--
.../tests/cli_root/zfs_create/zfs_create_test.sh | 26 +++----
.../tests/cli_root/zfs_destroy/zfs_destroy_test.sh | 14 ++--
.../zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh | 2 +-
.../zfs/tests/cli_root/zfs_get/zfs_get_test.sh | 20 ++---
.../tests/cli_root/zfs_inherit/zfs_inherit_test.sh | 6 +-
.../zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh | 24 +++---
.../tests/cli_root/zfs_promote/zfs_promote_test.sh | 16 ++--
.../cli_root/zfs_property/zfs_property_test.sh | 2 +-
.../tests/cli_root/zfs_receive/zfs_receive_test.sh | 18 ++---
.../tests/cli_root/zfs_rename/zfs_rename_test.sh | 26 +++----
.../zfs_reservation/zfs_reservation_test.sh | 4 +-
.../cli_root/zfs_rollback/zfs_rollback_test.sh | 8 +-
.../zfs/tests/cli_root/zfs_send/zfs_send_test.sh | 8 +-
.../zfs/tests/cli_root/zfs_set/zfs_set_test.sh | 44 +++++------
.../zfs/tests/cli_root/zfs_share/zfs_share_test.sh | 22 +++---
.../cli_root/zfs_snapshot/zfs_snapshot_test.sh | 14 ++--
.../tests/cli_root/zfs_unmount/zfs_unmount_test.sh | 20 ++---
.../tests/cli_root/zfs_unshare/zfs_unshare_test.sh | 10 +--
.../tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh | 14 ++--
.../cddl/zfs/tests/cli_root/zpool/zpool_test.sh | 6 +-
.../zfs/tests/cli_root/zpool_add/zpool_add_test.sh | 20 ++---
.../cli_root/zpool_attach/zpool_attach_test.sh | 2 +-
.../tests/cli_root/zpool_clear/zpool_clear_test.sh | 10 +--
.../cli_root/zpool_create/zpool_create_test.sh | 40 +++++-----
.../cli_root/zpool_destroy/zpool_destroy_test.sh | 8 +-
.../cli_root/zpool_detach/zpool_detach_test.sh | 2 +-
.../cli_root/zpool_expand/zpool_expand_test.sh | 6 +-
.../cli_root/zpool_export/zpool_export_test.sh | 8 +-
.../zfs/tests/cli_root/zpool_get/zpool_get_test.sh | 8 +-
.../cli_root/zpool_history/zpool_history_test.sh | 4 +-
.../cli_root/zpool_import/zpool_import_test.sh | 46 ++++++------
.../cli_root/zpool_offline/zpool_offline_test.sh | 4 +-
.../cli_root/zpool_online/zpool_online_test.sh | 4 +-
.../cli_root/zpool_remove/zpool_remove_test.sh | 6 +-
.../cli_root/zpool_replace/zpool_replace_test.sh | 4 +-
.../tests/cli_root/zpool_scrub/zpool_scrub_test.sh | 10 +--
.../zfs/tests/cli_root/zpool_set/zpool_set_test.sh | 6 +-
.../cli_root/zpool_status/zpool_status_test.sh | 4 +-
.../cli_root/zpool_upgrade/zpool_upgrade_test.sh | 18 ++---
.../sys/cddl/zfs/tests/cli_user/misc/misc_test.sh | 86 +++++++++++-----------
.../zfs/tests/cli_user/zfs_list/zfs_list_test.sh | 16 ++--
.../cli_user/zpool_iostat/zpool_iostat_test.sh | 6 +-
.../tests/cli_user/zpool_list/zpool_list_test.sh | 4 +-
.../cddl/zfs/tests/compression/compression_test.sh | 6 +-
tests/sys/cddl/zfs/tests/ctime/ctime_test.sh | 2 +-
.../sys/cddl/zfs/tests/delegate/zfs_allow_test.sh | 24 +++---
.../cddl/zfs/tests/delegate/zfs_unallow_test.sh | 16 ++--
tests/sys/cddl/zfs/tests/devices/devices_test.sh | 4 +-
tests/sys/cddl/zfs/tests/exec/exec_test.sh | 4 +-
.../sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh | 2 +-
.../zfs/tests/grow_replicas/grow_replicas_test.sh | 2 +-
tests/sys/cddl/zfs/tests/history/history_test.sh | 20 ++---
tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh | 6 +-
tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh | 52 ++++++-------
.../cddl/zfs/tests/inheritance/inheritance_test.sh | 2 +-
tests/sys/cddl/zfs/tests/interop/interop_test.sh | 2 +-
tests/sys/cddl/zfs/tests/inuse/inuse_test.sh | 4 +-
tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh | 12 +--
.../zfs/tests/largest_pool/largest_pool_test.sh | 2 +-
.../cddl/zfs/tests/link_count/link_count_test.sh | 2 +-
.../sys/cddl/zfs/tests/migration/migration_test.sh | 24 +++---
tests/sys/cddl/zfs/tests/mmap/mmap_test.sh | 2 +-
tests/sys/cddl/zfs/tests/mount/mount_test.sh | 4 +-
tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh | 4 +-
tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh | 2 +-
tests/sys/cddl/zfs/tests/no_space/no_space_test.sh | 2 +-
.../tests/online_offline/online_offline_test.sh | 4 +-
.../cddl/zfs/tests/pool_names/pool_names_test.sh | 4 +-
.../cddl/zfs/tests/poolversion/poolversion_test.sh | 4 +-
tests/sys/cddl/zfs/tests/quota/quota_test.sh | 12 +--
.../cddl/zfs/tests/redundancy/redundancy_test.sh | 2 +-
tests/sys/cddl/zfs/tests/refquota/refquota_test.sh | 12 +--
.../sys/cddl/zfs/tests/refreserv/refreserv_test.sh | 10 +--
.../cddl/zfs/tests/replacement/replacement_test.sh | 6 +-
.../cddl/zfs/tests/reservation/reservation_test.sh | 36 ++++-----
tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh | 4 +-
tests/sys/cddl/zfs/tests/rsend/rsend_test.sh | 26 +++----
.../zfs/tests/scrub_mirror/scrub_mirror_test.sh | 8 +-
tests/sys/cddl/zfs/tests/slog/slog_test.sh | 28 +++----
tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh | 48 ++++++------
tests/sys/cddl/zfs/tests/snapused/snapused_test.sh | 10 +--
tests/sys/cddl/zfs/tests/sparse/sparse_test.sh | 2 +-
tests/sys/cddl/zfs/tests/truncate/truncate_test.sh | 2 +-
.../sys/cddl/zfs/tests/userquota/userquota_test.sh | 32 ++++----
.../cddl/zfs/tests/utils_test/utils_test_test.sh | 18 ++---
.../cddl/zfs/tests/write_dirs/write_dirs_test.sh | 4 +-
tests/sys/cddl/zfs/tests/xattr/xattr_test.sh | 26 +++----
tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh | 36 ++++-----
tests/sys/cddl/zfs/tests/zil/zil_test.sh | 4 +-
tests/sys/cddl/zfs/tests/zinject/zinject_test.sh | 8 +-
tests/sys/cddl/zfs/tests/zones/zones_test.sh | 10 +--
.../cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh | 6 +-
.../zfs/tests/zvol/zvol_misc/zvol_misc_test.sh | 16 ++--
.../zfs/tests/zvol/zvol_swap/zvol_swap_test.sh | 12 +--
.../cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh | 2 +-
106 files changed, 705 insertions(+), 705 deletions(-)
diff --git a/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh b/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh
index 01a14aac61ed..e05ad8b03912 100755
--- 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 @@ atf_test_case cifs_attr_001_pos cleanup
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 @@ atf_test_case cifs_attr_002_pos cleanup
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 @@ atf_test_case cifs_attr_003_pos cleanup
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
index 01abe61d532f..a75c25e9c721 100755
--- 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 @@ zfs_acl_chmod_002_pos_head()
{
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 @@ zfs_acl_chmod_aclmode_001_pos_head()
{
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 @@ zfs_acl_chmod_inherit_002_pos_head()
{
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 @@ zfs_acl_chmod_inherit_003_pos_head()
{
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 @@ zfs_acl_chmod_inherit_004_pos_head()
{
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 @@ atf_test_case zfs_acl_chmod_xattr_001_pos cleanup
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 @@ zfs_acl_chmod_xattr_002_pos_head()
{
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 @@ zfs_acl_cp_001_pos_head()
{
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 @@ atf_test_case zfs_acl_cp_002_pos cleanup
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 @@ zfs_acl_cpio_001_pos_head()
{
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 @@ atf_test_case zfs_acl_cpio_002_pos cleanup
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 @@ zfs_acl_tar_001_pos_head()
{
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 @@ atf_test_case zfs_acl_tar_002_pos cleanup
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
index f979cc30c145..26ee9f534084 100755
--- 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 @@ atf_test_case zfs_acl_compress_001_pos cleanup
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 @@ atf_test_case zfs_acl_cp_001_pos cleanup
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 @@ atf_test_case zfs_acl_cp_002_neg cleanup
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 @@ atf_test_case zfs_acl_cp_003_neg cleanup
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 @@ atf_test_case zfs_acl_find_001_pos cleanup
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 @@ atf_test_case zfs_acl_find_002_neg cleanup
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 @@ atf_test_case zfs_acl_ls_001_pos cleanup
zfs_acl_ls_001_pos_head()
{
atf_set "descr" "Verifies that ls displays @ in the file permissions using ls - at 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 @@ atf_test_case zfs_acl_ls_002_neg cleanup
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 @@ atf_test_case zfs_acl_mv_001_pos cleanup
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 @@ atf_test_case zfs_acl_pack_001_pos cleanup
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 @@ atf_test_case zfs_acl_pax_001_pos cleanup
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 @@ atf_test_case zfs_acl_pax_002_pos cleanup
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 @@ atf_test_case zfs_acl_pax_003_pos cleanup
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 @@ atf_test_case zfs_acl_pax_004_pos cleanup
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 @@ atf_test_case zfs_acl_pax_005_pos cleanup
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 @@ atf_test_case zfs_acl_pax_006_pos cleanup
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 @@ atf_test_case zfs_acl_tar_001_pos cleanup
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 @@ atf_test_case zfs_acl_tar_002_neg cleanup
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
index a36fc5c2eee2..7350c750ac3e 100755
--- a/tests/sys/cddl/zfs/tests/atime/atime_test.sh
+++ b/tests/sys/cddl/zfs/tests/atime/atime_test.sh
@@ -30,7 +30,7 @@ atf_test_case atime_001_pos cleanup
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 @@ atf_test_case atime_002_neg cleanup
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
index b6a9feb0f3ba..9cb52e73409c 100755
--- a/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh
+++ b/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh
@@ -30,7 +30,7 @@ atf_test_case bootfs_001_pos
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 @@ atf_test_case bootfs_002_neg
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 @@ atf_test_case bootfs_003_pos
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 @@ atf_test_case bootfs_004_neg
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 @@ atf_test_case bootfs_005_neg
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 @@ atf_test_case bootfs_006_pos
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 @@ atf_test_case bootfs_007_pos
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 @@ atf_test_case bootfs_008_neg
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 @@ bootfs_009_neg_head()
{
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
index f722dbf0efdc..cf420d1e2b41 100755
--- a/tests/sys/cddl/zfs/tests/cache/cache_test.sh
+++ b/tests/sys/cddl/zfs/tests/cache/cache_test.sh
@@ -30,7 +30,7 @@ atf_test_case cache_001_pos cleanup
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 @@ atf_test_case cache_002_pos cleanup
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 @@ atf_test_case cache_003_pos cleanup
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 @@ atf_test_case cache_004_neg cleanup
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 @@ atf_test_case cache_005_neg cleanup
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 @@ atf_test_case cache_006_pos cleanup
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 @@ atf_test_case cache_007_neg cleanup
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 @@ atf_test_case cache_008_neg cleanup
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 @@ atf_test_case cache_009_pos cleanup
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 @@ atf_test_case cache_010_neg cleanup
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 @@ atf_test_case cache_011_pos cleanup
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
index 04e7dc09f7e5..691ca66e3682 100755
--- a/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh
+++ b/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh
@@ -30,7 +30,7 @@ atf_test_case cachefile_001_pos
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 @@ atf_test_case cachefile_002_pos
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 @@ atf_test_case cachefile_003_pos
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 @@ atf_test_case cachefile_004_pos
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
index e75da9201b5d..60168a3da493 100755
--- 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 @@ atf_test_case zdb_001_neg cleanup
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
index 3d2270e28af8..aa96a7846983 100755
--- 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 @@ atf_test_case zfs_001_neg cleanup
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 @@ atf_test_case zfs_002_pos cleanup
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 @@ atf_test_case zfs_003_neg cleanup
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
index 5e82fd885ce1..d304770f419e 100755
--- 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 @@ atf_test_case zfs_clone_001_neg cleanup
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 @@ atf_test_case zfs_clone_002_pos cleanup
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 @@ atf_test_case zfs_clone_003_pos cleanup
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 @@ atf_test_case zfs_clone_004_pos cleanup
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 @@ atf_test_case zfs_clone_005_pos cleanup
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 @@ atf_test_case zfs_clone_006_pos cleanup
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 @@ atf_test_case zfs_clone_007_pos cleanup
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 @@ atf_test_case zfs_clone_008_neg cleanup
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 @@ atf_test_case zfs_clone_009_neg cleanup
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
index 121b94b80b92..d0cd94ae0484 100755
--- 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 @@ atf_test_case zfs_copies_001_pos cleanup
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 @@ atf_test_case zfs_copies_002_pos cleanup
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 @@ atf_test_case zfs_copies_003_pos cleanup
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 @@ atf_test_case zfs_copies_004_neg cleanup
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 @@ atf_test_case zfs_copies_005_neg cleanup
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 @@ atf_test_case zfs_copies_006_pos cleanup
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
index 00185dbf4a0b..a79a10263386 100755
--- 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 @@ atf_test_case zfs_create_001_pos cleanup
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 @@ atf_test_case zfs_create_002_pos cleanup
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 @@ atf_test_case zfs_create_003_pos cleanup
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 @@ atf_test_case zfs_create_004_pos cleanup
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 @@ atf_test_case zfs_create_005_pos cleanup
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 @@ atf_test_case zfs_create_006_pos cleanup
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 @@ atf_test_case zfs_create_007_pos cleanup
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 @@ atf_test_case zfs_create_008_neg cleanup
zfs_create_008_neg_head()
{
*** 5791 LINES SKIPPED ***
More information about the dev-commits-src-all
mailing list