svn commit: r323035 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zfs_destroy cli_root/zfs_diff cli_root/zfs_unmount cli_root/zpool_expand cli_root/zpool_upgrade cli_user/misc utils_te...

[Alan Somers]

Author: asomers
Date: Wed Aug 30 21:37:16 2017
New Revision: 323035
URL: https://svnweb.freebsd.org/changeset/base/323035

Log:
  Add some missing diffs from r323033
  
  Sponsored by:	Spectra Logic Corp

Modified:
  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_diff/zfs_diff_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh

Modified: 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	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -138,7 +138,6 @@ zfs_destroy_005_neg_head()
 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

Modified: 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	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -32,7 +32,6 @@ zfs_diff_001_pos_head()
 }
 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
@@ -42,7 +41,6 @@ zfs_diff_001_pos_body()
 }
 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
 

Modified: 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	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -233,7 +233,6 @@ zfs_unmount_009_pos_head()
 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

Modified: 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	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -34,7 +34,6 @@ 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
 
@@ -43,7 +42,6 @@ zpool_expand_001_pos_body()
 }
 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
 
@@ -61,7 +59,6 @@ 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
 
@@ -70,7 +67,6 @@ zpool_expand_002_pos_body()
 }
 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
 
@@ -88,7 +84,6 @@ 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
 
@@ -97,7 +92,6 @@ zpool_expand_003_neg_body()
 }
 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
 

Modified: 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	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -61,7 +61,6 @@ zpool_upgrade_002_pos_head()
 }
 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
@@ -71,7 +70,6 @@ zpool_upgrade_002_pos_body()
 }
 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
@@ -203,7 +201,6 @@ zpool_upgrade_007_pos_head()
 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
@@ -213,7 +210,6 @@ zpool_upgrade_007_pos_body()
 }
 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

Modified: 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	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -657,7 +657,6 @@ zpool_create_001_neg_head()
 }
 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
 
@@ -666,7 +665,6 @@ zpool_create_001_neg_body()
 }
 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"
@@ -682,7 +680,6 @@ zpool_create_002_pos_head()
 }
 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.
@@ -690,7 +687,6 @@ zpool_create_002_pos_body()
 }
 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"

Modified: 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	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -184,7 +184,6 @@ utils_test_007_pos_head()
 }
 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
@@ -194,7 +193,6 @@ utils_test_007_pos_body()
 }
 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

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh	Wed Aug 30 21:18:56 2017	(r323034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh	Wed Aug 30 21:37:16 2017	(r323035)
@@ -33,7 +33,6 @@ zil_001_pos_head()
 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
@@ -43,7 +42,6 @@ zil_001_pos_body()
 }
 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