Index: 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_destroy/zfs_destroy_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh	(revision 323035)
@@ -1,221 +1,220 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zfs_destroy_001_pos cleanup
 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 "timeout" 3600
 }
 zfs_destroy_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_destroy_001_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_destroy_002_pos cleanup
 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 "timeout" 3600
 }
 zfs_destroy_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_destroy_002_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_destroy_003_pos cleanup
 zfs_destroy_003_pos_head()
 {
 	atf_set "descr" "Verify that 'zfs destroy [-rR]' succeeds as root."
 	atf_set "require.progs"  zfs
 	atf_set "timeout" 3600
 }
 zfs_destroy_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_destroy_003_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_destroy_004_pos cleanup
 zfs_destroy_004_pos_head()
 {
 	atf_set "descr" "Verify that 'zfs destroy -f' succeeds as root."
 	atf_set "require.progs"  zfs
 	atf_set "timeout" 3600
 }
 zfs_destroy_004_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_destroy_004_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_004_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_destroy_005_neg cleanup
 zfs_destroy_005_neg_head()
 {
 	atf_set "descr" "Seperately verify 'zfs destroy -f|-r|-rf|-R|-rR <dataset>' willfail in different conditions."
 	atf_set "require.progs"  zfs
 	atf_set "timeout" 3600
 }
 zfs_destroy_005_neg_body()
 {
 	atf_fail "This test causes a panic on FreeBSD"
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_destroy_005_neg.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_005_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_destroy_006_neg cleanup
 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 "timeout" 3600
 }
 zfs_destroy_006_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_destroy_006_neg.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_006_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_destroy_007_neg cleanup
 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 "timeout" 3600
 }
 zfs_destroy_007_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_destroy_007_neg.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_007_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_destroy_common.kshlib
 	. $(atf_get_srcdir)/zfs_destroy.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case zfs_destroy_001_pos
 	atf_add_test_case zfs_destroy_002_pos
 	atf_add_test_case zfs_destroy_003_pos
 	atf_add_test_case zfs_destroy_004_pos
 	atf_add_test_case zfs_destroy_005_neg
 	atf_add_test_case zfs_destroy_006_neg
 	atf_add_test_case zfs_destroy_007_neg
 }
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh	(revision 323035)
@@ -1,56 +1,54 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2017 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zfs_diff_001_pos cleanup
 zfs_diff_001_pos_head()
 {
 	atf_set "descr" "zfs diff output for typical operations"
 	atf_set "require.progs"  zfs
 }
 zfs_diff_001_pos_body()
 {
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	atf_expect_fail "PR221234 ZFS diff does not properly display files that have been moved to a new directory."
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_diff.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_diff_001_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_diff_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)/zfs_diff.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case zfs_diff_001_pos
 }
