Date: Wed, 30 Aug 2017 21:18:43 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323033 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/acl/cifs tests/acl/nontrivial tests/acl/trivial tests/atime tests/bootfs tests/cache tests/cachefile tests/clean_mirror... Message-ID: <201708302118.v7ULIhCL035682@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed Aug 30 21:18:43 2017 New Revision: 323033 URL: https://svnweb.freebsd.org/changeset/base/323033 Log: Reduce code duplication in the ZFS tests tests/sys/cddl/zfs/include/default.cfg.in tests/sys/cddl/zfs/tests/**/*_test.sh Define TESTCASE_ID in default.cfg instead of in every single test case. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/assertion_001_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/assertion_002_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/assertion_003_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/assertion_004_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/interop_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/large_files_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/link_count_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/migration_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/quota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/cross_endian_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/rebooting_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/sharing_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/rename_dirs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/sparse_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/threadsappend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/xattr_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/zones_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in Wed Aug 30 21:18:43 2017 (r323033) @@ -38,6 +38,8 @@ export STF_SUITE=%%STFSUITEDIR%% # Turn ATF variables into environment variables export DISKS=`atf_config_get disks ""` export KEEP=`atf_config_get keep_pools "" | ${SED} -E 's/ +/|/g'` +export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") + . $STF_SUITE/include/constants.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -33,7 +33,6 @@ cifs_attr_001_pos_head() } cifs_attr_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -43,7 +42,6 @@ cifs_attr_001_pos_body() } cifs_attr_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -61,7 +59,6 @@ cifs_attr_002_pos_head() } cifs_attr_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -71,7 +68,6 @@ cifs_attr_002_pos_body() } cifs_attr_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -89,7 +85,6 @@ cifs_attr_003_pos_head() } cifs_attr_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -99,7 +94,6 @@ cifs_attr_003_pos_body() } cifs_attr_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -32,7 +32,6 @@ zfs_acl_chmod_001_neg_head() } zfs_acl_chmod_001_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -41,7 +40,6 @@ zfs_acl_chmod_001_neg_body() } zfs_acl_chmod_001_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -58,7 +56,6 @@ zfs_acl_chmod_002_pos_head() } zfs_acl_chmod_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -67,7 +64,6 @@ zfs_acl_chmod_002_pos_body() } zfs_acl_chmod_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -84,7 +80,6 @@ zfs_acl_chmod_aclmode_001_pos_head() } zfs_acl_chmod_aclmode_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -93,7 +88,6 @@ zfs_acl_chmod_aclmode_001_pos_body() } zfs_acl_chmod_aclmode_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -109,7 +103,6 @@ zfs_acl_chmod_compact_001_pos_head() } zfs_acl_chmod_compact_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -118,7 +111,6 @@ zfs_acl_chmod_compact_001_pos_body() } zfs_acl_chmod_compact_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -134,7 +126,6 @@ zfs_acl_chmod_delete_001_pos_head() } zfs_acl_chmod_delete_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -143,7 +134,6 @@ zfs_acl_chmod_delete_001_pos_body() } zfs_acl_chmod_delete_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -159,7 +149,6 @@ zfs_acl_chmod_inherit_001_pos_head() } zfs_acl_chmod_inherit_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -168,7 +157,6 @@ zfs_acl_chmod_inherit_001_pos_body() } zfs_acl_chmod_inherit_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -185,7 +173,6 @@ zfs_acl_chmod_inherit_002_pos_head() } zfs_acl_chmod_inherit_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -194,7 +181,6 @@ zfs_acl_chmod_inherit_002_pos_body() } zfs_acl_chmod_inherit_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -211,7 +197,6 @@ zfs_acl_chmod_inherit_003_pos_head() } zfs_acl_chmod_inherit_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -220,7 +205,6 @@ zfs_acl_chmod_inherit_003_pos_body() } zfs_acl_chmod_inherit_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -237,7 +221,6 @@ zfs_acl_chmod_inherit_004_pos_head() } zfs_acl_chmod_inherit_004_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -246,7 +229,6 @@ zfs_acl_chmod_inherit_004_pos_body() } zfs_acl_chmod_inherit_004_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -262,7 +244,6 @@ zfs_acl_chmod_owner_001_pos_head() } zfs_acl_chmod_owner_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -271,7 +252,6 @@ zfs_acl_chmod_owner_001_pos_body() } zfs_acl_chmod_owner_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -287,7 +267,6 @@ zfs_acl_chmod_rwacl_001_pos_head() } zfs_acl_chmod_rwacl_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -296,7 +275,6 @@ zfs_acl_chmod_rwacl_001_pos_body() } zfs_acl_chmod_rwacl_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -312,7 +290,6 @@ zfs_acl_chmod_rwx_001_pos_head() } zfs_acl_chmod_rwx_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -321,7 +298,6 @@ zfs_acl_chmod_rwx_001_pos_body() } zfs_acl_chmod_rwx_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -337,7 +313,6 @@ zfs_acl_chmod_rwx_002_pos_head() } zfs_acl_chmod_rwx_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -346,7 +321,6 @@ zfs_acl_chmod_rwx_002_pos_body() } zfs_acl_chmod_rwx_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -362,7 +336,6 @@ zfs_acl_chmod_rwx_003_pos_head() } zfs_acl_chmod_rwx_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -371,7 +344,6 @@ zfs_acl_chmod_rwx_003_pos_body() } zfs_acl_chmod_rwx_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -387,7 +359,6 @@ zfs_acl_chmod_rwx_004_pos_head() } zfs_acl_chmod_rwx_004_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -396,7 +367,6 @@ zfs_acl_chmod_rwx_004_pos_body() } zfs_acl_chmod_rwx_004_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -413,7 +383,6 @@ zfs_acl_chmod_xattr_001_pos_head() } zfs_acl_chmod_xattr_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -422,7 +391,6 @@ zfs_acl_chmod_xattr_001_pos_body() } zfs_acl_chmod_xattr_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -439,7 +407,6 @@ zfs_acl_chmod_xattr_002_pos_head() } zfs_acl_chmod_xattr_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -448,7 +415,6 @@ zfs_acl_chmod_xattr_002_pos_body() } zfs_acl_chmod_xattr_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -465,7 +431,6 @@ zfs_acl_cp_001_pos_head() } zfs_acl_cp_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -474,7 +439,6 @@ zfs_acl_cp_001_pos_body() } zfs_acl_cp_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -491,7 +455,6 @@ zfs_acl_cp_002_pos_head() } zfs_acl_cp_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -500,7 +463,6 @@ zfs_acl_cp_002_pos_body() } zfs_acl_cp_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -517,7 +479,6 @@ zfs_acl_cpio_001_pos_head() } zfs_acl_cpio_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -526,7 +487,6 @@ zfs_acl_cpio_001_pos_body() } zfs_acl_cpio_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -543,7 +503,6 @@ zfs_acl_cpio_002_pos_head() } zfs_acl_cpio_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -552,7 +511,6 @@ zfs_acl_cpio_002_pos_body() } zfs_acl_cpio_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -568,7 +526,6 @@ zfs_acl_find_001_pos_head() } zfs_acl_find_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -577,7 +534,6 @@ zfs_acl_find_001_pos_body() } zfs_acl_find_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -593,7 +549,6 @@ zfs_acl_ls_001_pos_head() } zfs_acl_ls_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -602,7 +557,6 @@ zfs_acl_ls_001_pos_body() } zfs_acl_ls_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -618,7 +572,6 @@ zfs_acl_mv_001_pos_head() } zfs_acl_mv_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -627,7 +580,6 @@ zfs_acl_mv_001_pos_body() } zfs_acl_mv_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -644,7 +596,6 @@ zfs_acl_tar_001_pos_head() } zfs_acl_tar_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -653,7 +604,6 @@ zfs_acl_tar_001_pos_body() } zfs_acl_tar_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -670,7 +620,6 @@ zfs_acl_tar_002_pos_head() } zfs_acl_tar_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -679,7 +628,6 @@ zfs_acl_tar_002_pos_body() } zfs_acl_tar_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -31,7 +31,6 @@ zfs_acl_chmod_001_pos_head() } zfs_acl_chmod_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -40,7 +39,6 @@ zfs_acl_chmod_001_pos_body() } zfs_acl_chmod_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -56,7 +54,6 @@ zfs_acl_compress_001_pos_head() } zfs_acl_compress_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -65,7 +62,6 @@ zfs_acl_compress_001_pos_body() } zfs_acl_compress_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -81,7 +77,6 @@ zfs_acl_cp_001_pos_head() } zfs_acl_cp_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -90,7 +85,6 @@ zfs_acl_cp_001_pos_body() } zfs_acl_cp_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -106,7 +100,6 @@ zfs_acl_cp_002_neg_head() } zfs_acl_cp_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -115,7 +108,6 @@ zfs_acl_cp_002_neg_body() } zfs_acl_cp_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -132,7 +124,6 @@ zfs_acl_cp_003_neg_head() } zfs_acl_cp_003_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -141,7 +132,6 @@ zfs_acl_cp_003_neg_body() } zfs_acl_cp_003_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -157,7 +147,6 @@ zfs_acl_find_001_pos_head() } zfs_acl_find_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -166,7 +155,6 @@ zfs_acl_find_001_pos_body() } zfs_acl_find_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -183,7 +171,6 @@ zfs_acl_find_002_neg_head() } zfs_acl_find_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -192,7 +179,6 @@ zfs_acl_find_002_neg_body() } zfs_acl_find_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -208,7 +194,6 @@ zfs_acl_ls_001_pos_head() } zfs_acl_ls_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -217,7 +202,6 @@ zfs_acl_ls_001_pos_body() } zfs_acl_ls_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -234,7 +218,6 @@ zfs_acl_ls_002_neg_head() } zfs_acl_ls_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -243,7 +226,6 @@ zfs_acl_ls_002_neg_body() } zfs_acl_ls_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -259,7 +241,6 @@ zfs_acl_mv_001_pos_head() } zfs_acl_mv_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -268,7 +249,6 @@ zfs_acl_mv_001_pos_body() } zfs_acl_mv_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -285,7 +265,6 @@ zfs_acl_pack_001_pos_head() } zfs_acl_pack_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -294,7 +273,6 @@ zfs_acl_pack_001_pos_body() } zfs_acl_pack_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -311,7 +289,6 @@ zfs_acl_pax_001_pos_head() } zfs_acl_pax_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -320,7 +297,6 @@ zfs_acl_pax_001_pos_body() } zfs_acl_pax_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -337,7 +313,6 @@ zfs_acl_pax_002_pos_head() } zfs_acl_pax_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -346,7 +321,6 @@ zfs_acl_pax_002_pos_body() } zfs_acl_pax_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -363,7 +337,6 @@ zfs_acl_pax_003_pos_head() } zfs_acl_pax_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -372,7 +345,6 @@ zfs_acl_pax_003_pos_body() } zfs_acl_pax_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -389,7 +361,6 @@ zfs_acl_pax_004_pos_head() } zfs_acl_pax_004_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -398,7 +369,6 @@ zfs_acl_pax_004_pos_body() } zfs_acl_pax_004_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -415,7 +385,6 @@ zfs_acl_pax_005_pos_head() } zfs_acl_pax_005_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -424,7 +393,6 @@ zfs_acl_pax_005_pos_body() } zfs_acl_pax_005_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -441,7 +409,6 @@ zfs_acl_pax_006_pos_head() } zfs_acl_pax_006_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -450,7 +417,6 @@ zfs_acl_pax_006_pos_body() } zfs_acl_pax_006_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -466,7 +432,6 @@ zfs_acl_tar_001_pos_head() } zfs_acl_tar_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -475,7 +440,6 @@ zfs_acl_tar_001_pos_body() } zfs_acl_tar_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -491,7 +455,6 @@ zfs_acl_tar_002_neg_head() } zfs_acl_tar_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -500,7 +463,6 @@ zfs_acl_tar_002_neg_body() } zfs_acl_tar_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -32,7 +32,6 @@ atime_001_pos_head() } atime_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg @@ -42,7 +41,6 @@ atime_001_pos_body() } atime_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg @@ -59,7 +57,6 @@ atime_002_neg_head() } atime_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg @@ -69,7 +66,6 @@ atime_002_neg_body() } atime_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -32,7 +32,6 @@ bootfs_001_pos_head() } bootfs_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -48,7 +47,6 @@ bootfs_002_neg_head() } bootfs_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -64,7 +62,6 @@ bootfs_003_pos_head() } bootfs_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -80,7 +77,6 @@ bootfs_004_neg_head() } bootfs_004_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -96,7 +92,6 @@ bootfs_005_neg_head() } bootfs_005_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -112,7 +107,6 @@ bootfs_006_pos_head() } bootfs_006_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -128,7 +122,6 @@ bootfs_007_pos_head() } bootfs_007_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -144,7 +137,6 @@ bootfs_008_neg_head() } bootfs_008_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -161,7 +153,6 @@ bootfs_009_neg_head() } bootfs_009_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -33,7 +33,6 @@ cache_001_pos_head() } cache_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -43,7 +42,6 @@ cache_001_pos_body() } cache_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -61,7 +59,6 @@ cache_002_pos_head() } cache_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -71,7 +68,6 @@ cache_002_pos_body() } cache_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -89,7 +85,6 @@ cache_003_pos_head() } cache_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -99,7 +94,6 @@ cache_003_pos_body() } cache_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -117,7 +111,6 @@ cache_004_neg_head() } cache_004_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -127,7 +120,6 @@ cache_004_neg_body() } cache_004_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -145,7 +137,6 @@ cache_005_neg_head() } cache_005_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -155,7 +146,6 @@ cache_005_neg_body() } cache_005_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -173,7 +163,6 @@ cache_006_pos_head() } cache_006_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -183,7 +172,6 @@ cache_006_pos_body() } cache_006_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -201,7 +189,6 @@ cache_007_neg_head() } cache_007_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -211,7 +198,6 @@ cache_007_neg_body() *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708302118.v7ULIhCL035682>