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 273993)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh	(revision 273994)
@@ -1,234 +1,235 @@
 # 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()
 {
 	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_001_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_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_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()
 {
 	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_002_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_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)/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()
 {
 	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_003_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_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)/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()
 {
 	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_004_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_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)/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_expect_fail "DE186: zfs destroy ignores absence of -f for snapshots"
 	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()
 {
 	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)/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()
 {
 	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_006_neg.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_006_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)/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()
 {
 	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_007_neg.ksh || atf_fail "Testcase failed"
 }
 zfs_destroy_007_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)/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_unmount/zfs_unmount_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh	(revision 273993)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh	(revision 273994)
@@ -1,316 +1,317 @@
 # 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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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
 
 	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()
 {
 	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_all_001_pos.ksh || atf_fail "Testcase failed"
 }
 zfs_unmount_all_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_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 273993)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh	(revision 273994)
@@ -1,111 +1,114 @@
 # 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
 }