Index: 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_unmount/zfs_unmount_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh	(revision 323035)
@@ -1,298 +1,297 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zfs_unmount_001_pos cleanup
 zfs_unmount_001_pos_head()
 {
 	atf_set "descr" "Verify the u[n]mount [-f] sub-command."
 	atf_set "require.progs"  zfs
 }
 zfs_unmount_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_001_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_002_pos cleanup
 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
 }
 zfs_unmount_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_002_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_003_pos cleanup
 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
 }
 zfs_unmount_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_003_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_004_pos cleanup
 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
 }
 zfs_unmount_004_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_004_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_004_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_005_pos cleanup
 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
 }
 zfs_unmount_005_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_005_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_005_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_006_pos cleanup
 zfs_unmount_006_pos_head()
 {
 	atf_set "descr" "Re-creating zfs files, 'zfs unmount' still succeed."
 	atf_set "require.progs"  zfs
 }
 zfs_unmount_006_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_006_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_006_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_007_neg cleanup
 zfs_unmount_007_neg_head()
 {
 	atf_set "descr" "Badly-formed 'zfs $unmountcmd' with inapplicable scenariosshould return an error."
 	atf_set "require.progs"  zfs
 }
 zfs_unmount_007_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_007_neg.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_007_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_008_neg cleanup
 zfs_unmount_008_neg_head()
 {
 	atf_set "descr" "zfs unmount fails with bad parameters or scenarios"
 	atf_set "require.progs"  zfs
 }
 zfs_unmount_008_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_008_neg.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_008_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_009_pos cleanup
 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
 }
 zfs_unmount_009_pos_body()
 {
 	atf_fail "This test causes a panic on FreeBSD"
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	[[ -n "$KEEP" ]] && \
 		atf_skip "Can't test unmount -a when pools are in KEEP"
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_009_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_009_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_all_001_pos cleanup
 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
 }
 zfs_unmount_all_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	[[ -n "$KEEP" ]] && \
 		atf_skip "Can't test unmount -a when pools are in KEEP"
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_unmount_all_001_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_all_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_unmount.kshlib
 	. $(atf_get_srcdir)/zfs_unmount.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case zfs_unmount_001_pos
 	atf_add_test_case zfs_unmount_002_pos
 	atf_add_test_case zfs_unmount_003_pos
 	atf_add_test_case zfs_unmount_004_pos
 	atf_add_test_case zfs_unmount_005_pos
 	atf_add_test_case zfs_unmount_006_pos
 	atf_add_test_case zfs_unmount_007_neg
 	atf_add_test_case zfs_unmount_008_neg
 	atf_add_test_case zfs_unmount_009_pos
 	atf_add_test_case zfs_unmount_all_001_pos
 }
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh	(revision 323035)
@@ -1,114 +1,108 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zpool_expand_001_pos cleanup
 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
 }
 zpool_expand_001_pos_body()
 {
 	atf_fail "This test causes a panic on FreeBSD"
 	atf_expect_fail 'BUG26166 cannot create pools on zvols'
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_expand.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_expand_001_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_expand_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)/zpool_expand.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_expand_002_pos cleanup
 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
 }
 zpool_expand_002_pos_body()
 {
 	atf_fail "This test causes a panic on FreeBSD"
 	atf_expect_fail 'BUG26166 cannot create pools on zvols'
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_expand.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_expand_002_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_expand_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)/zpool_expand.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_expand_003_neg cleanup
 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
 }
 zpool_expand_003_neg_body()
 {
 	atf_fail "This test causes a panic on FreeBSD"
 	atf_expect_fail 'BUG26166 cannot create pools on zvols'
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_expand.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_expand_003_neg.ksh || atf_fail "Testcase failed"
 }
 zpool_expand_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)/zpool_expand.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case zpool_expand_001_pos
 	atf_add_test_case zpool_expand_002_pos
 	atf_add_test_case zpool_expand_003_neg
 }
