svn commit: r305073 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zfs_set tests/snapshot

[Alan Somers]

Author: asomers
Date: Tue Aug 30 17:18:35 2016
New Revision: 305073
URL: https://svnweb.freebsd.org/changeset/base/305073

Log:
  Remove references to a vendor-specific feature.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/snapdir_001_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_015_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib	Tue Aug 30 16:49:09 2016	(r305072)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib	Tue Aug 30 17:18:35 2016	(r305073)
@@ -3096,11 +3096,7 @@ function bsddevmap
 #
 function get_snapdir_name
 {
-	if [[ `sysctl -n vfs.zfs.abbreviated_snapdir` = "1" ]]; then
-		echo ".snapshot"
-	else
-		echo ".zfs/snapshot"
-	fi
+	echo ".zfs/snapshot"
 }
 
 #

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/snapdir_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/snapdir_001_pos.ksh	Tue Aug 30 16:49:09 2016	(r305072)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/snapdir_001_pos.ksh	Tue Aug 30 17:18:35 2016	(r305073)
@@ -72,11 +72,7 @@ function verify_snapdir_visible # $1 dat
 	typeset mtpt=$(get_prop mountpoint $dataset)
 	typeset name
 
-	if [[ `sysctl -n vfs.zfs.abbreviated_snapdir` = 1 ]]; then
-		CTLDIR=".snapshot"
-	else
-		CTLDIR=".zfs"
-	fi
+	CTLDIR=".zfs"
 
 	for name in `$LS -a $mtpt`; do
 		if [[ $name == $CTLDIR ]]; then

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_015_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_015_pos.ksh	Tue Aug 30 16:49:09 2016	(r305072)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_015_pos.ksh	Tue Aug 30 17:18:35 2016	(r305073)
@@ -82,12 +82,8 @@ log_onexit cleanup
 fs=$TESTPOOL/$TESTFS
 # Verify all the other directories are readonly.
 mntpnt=$(get_prop mountpoint $fs)
-if [[ `sysctl -n vfs.zfs.abbreviated_snapdir` = "1" ]]; then
-	set -A ro_dirs 
-else
-	snapdir=$mntpnt/.zfs
-	set -A ro_dirs "$snapdir" "$snapdir/snap" "$snapdir/snapshot"
-fi
+snapdir=$mntpnt/.zfs
+set -A ro_dirs "$snapdir" "$snapdir/snap" "$snapdir/snapshot"
 for dir in ${ro_dirs[@]}; do
 	if [[ -d $dir ]]; then
 		log_mustnot $RM -rf $dir

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh	Tue Aug 30 16:49:09 2016	(r305072)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_017_pos.ksh	Tue Aug 30 17:18:35 2016	(r305073)
@@ -184,7 +184,7 @@ cd dir2
 log_must $MV file6 file99
 
 # verify the top level snapshot directories
-[[ `sysctl -n vfs.zfs.abbreviated_snapdir` = 1 ]] || verify_dir $TESTDIR/.zfs
+verify_dir $TESTDIR/$(get_snapdir_name)
 verify_dir $TESTDIR/$(get_snapdir_name)
 verify_dir $TESTDIR/$(get_snapdir_name)/snap_a
 verify_dir $TESTDIR/$(get_snapdir_name)/snap_b

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh	Tue Aug 30 16:49:09 2016	(r305072)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh	Tue Aug 30 17:18:35 2016	(r305073)
@@ -77,13 +77,8 @@ function verify_dir # directory
 }
 
 typeset -a dirlist
-if [[ `sysctl -n vfs.zfs.abbreviated_snapdir` = 1 ]]; then
-	dirlist=( "$TESTDIR/.snapshot" )
-	ctldir=".snapshot"
-else
-	dirlist=( "$TESTDIR/.zfs" "$TESTDIR/.zfs/snapshot" "$TESTDIR/.zfs/shares" ) 
-	ctldir=".zfs"
-fi
+dirlist=( "$TESTDIR/.zfs" "$TESTDIR/.zfs/snapshot" "$TESTDIR/.zfs/shares" ) 
+ctldir=".zfs"
 for d in ${dirlist[@]}; do
 	verify_dir $d
 done