svn commit: r329653 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount

Alan Somers asomers at FreeBSD.org
Tue Feb 20 18:45:39 UTC 2018


Author: asomers
Date: Tue Feb 20 18:45:38 2018
New Revision: 329653
URL: https://svnweb.freebsd.org/changeset/base/329653

Log:
  Fix zfs_mount_008_pos
  
  tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh
  	Illumos syntax => FreeBSD syntax.  All FreeBSD mounts are the
  	equivalent of Illumos's overlay mounts.
  
  tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh
  	Don't skip this test.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh	Tue Feb 20 18:42:08 2018	(r329652)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh	Tue Feb 20 18:45:38 2018	(r329653)
@@ -85,8 +85,7 @@ log_must $MKFILE 1M $testfile $testfile1
 
 log_must $ZFS unmount $fs1
 log_must $ZFS set mountpoint=$mntpnt $fs1
-log_mustnot $ZFS mount $fs1
-log_must $ZFS mount -O $fs1
+log_must $ZFS mount $fs1
 
 # Create new file in override mountpoint
 log_must $MKFILE 1M $mntpnt/$TESTFILE2

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh	Tue Feb 20 18:42:08 2018	(r329652)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh	Tue Feb 20 18:45:38 2018	(r329653)
@@ -221,8 +221,6 @@ zfs_mount_008_pos_head()
 }
 zfs_mount_008_pos_body()
 {
-	[[ `uname -s` = "FreeBSD" ]] && \
-		atf_skip "Overlay mounts are not supported on FreeBSD"
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_mount.kshlib
 	. $(atf_get_srcdir)/zfs_mount.cfg


More information about the svn-src-projects mailing list