Index: 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_root/zpool_upgrade/zpool_upgrade_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh	(revision 323035)
@@ -1,291 +1,287 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zpool_upgrade_001_pos cleanup
 zpool_upgrade_001_pos_head()
 {
 	atf_set "descr" "Executing 'zpool upgrade -v' command succeeds."
 	atf_set "require.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_001_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_002_pos cleanup
 zpool_upgrade_002_pos_head()
 {
 	atf_set "descr" "Import pools of all versions - zpool upgrade on each pools works"
 	atf_set "require.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_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)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_002_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_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)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_003_pos cleanup
 zpool_upgrade_003_pos_head()
 {
 	atf_set "descr" "Upgrading a pool that has already been upgraded succeeds."
 	atf_set "require.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_003_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_004_pos cleanup
 zpool_upgrade_004_pos_head()
 {
 	atf_set "descr" "zpool upgrade -a works"
 	atf_set "require.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_004_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	[[ -n "$KEEP" ]] && \
 		atf_skip "Can't test unmount -a when pools are in KEEP"
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_004_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_004_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_005_neg cleanup
 zpool_upgrade_005_neg_head()
 {
 	atf_set "descr" "Variations of upgrade -v print usage message,return with non-zero status"
 	atf_set "require.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_005_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_005_neg.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_005_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_006_neg cleanup
 zpool_upgrade_006_neg_head()
 {
 	atf_set "descr" "Attempting to upgrade a non-existent pool will return an error"
 	atf_set "require.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_006_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_006_neg.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_006_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_007_pos cleanup
 zpool_upgrade_007_pos_head()
 {
 	atf_set "descr" "Import pools of all versions - 'zfs upgrade' on each pools works"
 	atf_set "require.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	# This test can take quite a while, especially on debug bits.
 	atf_set "timeout" 7200
 }
 zpool_upgrade_007_pos_body()
 {
 	atf_fail "This test causes a panic on FreeBSD"
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_007_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_007_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)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_008_pos cleanup
 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.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_008_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_008_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_008_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_009_neg cleanup
 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.config" at_least_2_disks
 	atf_set "require.progs"  zpool
 	atf_set "timeout" 1800
 }
 zpool_upgrade_009_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_upgrade_009_neg.ksh || atf_fail "Testcase failed"
 }
 zpool_upgrade_009_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case zpool_upgrade_001_pos
 	atf_add_test_case zpool_upgrade_002_pos
 	atf_add_test_case zpool_upgrade_003_pos
 	atf_add_test_case zpool_upgrade_004_pos
 	atf_add_test_case zpool_upgrade_005_neg
 	atf_add_test_case zpool_upgrade_006_neg
 	atf_add_test_case zpool_upgrade_007_pos
 	atf_add_test_case zpool_upgrade_008_pos
 	atf_add_test_case zpool_upgrade_009_neg
 }
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh	(revision 323035)
@@ -1,1106 +1,1102 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zdb_001_neg cleanup
 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.user" root
 }
 zdb_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zdb_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zdb_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_001_neg cleanup
 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.user" root
 }
 zfs_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_allow_001_neg cleanup
 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.user" root
 }
 zfs_allow_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_allow_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_allow_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_clone_001_neg cleanup
 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.user" root
 }
 zfs_clone_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_clone_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_clone_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_create_001_neg cleanup
 zfs_create_001_neg_head()
 {
 	atf_set "descr" "Verify zfs create without parameters fails."
 	atf_set "require.progs"  zfs fgrep zpool
 	atf_set "require.user" root
 }
 zfs_create_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_create_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_create_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_destroy_001_neg cleanup
 zfs_destroy_001_neg_head()
 {
 	atf_set "descr" "zfs destroy [-f|-r] [fs|snap]"
 	atf_set "require.progs"  zfs fgrep zpool
 	atf_set "require.user" root
 }
 zfs_destroy_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_destroy_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_destroy_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_get_001_neg cleanup
 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.user" root
 }
 zfs_get_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_get_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_get_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_inherit_001_neg cleanup
 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.user" root
 }
 zfs_inherit_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_inherit_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_inherit_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_mount_001_neg cleanup
 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.user" root
 }
 zfs_mount_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_mount_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_mount_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_promote_001_neg cleanup
 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.user" root
 }
 zfs_promote_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_promote_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_promote_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_receive_001_neg cleanup
 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.user" root
 }
 zfs_receive_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_receive_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_receive_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_rename_001_neg cleanup
 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.user" root
 }
 zfs_rename_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_rename_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_rename_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_rollback_001_neg cleanup
 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.user" root
 }
 zfs_rollback_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_rollback_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_rollback_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_send_001_neg cleanup
 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.user" root
 }
 zfs_send_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_send_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_send_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_set_001_neg cleanup
 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.user" root
 }
 zfs_set_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_set_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_set_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_share_001_neg cleanup
 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.user" root
 }
 zfs_share_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_share_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_share_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_snapshot_001_neg cleanup
 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.user" root
 }
 zfs_snapshot_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_snapshot_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_snapshot_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unallow_001_neg cleanup
 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.user" root
 }
 zfs_unallow_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_unallow_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_unallow_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unmount_001_neg cleanup
 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.user" root
 }
 zfs_unmount_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_unmount_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_unmount_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_unshare_001_neg cleanup
 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.user" root
 }
 zfs_unshare_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_unshare_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_unshare_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zfs_upgrade_001_neg cleanup
 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.user" root
 }
 zfs_upgrade_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_upgrade_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zfs_upgrade_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_001_neg cleanup
 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.user" root
 }
 zpool_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_add_001_neg cleanup
 zpool_add_001_neg_head()
 {
 	atf_set "descr" "zpool add [-fn] pool_name vdev"
 	atf_set "require.progs"  zfs zpool fgrep
 	atf_set "require.user" root
 }
 zpool_add_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_add_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_add_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_add_002_pos cleanup
 zpool_add_001_neg_head()
 {
 	atf_set "descr" "zpool add [-f] -n succeeds for unpriveleged users"
 	atf_set "require.progs"  zfs zpool
 	atf_set "require.user" root
 }
 zpool_add_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_add_002_pos.ksh" || atf_fail "Testcase failed"
 }
 zpool_add_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_attach_001_neg cleanup
 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.user" root
 }
 zpool_attach_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_attach_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_attach_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_clear_001_neg cleanup
 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.user" root
 }
 zpool_clear_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_clear_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_clear_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_create_001_neg cleanup
 zpool_create_001_neg_head()
 {
 	atf_set "descr" "zpool create [-f] fails for unpriveleged users"
 	atf_set "require.progs"  zfs zpool
 	atf_set "require.user" root
 }
 zpool_create_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)/misc.cfg
 
 	# No setup is required for this test.
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_create_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_create_001_neg_cleanup()
 {
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_create_002_pos cleanup
 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.user" root
 }
 zpool_create_002_pos_body()
 {
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 
 	# No setup is required for this test.
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_create_002_pos.ksh" || atf_fail "Testcase failed"
 }
 zpool_create_002_pos_cleanup()
 {
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../../include/default.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_destroy_001_neg cleanup
 zpool_destroy_001_neg_head()
 {
 	atf_set "descr" "zpool destroy [-f] [pool_name ...]"
 	atf_set "require.progs"  zfs zpool fgrep
 	atf_set "require.user" root
 }
 zpool_destroy_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_destroy_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_destroy_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_detach_001_neg cleanup
 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.user" root
 }
 zpool_detach_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_detach_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_detach_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_export_001_neg cleanup
 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.user" root
 }
 zpool_export_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_export_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_export_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_get_001_neg cleanup
 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.user" root
 }
 zpool_get_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_get_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_get_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_history_001_neg cleanup
 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.user" root
 }
 zpool_history_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_history_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_history_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_001_neg cleanup
 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.user" root
 }
 zpool_import_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_import_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_import_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_import_002_neg cleanup
 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.user" root
 }
 zpool_import_002_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_import_002_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_import_002_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_offline_001_neg cleanup
 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.user" root
 }
 zpool_offline_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_offline_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_offline_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_online_001_neg cleanup
 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.user" root
 }
 zpool_online_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_online_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_online_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_remove_001_neg cleanup
 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.user" root
 }
 zpool_remove_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_remove_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_remove_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_replace_001_neg cleanup
 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.user" root
 }
 zpool_replace_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_replace_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_replace_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_scrub_001_neg cleanup
 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.user" root
 }
 zpool_scrub_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_scrub_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_scrub_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_set_001_neg cleanup
 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.user" root
 }
 zpool_set_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_set_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_set_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_status_001_neg cleanup
 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.user" root
 }
 zpool_status_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_status_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_status_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zpool_upgrade_001_neg cleanup
 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.user" root
 }
 zpool_upgrade_001_neg_body()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_upgrade_001_neg.ksh" || atf_fail "Testcase failed"
 }
 zpool_upgrade_001_neg_cleanup()
 {
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/misc.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case zdb_001_neg
 	atf_add_test_case zfs_001_neg
 	atf_add_test_case zfs_allow_001_neg
 	atf_add_test_case zfs_clone_001_neg
 	atf_add_test_case zfs_create_001_neg
 	atf_add_test_case zfs_destroy_001_neg
 	atf_add_test_case zfs_get_001_neg
 	atf_add_test_case zfs_inherit_001_neg
 	atf_add_test_case zfs_mount_001_neg
 	atf_add_test_case zfs_promote_001_neg
 	atf_add_test_case zfs_receive_001_neg
 	atf_add_test_case zfs_rename_001_neg
 	atf_add_test_case zfs_rollback_001_neg
 	atf_add_test_case zfs_send_001_neg
 	atf_add_test_case zfs_set_001_neg
 	atf_add_test_case zfs_share_001_neg
 	atf_add_test_case zfs_snapshot_001_neg
 	atf_add_test_case zfs_unallow_001_neg
 	atf_add_test_case zfs_unmount_001_neg
 	atf_add_test_case zfs_unshare_001_neg
 	atf_add_test_case zfs_upgrade_001_neg
 	atf_add_test_case zpool_001_neg
 	atf_add_test_case zpool_add_001_neg
 	atf_add_test_case zpool_add_002_pos
 	atf_add_test_case zpool_attach_001_neg
 	atf_add_test_case zpool_clear_001_neg
 	atf_add_test_case zpool_create_001_neg
 	atf_add_test_case zpool_create_002_pos
 	atf_add_test_case zpool_destroy_001_neg
 	atf_add_test_case zpool_detach_001_neg
 	atf_add_test_case zpool_export_001_neg
 	atf_add_test_case zpool_get_001_neg
 	atf_add_test_case zpool_history_001_neg
 	atf_add_test_case zpool_import_001_neg
 	atf_add_test_case zpool_import_002_neg
 	atf_add_test_case zpool_offline_001_neg
 	atf_add_test_case zpool_online_001_neg
 	atf_add_test_case zpool_remove_001_neg
 	atf_add_test_case zpool_replace_001_neg
 	atf_add_test_case zpool_scrub_001_neg
 	atf_add_test_case zpool_set_001_neg
 	atf_add_test_case zpool_status_001_neg
 	atf_add_test_case zpool_upgrade_001_neg
 }
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh	(revision 323035)
@@ -1,268 +1,266 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case utils_test_001_pos cleanup
 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
 }
 utils_test_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_001_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_002_pos cleanup
 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
 }
 utils_test_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_002_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_003_pos cleanup
 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
 }
 utils_test_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_003_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_004_pos cleanup
 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
 }
 utils_test_004_pos_body()
 {
 	atf_expect_fail "FreeBSD's quotaon utility exits 0 even when you supply a nonexistent filesystem"
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_004_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_004_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_005_pos cleanup
 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
 }
 utils_test_005_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_005_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_005_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_006_pos cleanup
 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
 }
 utils_test_006_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_006_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_006_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_007_pos cleanup
 utils_test_007_pos_head()
 {
 	atf_set "descr" "Ensure that the fstyp(1M) utility succeeds on a ZFS file system."
 	atf_set "require.config" disks_are_physical
 	atf_set "require.progs"  zfs fstyp
 }
 utils_test_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)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_007_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_007_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)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_008_pos cleanup
 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
 }
 utils_test_008_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_008_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_008_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case utils_test_009_pos cleanup
 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
 }
 utils_test_009_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/utils_test_009_pos.ksh || atf_fail "Testcase failed"
 }
 utils_test_009_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/utils_test.kshlib
 	. $(atf_get_srcdir)/utils_test.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case utils_test_001_pos
 	atf_add_test_case utils_test_002_pos
 	atf_add_test_case utils_test_003_pos
 	atf_add_test_case utils_test_004_pos
 	atf_add_test_case utils_test_005_pos
 	atf_add_test_case utils_test_006_pos
 	atf_add_test_case utils_test_007_pos
 	atf_add_test_case utils_test_008_pos
 	atf_add_test_case utils_test_009_pos
 }
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh	(revision 323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh	(revision 323035)
@@ -1,85 +1,83 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case zil_001_pos cleanup
 zil_001_pos_head()
 {
 	atf_set "descr" "Verify that basic files and directory operations work"
 	atf_set "require.progs"  zfs zpool zdb
 }
 zil_001_pos_body()
 {
 	atf_fail "This test causes a panic on FreeBSD"
-	export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ")
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/zil.kshlib
 	. $(atf_get_srcdir)/zil.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zil_001_pos.ksh || atf_fail "Testcase failed"
 }
 zil_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)/zil.kshlib
 	. $(atf_get_srcdir)/zil.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case zil_002_pos cleanup
 zil_002_pos_head()
 {
 	atf_set "descr" "Verify that creating and deleting content works"
 	atf_set "require.progs"  zfs zpool zdb
 }
 zil_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/zil.kshlib
 	. $(atf_get_srcdir)/zil.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zil_002_pos.ksh || atf_fail "Testcase failed"
 }
 zil_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/zil.kshlib
 	. $(atf_get_srcdir)/zil.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case zil_001_pos
 	atf_add_test_case zil_002_pos
 }