From owner-svn-src-projects@freebsd.org Thu Feb 8 20:22:59 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D58F0F015E9
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 20:22:59 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 892057B640;
Thu, 8 Feb 2018 20:22:59 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 843A71AEEA;
Thu, 8 Feb 2018 20:22:59 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18KMxic034365;
Thu, 8 Feb 2018 20:22:59 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18KMxre034364;
Thu, 8 Feb 2018 20:22:59 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082022.w18KMxre034364@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 20:22:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329026 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Commit-Revision: 329026
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 20:23:00 -0000
Author: asomers
Date: Thu Feb 8 20:22:59 2018
New Revision: 329026
URL: https://svnweb.freebsd.org/changeset/base/329026
Log:
WIP removing sas phy control from the ZFS test suite
tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_006_pos.ksh
Don't include libsas.kshlib. This test doesn't need it.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_006_pos.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_006_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_006_pos.ksh Thu Feb 8 20:09:42 2018 (r329025)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_006_pos.ksh Thu Feb 8 20:22:59 2018 (r329026)
@@ -26,7 +26,6 @@
#
#
. $STF_SUITE/tests/hotspare/hotspare.kshlib
-. $STF_SUITE/include/libsas.kshlib
################################################################################
#
From owner-svn-src-projects@freebsd.org Thu Feb 8 20:24:56 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CB70F01862
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 20:24:56 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id C5F267B80F;
Thu, 8 Feb 2018 20:24:55 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C0A6E1AEF3;
Thu, 8 Feb 2018 20:24:55 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18KOtNK034671;
Thu, 8 Feb 2018 20:24:55 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18KOsBQ034658;
Thu, 8 Feb 2018 20:24:54 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082024.w18KOsBQ034658@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 20:24:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329027 - in projects/zfsd/head/tests/sys/cddl/zfs:
include tests/zfsd
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include
tests/zfsd
X-SVN-Commit-Revision: 329027
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 20:24:56 -0000
Author: asomers
Date: Thu Feb 8 20:24:54 2018
New Revision: 329027
URL: https://svnweb.freebsd.org/changeset/base/329027
Log:
WIP removing SAS phy control from the ZFS test suite
Convert most zfsd tests to use libgnop instead of libsas
This will allow those tests to run on systems without SAS
expanders, and eliminate one source of intermittency in the
tests.
tests/sys/cddl/zfs/include/libgnop.kshlib
* Allow setting the physical path on a gnop device
* Fix calculation of disk size
tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh
Cleanup gnops on exit
tests/sys/cddl/zfs/tests/zfsd/setup.ksh
Don't bother verifying SAS expanders. They won't be needed for much
longer.
tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
Simulate drive pulls by using gnops instead of SAS phy control.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib Thu Feb 8 20:24:54 2018 (r329027)
@@ -39,7 +39,10 @@
# won't be present on the gnop device and vice versa.
function create_gnop
{
+ # Name of disk to use, with or without /dev/
typeset disk=$1
+ # Optional physical path to use
+ typeset physpath=$2
# size of disk in bytes
typeset -li disk_size
# disk size, rounded down to multiple of 16384
@@ -48,14 +51,19 @@ function create_gnop
typeset -li nop_size
# offset of the beginning of the nop device in bytes
typeset -li nop_offset
+ typeset args
- disk_size=`diskinfo da0 | cut -f 3`
+ disk_size=`diskinfo $disk | cut -f 3`
# Round it down so the nop device will be 4k-aligned
disk_size_rounded=$(( ${disk_size} / 16384 * 16384 ))
nop_size=$(( ${disk_size_rounded} / 4 ))
nop_offset=${nop_size}
+ args="-s ${nop_size} -o ${nop_offset}"
+ if [ -n "$physpath" ]; then
+ args="$args -z $physpath"
+ fi
- gnop create -s ${nop_size} -o ${nop_offset} ${disk}
+ gnop create ${args} ${disk}
}
# Create multiple gnop devices
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -27,10 +27,11 @@
# $FreeBSD$
. ${STF_SUITE}/include/libtest.kshlib
+. ${STF_SUITE}/include/libgnop.kshlib
-verify_runnable "global"
-
# Rotate logs now, because this test can generate a great volume of log entries
newsyslog
-default_cleanup
+default_cleanup_noexit
+destroy_gnops ${DISKS}
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -27,18 +27,6 @@
# $FreeBSD$
. ${STF_SUITE}/include/libtest.kshlib
-. ${STF_SUITE}/include/libsas.kshlib
-
-verify_runnable "global"
-echo "list of disks: $DISKS"
-
-# Make sure that all of the disks that we've been given are attached to a
-# SAS expander, and that we can find the phy they're attached to. This
-# function will cause the script to exit if it fails.
-for disk in $DISKS
-do
- find_verify_sas_disk $disk
-done
# Rotate logs now, because this test can generate a great volume of log entries
newsyslog
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -28,7 +28,7 @@
#
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
################################################################################
#
@@ -37,18 +37,13 @@
# ID: zfsd_autoreplace_001_neg
#
# DESCRIPTION:
-# In a pool with the autoreplace property unset, a vdev will not be
+# In a pool without the autoreplace property unset, a vdev will not be
# replaced by physical path
#
# STRATEGY:
# 1. Create 1 storage pool without hot spares
-# 2. Remove a vdev by disabling its SAS phy
-# 3. Export the pool
-# 4. Reenable the missing dev's SAS phy
-# 5. Erase the missing dev's ZFS label
-# 6. Disable the missing dev's SAS phy again
-# 7. Import the pool
-# 8. Reenable the missing dev's SAS phy
+# 2. Remove a vdev
+# 4. Create a new vdev with the same physical path as the first one
# 9. Verify that it does not get added to the pool.
#
# TESTABILITY: explicit
@@ -61,16 +56,10 @@
#
###############################################################################
-verify_runnable "global"
+log_assert "A pool without the autoreplace property set will not replace disks by physical path"
-log_assert "A pool with the autoreplace property set will replace disks by physical path"
-
-
-log_onexit autoreplace_cleanup
-
function verify_assertion
{
- do_autoreplace
# 9. Verify that it does not get added to the pool
for ((timeout=0; timeout<4; timeout=$timeout+1)); do
log_mustnot check_state $TESTPOOL $REMOVAL_DISK "ONLINE"
@@ -78,15 +67,27 @@ function verify_assertion
done
}
-
+typeset PHYSPATH="some_physical_path"
typeset REMOVAL_DISK=$DISK0
-typeset POOLDEVS="$DISK0 $DISK1 $DISK2 $DISK3"
+typeset REMOVAL_NOP=${DISK0}.nop
+typeset NEW_DISK=$DISK4
+typeset NEW_NOP=${DISK4}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2} ${DISK3}"
+typeset ALLDISKS="${DISK0} ${DISK1} ${DISK2} ${DISK3}"
+typeset ALLNOPS=${ALLDISKS//~(E)([[:space:]]+|$)/.nop\1}
set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
ensure_zfsd_running
+log_must create_gnops $OTHER_DISKS
for keyword in "${MY_KEYWORDS[@]}" ; do
- log_must create_pool $TESTPOOL $keyword $POOLDEVS
- log_must poolexists "$TESTPOOL"
- log_must $ZPOOL set autoreplace=off $TESTPOOL
+ log_must create_gnop $REMOVAL_DISK $PHYSPATH
+ log_must create_pool $TESTPOOL $keyword $ALLNOPS
+ log_must $ZPOOL set autoreplace=on $TESTPOOL
+
+ log_must destroy_gnop $REMOVAL_DISK
+ log_must create_gnop $NEW_DISK $PHYSPATH
verify_assertion
destroy_pool "$TESTPOOL"
+ log_must destroy_gnop $NEW_DISK
done
+
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -28,7 +28,7 @@
#
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
################################################################################
#
@@ -42,13 +42,8 @@
#
# STRATEGY:
# 1. Create 1 storage pool without hot spares
-# 2. Remove a vdev by disabling its SAS phy
-# 3. Export the pool
-# 4. Reenable the missing dev's SAS phy
-# 5. Erase the missing dev's ZFS label
-# 6. Disable the missing dev's SAS phy again
-# 7. Import the pool
-# 8. Reenable the missing dev's SAS phy
+# 2. Remove a vdev
+# 4. Create a new vdev with the same physical path as the first one
# 9. Verify that it does get added to the pool.
#
# TESTABILITY: explicit
@@ -61,27 +56,35 @@
#
###############################################################################
-verify_runnable "global"
-
log_assert "A pool with the autoreplace property will replace disks by physical path"
-log_onexit autoreplace_cleanup
-
function verify_assertion
{
- do_autoreplace
- wait_for_pool_dev_state_change 20 $REMOVAL_DISK ONLINE
+ wait_for_pool_dev_state_change 20 $NEW_DISK ONLINE
}
+typeset PHYSPATH="some_physical_path"
typeset REMOVAL_DISK=$DISK0
-typeset POOLDEVS="$DISK0 $DISK1 $DISK2 $DISK3"
+typeset REMOVAL_NOP=${DISK0}.nop
+typeset NEW_DISK=$DISK4
+typeset NEW_NOP=${DISK4}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2} ${DISK3}"
+typeset ALLDISKS="${DISK0} ${DISK1} ${DISK2} ${DISK3}"
+typeset ALLNOPS=${ALLDISKS//~(E)([[:space:]]+|$)/.nop\1}
set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
ensure_zfsd_running
+log_must create_gnops $OTHER_DISKS
for keyword in "${MY_KEYWORDS[@]}" ; do
- log_must create_pool $TESTPOOL $keyword $POOLDEVS
- log_must poolexists "$TESTPOOL"
+ log_must create_gnop $REMOVAL_DISK $PHYSPATH
+ log_must create_pool $TESTPOOL $keyword $ALLNOPS
log_must $ZPOOL set autoreplace=on $TESTPOOL
+
+ log_must destroy_gnop $REMOVAL_DISK
+ log_must create_gnop $NEW_DISK $PHYSPATH
verify_assertion
destroy_pool "$TESTPOOL"
+ log_must destroy_gnop $NEW_DISK
done
+
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -27,7 +27,7 @@
#
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
################################################################################
#
@@ -42,14 +42,9 @@
#
# STRATEGY:
# 1. Create 1 storage pool with a hot spare
-# 2. Remove a vdev by disabling its SAS phy
+# 2. Remove a vdev
# 3. Wait for the hotspare to fully resilver
-# 4. Export the pool
-# 5. Reenable the missing dev's SAS phy
-# 6. Erase the missing dev's ZFS label
-# 7. Disable the missing dev's SAS phy again
-# 8. Import the pool
-# 9. Reenable the missing dev's SAS phy
+# 4. Create a new vdev with the same physical path as the first one
# 10. Verify that it does get added to the pool.
# 11. Verify that the hotspare gets removed.
#
@@ -63,17 +58,12 @@
#
###############################################################################
-verify_runnable "global"
+log_assert "A pool with the autoreplace property will replace disks by physical path, even if a spare is active"
-log_assert "A pool with the autoreplace property will replace disks by physical path"
-
-log_onexit autoreplace_cleanup
-
function verify_assertion
{
- do_autoreplace "$SPARE_DISK"
- # Verify that the original disk gets added to the pool
- wait_for_pool_dev_state_change 20 $REMOVAL_DISK ONLINE
+ # Verify that the replacement disk gets added to the pool
+ wait_for_pool_dev_state_change 20 $NEW_DISK ONLINE
# Wait for resilvering to complete
wait_until_resilvered
@@ -83,15 +73,28 @@ function verify_assertion
}
-typeset SPARE_DISK=$DISK0
-typeset REMOVAL_DISK=$DISK1
-typeset POOLDEVS="$DISK1 $DISK2 $DISK3 $DISK4"
+typeset PHYSPATH="some_physical_path"
+typeset REMOVAL_DISK=$DISK0
+typeset REMOVAL_NOP=${DISK0}.nop
+typeset NEW_DISK=$DISK4
+typeset NEW_NOP=${DISK4}.nop
+typeset SPARE_DISK=${DISK5}
+typeset SPARE_NOP=${DISK5}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2} ${DISK3}"
+typeset OTHER_NOPS=${OTHER_DISKS//~(E)([[:space:]]+|$)/.nop\1}
set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
ensure_zfsd_running
+log_must create_gnops $OTHER_DISKS $SPARE_DISK
for keyword in "${MY_KEYWORDS[@]}" ; do
- log_must create_pool $TESTPOOL $keyword $POOLDEVS spare $SPARE_DISK
- log_must poolexists "$TESTPOOL"
+ log_must create_gnop $REMOVAL_DISK $PHYSPATH
+ log_must create_pool $TESTPOOL $keyword $REMOVAL_NOP $OTHER_NOPS spare $SPARE_NOP
log_must $ZPOOL set autoreplace=on $TESTPOOL
+
+ log_must destroy_gnop $REMOVAL_DISK
+ log_must create_gnop $NEW_DISK $PHYSPATH
verify_assertion
destroy_pool "$TESTPOOL"
+ log_must destroy_gnop $NEW_DISK
done
+
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -28,7 +28,7 @@
#
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
################################################################################
#
@@ -42,11 +42,10 @@
#
#
# STRATEGY:
-# 1. Create 1 storage pools with hot spares. Use disks instead of files
-# because they can be removed.
-# 2. Remove one vdev by turning off its SAS phy.
+# 1. Create 1 storage pools with hot spares.
+# 2. Remove one vdev
# 3. Verify that the spare is in use.
-# 4. Reinsert the vdev by enabling its phy
+# 4. Recreate the vdev
# 5. Verify that the vdev gets resilvered and the spare gets removed
#
# TESTABILITY: explicit
@@ -59,19 +58,12 @@
#
###############################################################################
-verify_runnable "global"
-
log_assert "Removing a disk from a pool results in the spare activating"
-log_onexit autoreplace_cleanup
-
-
function verify_assertion # spare_dev
{
typeset spare_dev=$1
- find_verify_sas_disk $REMOVAL_DISK
- log_note "Disabling \"$REMOVAL_DISK\" on expander $EXPANDER phy $PHY"
- disable_sas_disk $EXPANDER $PHY
+ log_must destroy_gnop $REMOVAL_DISK
# Check to make sure ZFS sees the disk as removed
wait_for_pool_removal 20
@@ -81,11 +73,10 @@ function verify_assertion # spare_dev
log_must $ZPOOL status $TESTPOOL
# Reenable the missing disk
- log_note "Reenabling phy on expander $EXPANDER phy $PHY"
- enable_sas_disk $EXPANDER $PHY
+ log_must create_gnop $REMOVAL_DISK $PHYSPATH
# Check that the disk has rejoined the pool & resilvered
- wait_for_pool_dev_state_change 20 $REMOVAL_DISK ONLINE
+ wait_for_pool_dev_state_change 20 $REMOVAL_NOP ONLINE
wait_until_resilvered
# Finally, check that the spare deactivated
@@ -93,16 +84,23 @@ function verify_assertion # spare_dev
}
+typeset PHYSPATH="some_physical_path"
typeset REMOVAL_DISK=$DISK0
-typeset SDEV=$DISK4
-typeset POOLDEVS="$DISK0 $DISK1 $DISK2 $DISK3"
+typeset REMOVAL_NOP=${DISK0}.nop
+typeset SPARE_DISK=$DISK4
+typeset SPARE_NOP=${DISK4}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2} ${DISK3}"
+typeset OTHER_NOPS=${OTHER_DISKS//~(E)([[:space:]]+|$)/.nop\1}
set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
ensure_zfsd_running
+log_must create_gnops $OTHER_DISKS $SPARE_DISK
+log_must create_gnop $REMOVAL_DISK $PHYSPATH
for keyword in "${MY_KEYWORDS[@]}" ; do
- log_must create_pool $TESTPOOL $keyword $POOLDEVS spare $SDEV
- log_must poolexists "$TESTPOOL"
- log_must $ZPOOL set autoreplace=on "$TESTPOOL"
- iterate_over_hotspares verify_assertion $SDEV
+ log_must create_pool $TESTPOOL $keyword $REMOVAL_NOP $OTHER_NOPS spare $SPARE_NOP
+ log_must $ZPOOL set autoreplace=on $TESTPOOL
+ iterate_over_hotspares verify_assertion $SPARE_NOP
destroy_pool "$TESTPOOL"
done
+
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -28,7 +28,7 @@
#
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
################################################################################
#
@@ -42,10 +42,9 @@
#
#
# STRATEGY:
-# 1. Create 1 storage pools with hot spares. Use disks instead of files
-# because they can be removed.
+# 1. Create 1 storage pools with hot spares.
# 2. Turn off zfsd
-# 3. Remove one vdev by turning off its SAS phy.
+# 3. Remove one vdev
# 4. Restart zfsd
# 5. Verify that the spare is in use.
#
@@ -69,11 +68,9 @@ log_onexit autoreplace_cleanup
function verify_assertion # spare_dev
{
typeset spare_dev=$1
- find_verify_sas_disk $REMOVAL_DISK
stop_zfsd
- log_note "Disabling \"$REMOVAL_DISK\" on expander $EXPANDER phy $PHY"
- disable_sas_disk $EXPANDER $PHY
+ log_must destroy_gnop $REMOVAL_DISK
# Check to make sure ZFS sees the disk as removed
wait_for_pool_removal 20
@@ -84,19 +81,26 @@ function verify_assertion # spare_dev
wait_for_pool_dev_state_change 20 $spare_dev INUSE
# Reenable the missing disk
- log_note "Reenabling phy on expander $EXPANDER phy $PHY"
- enable_sas_disk $EXPANDER $PHY
+ log_must create_gnop $REMOVAL_DISK $PHYSPATH
}
+typeset PHYSPATH="some_physical_path"
typeset REMOVAL_DISK=$DISK0
-typeset SDEV=$DISK4
-typeset POOLDEVS="$DISK0 $DISK1 $DISK2 $DISK3"
+typeset REMOVAL_NOP=${DISK0}.nop
+typeset SPARE_DISK=$DISK4
+typeset SPARE_NOP=${DISK4}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2} ${DISK3}"
+typeset OTHER_NOPS=${OTHER_DISKS//~(E)([[:space:]]+|$)/.nop\1}
set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
ensure_zfsd_running
+log_must create_gnops $OTHER_DISKS $SPARE_DISK
+log_must create_gnop $REMOVAL_DISK $PHYSPATH
for keyword in "${MY_KEYWORDS[@]}" ; do
- log_must create_pool $TESTPOOL $keyword $POOLDEVS spare $SDEV
- log_must poolexists "$TESTPOOL"
- iterate_over_hotspares verify_assertion $SDEV
+ log_must create_pool $TESTPOOL $keyword $REMOVAL_NOP $OTHER_NOPS spare $SPARE_NOP
+ log_must $ZPOOL set autoreplace=on $TESTPOOL
+ iterate_over_hotspares verify_assertion $SPARE_NOP
destroy_pool "$TESTPOOL"
done
+
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -28,7 +28,7 @@
#
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
################################################################################
#
@@ -45,13 +45,14 @@
#
#
# STRATEGY:
-# 1. Create 1 storage pools with hot spares. Use disks instead of files
-# because they can be removed.
-# 2. Remove one disk by turning off its SAS phy.
+# 1. Create 1 storage pools with hot spares.
+# 2. Remove one disk
# 3. Verify that the spare is in use.
-# 4. Reinsert the vdev by enabling its phy
-# 5. Verify that the vdev gets resilvered and the spare gets removed
-# 6. Use additional zpool history data to verify that the pool
+# 4. Export the pool
+# 5. Recreate the vdev
+# 6. Import the pool
+# 7. Verify that the vdev gets resilvered and the spare gets removed
+# 8. Use additional zpool history data to verify that the pool
# finished resilvering _before_ zfsd detached the spare.
#
# TESTABILITY: explicit
@@ -69,9 +70,7 @@ verify_runnable "global"
function verify_assertion # spare_dev
{
typeset spare_dev=$1
- find_verify_sas_disk $REMOVAL_DISK
- log_note "Disabling \"$REMOVAL_DISK\" on expander $EXPANDER phy $PHY"
- disable_sas_disk $EXPANDER $PHY
+ log_must destroy_gnop $REMOVAL_DISK
# Check to make sure ZFS sees the disk as removed
wait_for_pool_removal 20
@@ -84,8 +83,7 @@ function verify_assertion # spare_dev
log_must $ZPOOL export $TESTPOOL
# Reenable the missing disk
- log_note "Reenabling phy on expander $EXPANDER phy $PHY"
- enable_sas_disk $EXPANDER $PHY
+ log_must create_gnop $REMOVAL_DISK
# Import the pool
log_must $ZPOOL import $TESTPOOL
@@ -129,26 +127,24 @@ function verify_assertion # spare_dev
}
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
log_assert "If a removed drive gets reinserted while the pool is exported, \
it will replace its spare when reinserted."
-log_onexit autoreplace_cleanup
-
ensure_zfsd_running
-set_devs
typeset REMOVAL_DISK=$DISK0
-typeset SDEV=$DISK4
-typeset POOLDEVS="$DISK0 $DISK1 $DISK2 $DISK3"
+typeset REMOVAL_NOP=${DISK0}.nop
+typeset SPARE_DISK=$DISK4
+typeset SPARE_NOP=${DISK4}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2} ${DISK3}"
+typeset OTHER_NOPS=${OTHER_DISKS//~(E)([[:space:]]+|$)/.nop\1}
set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
+ensure_zfsd_running
+log_must create_gnops $REMOVAL_DISK $OTHER_DISKS $SPARE_DISK
for keyword in "${MY_KEYWORDS[@]}" ; do
- log_must create_pool $TESTPOOL $keyword $POOLDEVS spare $SDEV
- log_must poolexists "$TESTPOOL"
- iterate_over_hotspares verify_assertion $SDEV
-
+ log_must create_pool $TESTPOOL $keyword $REMOVAL_NOP $OTHER_NOPS spare $SPARE_NOP
+ verify_assertion
destroy_pool "$TESTPOOL"
done
+
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh Thu Feb 8 20:24:54 2018 (r329027)
@@ -33,103 +33,73 @@
# $FreeBSD$
. $STF_SUITE/include/libtest.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
-verify_runnable "global"
-
function cleanup
{
- # See if the phy has been disabled, and try to re-enable it if possible.
- [ -n "$EXPANDER0" -a -n "$PHY0" ] && enable_sas_disk $EXPANDER0 $PHY0
- [ -n "$EXPANDER1" -a -n "$PHY1" ] && enable_sas_disk $EXPANDER1 $PHY1
- [ -n "$EXPANDER" -a -n "$PHY" ] && enable_sas_disk $EXPANDER $PHY
-
destroy_pool $TESTPOOL
[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+ for md in $MD0 $MD1 $MD2 $MD3; do
+ gnop destroy -f $md
+ for ((i=0; i<5; i=i+1)); do
+ $MDCONFIG -d -u $md && break
+ $SLEEP 1
+ done
+ done
}
-# arg1: disk devname
-# Leaves EXPANDER and PHY set appropriately
-function remove_disk
-{
- typeset DISK=$1
- # Find the first disk, get the expander and phy
- log_note "Looking for expander and phy information for $DISK"
- find_verify_sas_disk $DISK
-
- log_note "Disabling \"$DISK\" on expander $EXPANDER phy $PHY"
- # Disable the first disk.
- disable_sas_disk $EXPANDER $PHY
-
- # Check to make sure ZFS sees the disk as removed
- wait_for_pool_dev_state_change 20 $DISK "REMOVED|UNAVAIL"
-}
-
-# arg1: disk's old devname
-# arg2: disk's expander's devname
-# arg3: disk's phy number
-# arg4: whether the devname must differ after reconnecting
-function reconnect_disk
-{
- typeset DISK=$1
- typeset EXPANDER=$2
- typeset PHY=$3
-
- # Re-enable the disk, we don't want to leave it turned off
- log_note "Re-enabling phy $PHY on expander $EXPANDER"
- enable_sas_disk $EXPANDER $PHY
-
- log_note "Checking to see whether disk has reappeared"
-
- prev_disk=$(find_disks $DISK)
- cur_disk=$(find_disks $FOUNDDISK)
-
- # If you get this, the test must be fixed to guarantee that
- # it will reappear with a different name.
- [ "${prev_disk}" = "${cur_disk}" ] && log_unsupported \
- "Disk $DISK reappeared with the same devname."
-
- #Disk should have auto-joined the zpool. Verify it's status is online.
- wait_for_pool_dev_state_change 20 $FOUNDDISK ONLINE
-}
-
log_assert "ZFSD will correctly replace disks that disappear and reappear \
with different devnames"
# Outline
+# Use gnop on top of file-backed md devices
+# * file-backed md devices so we can destroy them and recreate them with
+# different devnames
+# * gnop so we can destroy them while still in use
# Create a double-parity pool
-# Remove two disks by disabling their SAS phys
-# Reenable the phys in the opposite order
-# Check that the disks's devnames have swapped
+# Remove two vdevs
+# Destroy the md devices and recreate in the opposite order
+# Check that the md's devnames have swapped
# Verify that the pool regains its health
log_onexit cleanup
ensure_zfsd_running
-child_pids=""
-set -A DISKS_ARRAY $DISKS
-typeset DISK0=${DISKS_ARRAY[0]}
-typeset DISK1=${DISKS_ARRAY[1]}
-if [ ${DISK0##/dev/da} -gt ${DISK1##/dev/da} ]; then
- # Swap disks so we'll disable the lowest numbered first
- typeset TMP="$DISK1"
- DISK1="$DISK0"
- DISK0="$TMP"
-fi
+N_DEVARRAY_FILES=4
+set_devs
+typeset FILE0="${devarray[0]}"
+typeset FILE1="${devarray[1]}"
+typeset FILE2="${devarray[2]}"
+typeset FILE3="${devarray[3]}"
+typeset MD0=`$MDCONFIG -a -t vnode -f ${FILE0}`
+[ $? -eq 0 ] || atf_fail "Failed to create md device"
+typeset MD1=`$MDCONFIG -a -t vnode -f ${FILE1}`
+[ $? -eq 0 ] || atf_fail "Failed to create md device"
+typeset MD2=`$MDCONFIG -a -t vnode -f ${FILE2}`
+[ $? -eq 0 ] || atf_fail "Failed to create md device"
+typeset MD3=`$MDCONFIG -a -t vnode -f ${FILE3}`
+[ $? -eq 0 ] || atf_fail "Failed to create md device"
+log_must create_gnops $MD0 $MD1 $MD2 $MD3
for type in "raidz2" "mirror"; do
# Create a pool on the supplied disks
- create_pool $TESTPOOL $type $DISKS
+ create_pool $TESTPOOL $type ${MD0}.nop ${MD1}.nop ${MD2}.nop ${MD3}.nop
- remove_disk $DISK0
- typeset EXPANDER0=$EXPANDER
- typeset PHY0=$PHY
- remove_disk $DISK1
- typeset EXPANDER1=$EXPANDER
- typeset PHY1=$PHY
+ log_must destroy_gnop $MD0
+ for ((i=0; i<5; i=i+1)); do
+ $MDCONFIG -d -u $MD0 && break
+ $SLEEP 1
+ done
+ [ -c /dev/$MD0.nop ] && atf_fail "failed to destroy $MD0"
+ log_must destroy_gnop $MD1
+ for ((i=0; i<5; i=i+1)); do
+ $MDCONFIG -d -u $MD1 && break
+ $SLEEP 1
+ done
+ [ -c /dev/$MD1.nop ] && atf_fail "failed to destroy $MD0"
# Make sure that the pool is degraded
$ZPOOL status $TESTPOOL |grep "state:" |grep DEGRADED > /dev/null
@@ -137,11 +107,15 @@ for type in "raidz2" "mirror"; do
log_fail "Pool $TESTPOOL not listed as DEGRADED"
fi
- reconnect_disk $DISK1 $EXPANDER1 $PHY1
- reconnect_disk $DISK0 $EXPANDER0 $PHY0
+ # Recreate the vdevs in the opposite order
+ typeset MD0=`$MDCONFIG -a -t vnode -f ${FILE1}`
+ [ $? -eq 0 ] || atf_fail "Failed to create md device"
+ typeset MD1=`$MDCONFIG -a -t vnode -f ${FILE0}`
+ [ $? -eq 0 ] || atf_fail "Failed to create md device"
+ log_must create_gnops $MD0 $MD1
+
wait_until_resilvered
destroy_pool $TESTPOOL
- log_must $RM -rf /$TESTPOOL
done
log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 20:22:59 2018 (r329026)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 20:24:54 2018 (r329027)
@@ -204,7 +204,7 @@ atf_test_case zfsd_hotspare_004_pos cleanup
zfsd_hotspare_004_pos_head()
{
atf_set "descr" "Removing a disk from a pool results in the spare activating"
- atf_set "require.progs" zpool camcontrol zfsd
+ atf_set "require.progs" gnop zpool camcontrol zfsd
atf_set "timeout" 3600
}
zfsd_hotspare_004_pos_body()
@@ -227,7 +227,7 @@ zfsd_hotspare_004_pos_cleanup()
. $(atf_get_srcdir)/../hotspare/hotspare.kshlib
. $(atf_get_srcdir)/../hotspare/hotspare.cfg
- ksh93 $(atf_get_srcdir)/hotspare_cleanup.ksh || atf_fail "Cleanup failed"
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
atf_test_case zfsd_hotspare_005_pos cleanup
@@ -292,7 +292,7 @@ atf_test_case zfsd_hotspare_007_pos cleanup
zfsd_hotspare_007_pos_head()
{
atf_set "descr" "zfsd will swap failed drives at startup"
- atf_set "require.progs" zpool camcontrol zfsd
+ atf_set "require.progs" gnop zpool camcontrol zfsd
atf_set "timeout" 3600
}
zfsd_hotspare_007_pos_body()
@@ -315,7 +315,7 @@ zfsd_hotspare_007_pos_cleanup()
. $(atf_get_srcdir)/../hotspare/hotspare.kshlib
. $(atf_get_srcdir)/../hotspare/hotspare.cfg
- ksh93 $(atf_get_srcdir)/hotspare_cleanup.ksh || atf_fail "Cleanup failed"
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
atf_test_case zfsd_hotspare_008_neg cleanup
@@ -375,14 +375,14 @@ zfsd_autoreplace_001_neg_cleanup()
. $(atf_get_srcdir)/../hotspare/hotspare.kshlib
. $(atf_get_srcdir)/../hotspare/hotspare.cfg
- ksh93 $(atf_get_srcdir)/hotspare_cleanup.ksh || atf_fail "Cleanup failed"
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
atf_test_case zfsd_autoreplace_002_pos cleanup
zfsd_autoreplace_002_pos_head()
{
atf_set "descr" "A pool with autoreplace set will replace by physical path"
- atf_set "require.progs" zpool camcontrol zfsd
+ atf_set "require.progs" gnop zpool zfsd
atf_set "timeout" 3600
}
zfsd_autoreplace_002_pos_body()
@@ -405,7 +405,7 @@ zfsd_autoreplace_002_pos_cleanup()
. $(atf_get_srcdir)/../hotspare/hotspare.kshlib
. $(atf_get_srcdir)/../hotspare/hotspare.cfg
- ksh93 $(atf_get_srcdir)/hotspare_cleanup.ksh || atf_fail "Cleanup failed"
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
atf_test_case zfsd_autoreplace_003_pos cleanup
@@ -435,7 +435,7 @@ zfsd_autoreplace_003_pos_cleanup()
. $(atf_get_srcdir)/../hotspare/hotspare.kshlib
. $(atf_get_srcdir)/../hotspare/hotspare.cfg
- ksh93 $(atf_get_srcdir)/hotspare_cleanup.ksh || atf_fail "Cleanup failed"
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
atf_test_case zfsd_replace_001_pos cleanup
@@ -503,9 +503,9 @@ zfsd_replace_003_pos_head()
zfsd_replace_003_pos_body()
{
. $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/zfsd.cfg
+ . $(atf_get_srcdir)/../hotspare/hotspare.kshlib
+ . $(atf_get_srcdir)/../hotspare/hotspare.cfg
- verify_disk_count "$DISKS" 3
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfsd_replace_003_pos.ksh
if [[ $? != 0 ]]; then
@@ -525,7 +525,7 @@ atf_test_case zfsd_import_001_pos cleanup
zfsd_import_001_pos_head()
{
atf_set "descr" "If a removed drive gets reinserted while the pool is exported, it will detach its spare when imported."
- atf_set "require.progs" zfsd zpool
+ atf_set "require.progs" gnop zfsd zpool
atf_set "timeout" 3600
}
zfsd_import_001_pos_body()
From owner-svn-src-projects@freebsd.org Thu Feb 8 20:25:53 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD3EDF019AB
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 20:25:53 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 5EE5A7B961;
Thu, 8 Feb 2018 20:25:53 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 59C0B1AEF5;
Thu, 8 Feb 2018 20:25:53 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18KPrdg034848;
Thu, 8 Feb 2018 20:25:53 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18KPrxn034846;
Thu, 8 Feb 2018 20:25:53 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082025.w18KPrxn034846@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 20:25:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329028 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Commit-Revision: 329028
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 20:25:53 -0000
Author: asomers
Date: Thu Feb 8 20:25:52 2018
New Revision: 329028
URL: https://svnweb.freebsd.org/changeset/base/329028
Log:
WIP removing SAS phy control from the ZFS test suite
Convert zfsd_replace_001_pos to use libgnop
tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
* Simulate disk failures with gnop, not SAS phy control
* Fix the log_assert message
* Reduce the disk count to 3
* Reduce the runtime by removing excessive I/O
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh Thu Feb 8 20:24:54 2018 (r329027)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh Thu Feb 8 20:25:52 2018 (r329028)
@@ -35,48 +35,42 @@
. $STF_SUITE/tests/hotspare/hotspare.kshlib
. $STF_SUITE/tests/zfsd/zfsd.kshlib
. $STF_SUITE/include/libtest.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
-verify_runnable "global"
+log_assert "ZFSD will automatically replace a SAS disk that dissapears and reappears in the same location, with the same devname"
-log_assert "Failing a disk from a SAS expander is recognized by ZFS"
-
-log_onexit autoreplace_cleanup
ensure_zfsd_running
-child_pids=""
+set_disks
-set -A TMPDISKS $DISKS
-typeset REMOVAL_DISK=${TMPDISKS[0]}
-REMOVAL_DISK=${REMOVAL_DISK##*/}
+typeset REMOVAL_DISK=$DISK0
+typeset REMOVAL_NOP=${DISK0}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2}"
+typeset ALLDISKS="${DISK0} ${DISK1} ${DISK2}"
+typeset ALLNOPS=${ALLDISKS//~(E)([[:space:]]+|$)/.nop\1}
+log_must create_gnops $ALLDISKS
for type in "raidz" "mirror"; do
# Create a pool on the supplied disks
- create_pool $TESTPOOL $type $DISKS
+ create_pool $TESTPOOL $type $ALLNOPS
log_must $ZFS create $TESTPOOL/$TESTFS
log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
- # Find the first disk, get the expander and phy
- log_note "Looking for expander and phy information for $REMOVAL_DISK"
- find_verify_sas_disk $REMOVAL_DISK
+ # Disable the first disk.
+ log_must destroy_gnop $REMOVAL_DISK
- log_note "Disabling \"$REMOVAL_DISK\" on expander $EXPANDER phy $PHY"
- # Disable the first disk. We have to do this first, because if
- # there is I/O active to the
- disable_sas_disk $EXPANDER $PHY
-
# Write out data to make sure we can do I/O after the disk failure
- log_must $DD if=/dev/zero of=$TESTDIR/$TESTFILE bs=1m count=512
+ log_must $DD if=/dev/zero of=$TESTDIR/$TESTFILE bs=1m count=1
+ log_must $FSYNC $TESTDIR/$TESTFILE
# Check to make sure ZFS sees the disk as removed
- wait_for_pool_removal 20
+ wait_for_pool_dev_state_change 20 $REMOVAL_NOP REMOVED
- # Re-enable the disk, we don't want to leave it turned off
- log_note "Re-enabling phy $PHY on expander $EXPANDER"
- enable_sas_disk $EXPANDER $PHY
+ # Re-enable the disk
+ log_must create_gnop $REMOVAL_DISK
# Disk should auto-join the zpool & be resilvered.
- wait_for_pool_dev_state_change 20 $REMOVAL_DISK ONLINE
+ wait_for_pool_dev_state_change 20 $REMOVAL_NOP ONLINE
wait_until_resilvered
$ZPOOL status $TESTPOOL
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 20:24:54 2018 (r329027)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 20:25:52 2018 (r329028)
@@ -449,7 +449,7 @@ zfsd_replace_001_pos_body()
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/zfsd.cfg
- verify_disk_count "$DISKS" 2
+ verify_disk_count "$DISKS" 3
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfsd_replace_001_pos.ksh
if [[ $? != 0 ]]; then
From owner-svn-src-projects@freebsd.org Thu Feb 8 20:28:31 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76E1EF01D7F
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 20:28:31 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 2D7C97BD59;
Thu, 8 Feb 2018 20:28:31 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 287851AF1D;
Thu, 8 Feb 2018 20:28:31 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18KSU48035367;
Thu, 8 Feb 2018 20:28:30 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18KSUtj035364;
Thu, 8 Feb 2018 20:28:30 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082028.w18KSUtj035364@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 20:28:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329029 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Commit-Revision: 329029
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 20:28:31 -0000
Author: asomers
Date: Thu Feb 8 20:28:30 2018
New Revision: 329029
URL: https://svnweb.freebsd.org/changeset/base/329029
Log:
WIP removing SAS phy control from the ZFS test suite
Convert zfsd_replace_002_pos to use libgnop instead of libsas
tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
* Simulate disk failures with gnop, not sas phy control
* Reduce disk count to 3
* Reduce timeouts, so the test fails faster
The test is still disabled, because we never implemented this
feature in zfsd.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh Thu Feb 8 20:25:52 2018 (r329028)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh Thu Feb 8 20:28:30 2018 (r329029)
@@ -24,7 +24,7 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# Copyright 2012,2013 Spectra Logic Corporation. All rights reserved.
+# Copyright 2012-2018 Spectra Logic Corporation. All rights reserved.
# Use is subject to license terms.
#
# Portions taken from:
@@ -33,144 +33,41 @@
# $FreeBSD$
. $STF_SUITE/include/libtest.kshlib
-. $STF_SUITE/include/libsas.kshlib
+. $STF_SUITE/include/libgnop.kshlib
-verify_runnable "global"
-
-function cleanup
+function is_pool_unavail # pool
{
- reap_children
- destroy_pool $TESTPOOL
-
- # See if the phy has been disabled, and try to re-enable it if possible.
- for CURDISK in $TMPDISKS[*]; do
- if [ ! -z ${EXPANDER_LIST[$CURDISK]} -a ! -z ${PHY_LIST[$CURDISK]} ]; then
- find_disk_by_phy ${EXPANDER_LIST[$CURDISK]} ${PHY_LIST[$CURDISK]}
- [ -n "$FOUNDDISK" ] && continue
- fi
- enable_sas_disk ${EXPANDER_LIST[$CURDISK]} ${PHY_LIST[$CURDISK]}
- done
- rescan_disks
-
- [[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+ is_pool_state "$1" "UNAVAIL"
}
log_assert "A pool can come back online after all disks are failed and reactivated"
-log_unsupported "This test is currently unsupported, ZFS hangs when all drives fail and come back"
+log_unsupported "This feature has not yet been implemented in zfsd"
-log_onexit cleanup
-
-child_pids=""
-
ensure_zfsd_running
-set -A TMPDISKS $DISKS
-NUMDISKS=${#TMPDISKS[*]}
+set_disks
+typeset ALLDISKS="${DISK0} ${DISK1} ${DISK2}"
+typeset ALLNOPS=${ALLDISKS//~(E)([[:space:]]+|$)/.nop\1}
-# Trim out any /dev prefix on the disk.
-((i=0))
-while [ $i -lt $NUMDISKS ]; do
- TMPDISKS[$i]=${TMPDISKS[$i]##*/}
- ((i++));
-done
-
+log_must create_gnops $ALLDISKS
for type in "raidz" "mirror"; do
# Create a pool on the supplied disks
- create_pool $TESTPOOL $type $DISKS
+ create_pool $TESTPOOL $type $ALLNOPS
log_must $ZFS create $TESTPOOL/$TESTFS
log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
- unset EXPANDER_LIST
- typeset -A EXPANDER_LIST
- unset PHY_LIST
- typeset -A PHY_LIST
+ # Disable all vdevs. The pool should become UNAVAIL
+ log_must destroy_gnop $DISK0
+ log_must destroy_gnop $DISK1
+ log_must destroy_gnop $DISK2
+ wait_for 5 1 is_pool_unavail $TESTPOOL
- # First, disable the PHYs for all of the disks.
- for CURDISK in ${TMPDISKS[*]}; do
- # Find the first disk, get the expander and phy
- log_note "Looking for expander and phy information for $CURDISK"
- find_verify_sas_disk $CURDISK
+ # Renable all vdevs. The pool should become healthy again
+ log_must create_gnop $DISK0
+ log_must create_gnop $DISK1
+ log_must create_gnop $DISK2
- # Record the expander and PHY for this particular disk, so
- # that we can re-enable the disk later, even if it comes
- # back as a different da(4) instance.
- EXPANDER_LIST[$CURDISK]=$EXPANDER
- PHY_LIST[$CURDISK]=$PHY
-
- log_note "Disabling \"$CURDISK\" on expander $EXPANDER phy $PHY"
- # Disable the first disk. We have to do this first, because if
- # there is I/O active to the
- disable_sas_disk $EXPANDER $PHY
- done
-
- # Make sure that the pool status is "UNAVAIL". We have taken all
- # of the drives offline, so it should be.
- log_must is_pool_state $TESTPOOL UNAVAIL
-
- # Now we re-enable all of the PHYs. Note that we turned off the
- # sleep inside enable_sas_disk, so this should quickly.
- for CURDISK in ${TMPDISKS[*]}; do
- # Re-enable the disk, we don't want to leave it turned off
- log_note "Re-enabling phy ${PHY_LIST[$CURDISK]} on expander ${EXPANDER_LIST[$CURDISK]}"
- enable_sas_disk ${EXPANDER_LIST[$CURDISK]} ${PHY_LIST[$CURDISK]}
- done
-
- unset DISK_FOUND
- typeset -A DISK_FOUND
-
- log_note "Checking to see whether disks have reappeared"
- ((retries=0))
- while [ ${#DISK_FOUND[*]} -lt $NUMDISKS ] && [ $retries -lt 3 ]; do
- # If this isn't the first time through, give the disk a
- # little more time to show up.
- [ $retries -ne 0 ] && $SLEEP 5
-
- for CURDISK in ${TMPDISKS[*]}; do
- # If we already found this disk, we don't need to
- # check again. Note that the new name may not be
- # the same as the name referenced in CURDISK. That
- # is why we look for the disk by expander and PHY.
- [ ! -z ${DISK_FOUND[$CURDISK]} ] && continue
-
- # Make sure the disk is back in the topology
- find_disk_by_phy ${EXPANDER_LIST[$CURDISK]} ${PHY_LIST[$CURDISK]}
- if [ ! -z "$FOUNDDISK" ]; then
- # This does serve as a mapping from the old
- # disk name to the new disk name.
- DISK_FOUND[$CURDISK]=$FOUNDDISK
- fi
- done
- ((retries++))
- done
-
- if [ ${#DISK_FOUND[*]} -lt $NUMDISKS ]; then
- for CURDISK in ${TMPDISKS[*]}; do
- [ ! -z ${DISK_FOUND[$CURDISK]} ] && continue
- log_note "Disk $CURDISK has not appeared at phy $PHY_LIST[$CURDISK] on expander $EXPANDER_LIST[$CURDISK] after 20 seconds"
- done
- ((num_missing=${NUM_DISKS} - ${#DISK_FOUND[*]}))
- log_fail "Missing $num_missing Disks out of $NUM_DISKS Disks"
- else
- for CURDISK in ${TMPDISKS[*]}; do
- log_note "Disk $CURDISK is back as ${DISK_FOUND[$CURDISK]}"
- done
- # Reset our array of disks, because we may have disks that
- # have come back at a different ID. i.e. da0 may now be da7,
- # and da0 may no longer be a disk that we are authorized to use.
- # This is a more generic problem that we may need to tackle
- # with this test. We may need to reset the DISKS list itself.
- set -A TMPDISKS ${DISK_FOUND[*]}
- fi
-
- log_note "Raid type is $type"
-
- # In theory the pool should be back online.
- $ZPOOL status $TESTPOOL |grep ONLINE > /dev/null
- if [ $? != 0 ]; then
- log_fail "Pool $TESTPOOL is disk $TMPDISK did not automatically join the $TESTPOOL"
- else
- log_note "After reinsertion, disk is back in pool and online"
- fi
+ wait_for 5 1 is_pool_healthy $TESTPOOL
destroy_pool $TESTPOOL
log_must $RM -rf /$TESTPOOL
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 20:25:52 2018 (r329028)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 20:28:30 2018 (r329029)
@@ -474,11 +474,11 @@ zfsd_replace_002_pos_head()
}
zfsd_replace_002_pos_body()
{
- atf_expect_fail "ZFS hangs when an array becomes critical"
+ atf_expect_fail "Not yet implemented in zfsd"
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/zfsd.cfg
- verify_disk_count "$DISKS" 2
+ verify_disk_count "$DISKS" 3
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfsd_replace_002_pos.ksh
if [[ $? != 0 ]]; then
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:00:48 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 144CEF0429E
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:00:48 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id BD4427D51E;
Thu, 8 Feb 2018 21:00:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B7B521B441;
Thu, 8 Feb 2018 21:00:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18L0lU1052837;
Thu, 8 Feb 2018 21:00:47 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18L0lcl052832;
Thu, 8 Feb 2018 21:00:47 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082100.w18L0lcl052832@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:00:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329030 - in projects/zfsd/head/tests/sys/cddl/zfs/tests:
cli_root/zpool_clear zfsd
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests:
cli_root/zpool_clear zfsd
X-SVN-Commit-Revision: 329030
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:00:48 -0000
Author: asomers
Date: Thu Feb 8 21:00:47 2018
New Revision: 329030
URL: https://svnweb.freebsd.org/changeset/base/329030
Log:
Add zpool_clear_005_pos
It tests that "zpool clear" can reactivate a suspended pool after all vdevs
have disappeared and then returned. It's nearly identical to
zfsd_replace_002_pos, but tests manual reactivation rather than automatic
reactivation.
tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_005_pos.ksh
tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
Add the new test
tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh
tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
Improve some test descriptions
Sponsored by: Spectra Logic Corp
Added:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_005_pos.ksh
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile Thu Feb 8 20:28:30 2018 (r329029)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile Thu Feb 8 21:00:47 2018 (r329030)
@@ -15,5 +15,6 @@ ${PACKAGE}FILES+= zpool_clear.cfg
${PACKAGE}FILES+= zpool_clear_001_pos.ksh
${PACKAGE}FILES+= setup.ksh
${PACKAGE}FILES+= zpool_clear_004_pos.ksh
+${PACKAGE}FILES+= zpool_clear_005_pos.ksh
.include <bsd.test.mk>
Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_005_pos.ksh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_005_pos.ksh Thu Feb 8 21:00:47 2018 (r329030)
@@ -0,0 +1,77 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2012-2018 Spectra Logic Corporation. All rights reserved.
+# Use is subject to license terms.
+#
+# Portions taken from:
+# ident "@(#)replacement_001_pos.ksh 1.4 08/02/27 SMI"
+#
+# $Id$
+# $FreeBSD$
+
+. $STF_SUITE/include/libtest.kshlib
+. $STF_SUITE/include/libgnop.kshlib
+
+function is_pool_unavail # pool
+{
+ is_pool_state "$1" "UNAVAIL"
+}
+
+log_assert "A pool can come back online after all disks are failed and reactivated"
+
+set_disks
+typeset ALLDISKS="${DISK0} ${DISK1} ${DISK2}"
+typeset ALLNOPS=${ALLDISKS//~(E)([[:space:]]+|$)/.nop\1}
+
+log_must create_gnops $ALLDISKS
+for type in "raidz" "mirror"; do
+ # Create a pool on the supplied disks
+ create_pool $TESTPOOL $type $ALLNOPS
+ log_must $ZFS create $TESTPOOL/$TESTFS
+ log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+
+ # Disable all vdevs. The pool should become UNAVAIL
+ log_must destroy_gnop $DISK0
+ log_must destroy_gnop $DISK1
+ log_must destroy_gnop $DISK2
+ wait_for 5 1 is_pool_unavail $TESTPOOL
+
+ # Renable all vdevs. The pool should become healthy again
+ log_must create_gnop $DISK0
+ log_must create_gnop $DISK1
+ log_must create_gnop $DISK2
+
+ # Manually online the pool
+ log_must $ZPOOL clear $TESTPOOL
+
+ wait_for 5 1 is_pool_healthy $TESTPOOL
+
+ destroy_pool $TESTPOOL
+ log_must $RM -rf /$TESTPOOL
+done
+
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Thu Feb 8 20:28:30 2018 (r329029)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Thu Feb 8 21:00:47 2018 (r329030)
@@ -119,8 +119,30 @@ zpool_clear_004_pos_cleanup()
ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
+atf_test_case zpool_clear_005_pos cleanup
+zpool_clear_005_pos_head()
+{
+ atf_set "descr" "'zpool clear' can online an UNAVAIL pool after all vdevs have reappeared"
+ atf_set "require.progs" gnop zpool
+}
+zpool_clear_005_pos_body()
+{
+ . $(atf_get_srcdir)/../../../include/default.cfg
+ . $(atf_get_srcdir)/zpool_clear.cfg
+ ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ ksh93 $(atf_get_srcdir)/zpool_clear_005_pos.ksh || atf_fail "Testcase failed"
+}
+zpool_clear_005_pos_cleanup()
+{
+ . $(atf_get_srcdir)/../../../include/default.cfg
+ . $(atf_get_srcdir)/zpool_clear.cfg
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
+}
+
+
+
atf_init_test_cases()
{
@@ -128,4 +150,5 @@ atf_init_test_cases()
atf_add_test_case zpool_clear_002_neg
atf_add_test_case zpool_clear_003_neg
atf_add_test_case zpool_clear_004_pos
+ atf_add_test_case zpool_clear_005_pos
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh Thu Feb 8 20:28:30 2018 (r329029)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh Thu Feb 8 21:00:47 2018 (r329030)
@@ -40,7 +40,7 @@ function is_pool_unavail # pool
is_pool_state "$1" "UNAVAIL"
}
-log_assert "A pool can come back online after all disks are failed and reactivated"
+log_assert "zfsd will reactivate a pool after all disks are failed and reappeared"
log_unsupported "This feature has not yet been implemented in zfsd"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 20:28:30 2018 (r329029)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 21:00:47 2018 (r329030)
@@ -469,7 +469,7 @@ zfsd_replace_001_pos_cleanup()
atf_test_case zfsd_replace_002_pos cleanup
zfsd_replace_002_pos_head()
{
- atf_set "descr" "A pool can come back online after all disks have dissapeared and reappeared"
+ atf_set "descr" "zfsd will reactivate a pool after all disks are failed and reappeared"
atf_set "require.progs" zpool camcontrol zfsd zfs
}
zfsd_replace_002_pos_body()
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:03:47 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2F2DF04674
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:03:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 60DB47D7E2;
Thu, 8 Feb 2018 21:03:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B7221B5C4;
Thu, 8 Feb 2018 21:03:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18L3lE3057824;
Thu, 8 Feb 2018 21:03:47 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18L3lMS057822;
Thu, 8 Feb 2018 21:03:47 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082103.w18L3lMS057822@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:03:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329031 - in projects/zfsd/head: etc/mtree
tests/sys/cddl/zfs/tests tests/sys/cddl/zfs/tests/sas_phy_thrash
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head: etc/mtree tests/sys/cddl/zfs/tests
tests/sys/cddl/zfs/tests/sas_phy_thrash
X-SVN-Commit-Revision: 329031
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:03:47 -0000
Author: asomers
Date: Thu Feb 8 21:03:46 2018
New Revision: 329031
URL: https://svnweb.freebsd.org/changeset/base/329031
Log:
Delete sas_phy_thrash_001_pos.
It isn't related to ZFS. It actually tests cam, devfs, and mps/mpr.
Sponsored by: Spectra Logic Corp
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/
Modified:
projects/zfsd/head/etc/mtree/BSD.tests.dist
projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile
Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 21:00:47 2018 (r329030)
+++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 21:03:46 2018 (r329031)
@@ -651,8 +651,6 @@
..
rsend
..
- sas_phy_thrash
- ..
scrub_mirror
..
slog
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 8 21:00:47 2018 (r329030)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 8 21:03:46 2018 (r329031)
@@ -59,7 +59,6 @@ TESTS_SUBDIRS+= reservation
TESTS_SUBDIRS+= rootpool
# Not yet ported to FreeBSD
# TESTS_SUBDIRS+= rsend
-TESTS_SUBDIRS+= sas_phy_thrash
TESTS_SUBDIRS+= scrub_mirror
TESTS_SUBDIRS+= slog
TESTS_SUBDIRS+= snapshot
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:06:31 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 975E8F048D8
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:06:31 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 49E0A7D99C;
Thu, 8 Feb 2018 21:06:31 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 44A8F1B5C7;
Thu, 8 Feb 2018 21:06:31 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18L6Vj9057970;
Thu, 8 Feb 2018 21:06:31 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18L6UG8057968;
Thu, 8 Feb 2018 21:06:30 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082106.w18L6UG8057968@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:06:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329032 - in projects/zfsd/head/tests/sys/cddl/zfs:
include tests/zfsd
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include
tests/zfsd
X-SVN-Commit-Revision: 329032
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:06:31 -0000
Author: asomers
Date: Thu Feb 8 21:06:30 2018
New Revision: 329032
URL: https://svnweb.freebsd.org/changeset/base/329032
Log:
Finish removing SAS phy control from the ZFS test suite
SAS phy control is only available on systems with SAS expanders, never
available in a VM, and less reliable than simulating disk removal with gnop
tests/sys/cddl/zfs/include/Makefile
tests/sys/cddl/zfs/include/libsas.kshlib
Delete libsas.kshlib
tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib
Delete some sas-related library functions
Sponsored by: Spectra Logic Corp
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/include/libsas.kshlib
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Thu Feb 8 21:03:46 2018 (r329031)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Thu Feb 8 21:06:30 2018 (r329032)
@@ -12,7 +12,6 @@ MAN=
FILESDIR= ${TESTSBASE}/sys/cddl/zfs/include
${PACKAGE}FILES+= constants.cfg
${PACKAGE}FILES+= libremote.kshlib
-${PACKAGE}FILES+= libsas.kshlib
${PACKAGE}FILES+= libgnop.kshlib
${PACKAGE}FILES+= logapi.kshlib
${PACKAGE}FILES+= libtest.kshlib
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Thu Feb 8 21:03:46 2018 (r329031)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Thu Feb 8 21:06:30 2018 (r329032)
@@ -80,83 +80,3 @@ function corrupt_pool_vdev
# errors (though it's usually faster).
wait_for_pool_dev_state_change 60 $vdev DEGRADED
}
-
-#
-# do_autoreplace
-# Common code that walks through an autoreplace scenario
-# Does not verify the final behavior
-#
-# $1 spare disk name. Empty if no spare
-#
-function do_autoreplace
-{
- typeset SPARE_DISK=$1
-
- # Remove a vdev by disabling its SAS phy
- find_verify_sas_disk $REMOVAL_DISK
- log_note "Disabling \"$REMOVAL_DISK\" on expander $EXPANDER phy $PHY"
- disable_sas_disk $EXPANDER $PHY $REMOVAL_DISK
-
- # Check to make sure ZFS sees the disk as removed
- wait_for_pool_removal 30
-
- if [ -n "$SPARE_DISK" ]; then
- # Verify that the spare activates
- for ((timeout=0; $timeout<10; timeout=$timeout+1)); do
- check_state $TESTPOOL $SPARE_DISK "ONLINE" && break
- $SLEEP 6
- done
- zpool status $TESTPOOL
- log_must check_state $TESTPOOL "$SPARE_DISK" "ONLINE"
-
- wait_until_resilvered
- fi
-
- # Export the pool
- # This is to prevent REMOVAL_DISK from being added to the pool when
- # we reenable its phy
- log_must $ZPOOL export $TESTPOOL
-
- # Reenable the missing dev's SAS phy
- log_note "Reenabling phy on expander $EXPANDER phy $PHY"
- enable_sas_disk $EXPANDER $PHY
-
- # Erase the missing dev's ZFS label
- log_must $ZPOOL labelclear -f $( find_disks $FOUNDDISK )
-
- # Disable the missing dev's SAS phy again
- find_verify_sas_disk $FOUNDDISK
- log_note "Disabling \"$FOUNDDISK\" on expander $EXPANDER phy $PHY"
- disable_sas_disk $EXPANDER $PHY $FOUNDDISK
-
- # Import the pool
- log_must $ZPOOL import $TESTPOOL
- # Wait 5 seconds before enabling the phy so zfsd.log will be easier
- # to interpret
- $SLEEP 5
-
- # Reenable the missing dev's SAS phy
- log_note "Reenabling phy on expander $EXPANDER phy $PHY"
- enable_sas_disk $EXPANDER $PHY
-}
-
-function autoreplace_cleanup
-{
- destroy_pool $TESTPOOL
-
- # See if the phy has been disabled, and try to re-enable it if possible.
- if [ -n "$REMOVAL_DISK" -a -n "$EXPANDER" -a -n "$PHY" ]; then
- log_note "Renabling ${EXPANDER}:${PHY} for disk ${REMOVAL_DISK}"
- enable_sas_disk $EXPANDER $PHY
-
- # For debugging purposes, log the partial output of
- # camcontrol to see if the disk actually came back.
- out=$(camcontrol smpphylist ${EXPANDER} | ${GREP} "^ *${PHY}")
- log_note "Expander has: ${out}"
- fi
-
- [[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
-
- partition_cleanup
- restart_zfsd
-}
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:14:28 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE50EF05493
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:14:28 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 70A317E293;
Thu, 8 Feb 2018 21:14:28 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B90E1B777;
Thu, 8 Feb 2018 21:14:28 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LESxY062982;
Thu, 8 Feb 2018 21:14:28 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LESqR062980;
Thu, 8 Feb 2018 21:14:28 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082114.w18LESqR062980@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:14:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329034 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug
X-SVN-Commit-Revision: 329034
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:14:29 -0000
Author: asomers
Date: Thu Feb 8 21:14:28 2018
New Revision: 329034
URL: https://svnweb.freebsd.org/changeset/base/329034
Log:
Delete redundant hotplug tests
hotplug_004_pos was redundant with zpool_replace_002_neg. The others were
redundant with various zfsd tests.
Sponsored by: Spectra Logic Corp
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_004_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_005_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_006_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_009_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_010_pos.ksh
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 8 21:11:48 2018 (r329033)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 8 21:14:28 2018 (r329034)
@@ -8,19 +8,12 @@ FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= hotplug_test
-${PACKAGE}FILES+= hotplug.cfg
-${PACKAGE}FILES+= hotplug_006_pos.ksh
-${PACKAGE}FILES+= hotplug_002_pos.ksh
${PACKAGE}FILES+= cleanup.ksh
-${PACKAGE}FILES+= hotplug_003_pos.ksh
-${PACKAGE}FILES+= setup.ksh
-${PACKAGE}FILES+= hotplug_005_pos.ksh
-${PACKAGE}FILES+= hotplug_001_pos.ksh
-${PACKAGE}FILES+= hotplug_009_pos.ksh
-${PACKAGE}FILES+= hotplug_010_pos.ksh
+${PACKAGE}FILES+= hotplug.cfg
${PACKAGE}FILES+= hotplug.kshlib
-${PACKAGE}FILES+= hotplug_011_pos.ksh
+${PACKAGE}FILES+= hotplug_001_pos.ksh
${PACKAGE}FILES+= hotplug_008_pos.ksh
-${PACKAGE}FILES+= hotplug_004_pos.ksh
+${PACKAGE}FILES+= hotplug_011_pos.ksh
+${PACKAGE}FILES+= setup.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh Thu Feb 8 21:11:48 2018 (r329033)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh Thu Feb 8 21:14:28 2018 (r329034)
@@ -49,142 +49,6 @@ hotplug_001_pos_cleanup()
ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
-
-atf_test_case hotplug_002_pos cleanup
-hotplug_002_pos_head()
-{
- atf_set "descr" "When removing and reinserting a device, the device status is ONLINE."
- atf_set "require.progs" zpool gnop
-}
-hotplug_002_pos_body()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- atf_skip "redundant with zfsd_replace_001_pos"
- verify_disk_count "$DISKS" 4
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
- ksh93 $(atf_get_srcdir)/hotplug_002_pos.ksh || atf_fail "Testcase failed"
-}
-hotplug_002_pos_cleanup()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
-}
-
-
-atf_test_case hotplug_003_pos cleanup
-hotplug_003_pos_head()
-{
- atf_set "descr" "Having removed a device from a redundant pool and inserted a newdevice, the new device state will be 'ONLINE' when autoreplace is on,\and 'UNAVAIL' when autoreplace is off"
- atf_set "require.progs" zpool lofiadm
- atf_set "timeout" 1800
-}
-hotplug_003_pos_body()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- atf_skip "redundant with zfsd_autoreplace_00[12]*"
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
- ksh93 $(atf_get_srcdir)/hotplug_003_pos.ksh || atf_fail "Testcase failed"
-}
-hotplug_003_pos_cleanup()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
-}
-
-
-atf_test_case hotplug_004_pos cleanup
-hotplug_004_pos_head()
-{
- atf_set "descr" "When device replacement fails, the original device's state willbe 'UNAVAIL' and an FMA fault will be generated."
- atf_set "require.progs" zpool lofiadm
- atf_set "timeout" 1800
-}
-hotplug_004_pos_body()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- atf_skip "Does not apply to FreeBSD"
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
- ksh93 $(atf_get_srcdir)/hotplug_004_pos.ksh || atf_fail "Testcase failed"
-}
-hotplug_004_pos_cleanup()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
-}
-
-
-atf_test_case hotplug_005_pos cleanup
-hotplug_005_pos_head()
-{
- atf_set "descr" "Regarding of autoreplace, when removing offline device andreinserting again. This device's status is 'ONLINE'. \No FMA fault was generated."
- atf_set "require.progs" zpool lofiadm
- atf_set "timeout" 1800
-}
-hotplug_005_pos_body()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- atf_skip "TODO: move to the zfsd directory"
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
- ksh93 $(atf_get_srcdir)/hotplug_005_pos.ksh || atf_fail "Testcase failed"
-}
-hotplug_005_pos_cleanup()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
-}
-
-
-atf_test_case hotplug_006_pos cleanup
-hotplug_006_pos_head()
-{
- atf_set "descr" "When unsetting/setting autoreplace, then replacing device, verifythe device's status is 'UNAVAIL/ONLINE'. No FMA fault is generated."
- atf_set "require.progs" zpool lofiadm
- atf_set "timeout" 1800
-}
-hotplug_006_pos_body()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- atf_skip "redundant with hotplug_050_pos"
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
- ksh93 $(atf_get_srcdir)/hotplug_006_pos.ksh || atf_fail "Testcase failed"
-}
-hotplug_006_pos_cleanup()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
-}
-
-
atf_test_case hotplug_008_pos cleanup
hotplug_008_pos_head()
{
@@ -210,61 +74,6 @@ hotplug_008_pos_cleanup()
ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
}
-
-atf_test_case hotplug_009_pos cleanup
-hotplug_009_pos_head()
-{
- atf_set "descr" "Power off machine and replacing device, verify device status isONLINE when autoreplace is on and UNAVAIL when autoreplace is off"
- atf_set "require.progs" zpool lofiadm svcadm svcs
- atf_set "timeout" 1800
-}
-hotplug_009_pos_body()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- atf_skip "redundant with zfsd_import_001_pos"
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
- ksh93 $(atf_get_srcdir)/hotplug_009_pos.ksh || atf_fail "Testcase failed"
-}
-hotplug_009_pos_cleanup()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
-}
-
-
-atf_test_case hotplug_010_pos cleanup
-hotplug_010_pos_head()
-{
- atf_set "descr" "Removing device offlined and reinserting onlined,verify the device status ONLINE."
- atf_set "require.progs" zpool lofiadm svcadm svcs
- atf_set "timeout" 1800
-}
-hotplug_010_pos_body()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- atf_skip "redundant with zfsd_replace_001_pos"
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
- ksh93 $(atf_get_srcdir)/hotplug_010_pos.ksh || atf_fail "Testcase failed"
-}
-hotplug_010_pos_cleanup()
-{
- . $(atf_get_srcdir)/../../include/default.cfg
- . $(atf_get_srcdir)/hotplug.kshlib
- . $(atf_get_srcdir)/hotplug.cfg
-
- ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
-}
-
-
atf_test_case hotplug_011_pos cleanup
hotplug_011_pos_head()
{
@@ -295,13 +104,6 @@ atf_init_test_cases()
{
atf_add_test_case hotplug_001_pos
- atf_add_test_case hotplug_002_pos
- atf_add_test_case hotplug_003_pos
- atf_add_test_case hotplug_004_pos
- atf_add_test_case hotplug_005_pos
- atf_add_test_case hotplug_006_pos
atf_add_test_case hotplug_008_pos
- atf_add_test_case hotplug_009_pos
- atf_add_test_case hotplug_010_pos
atf_add_test_case hotplug_011_pos
}
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:17:06 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D783F05769
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:17:05 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 2E4847E53F;
Thu, 8 Feb 2018 21:17:05 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0EC611B781;
Thu, 8 Feb 2018 21:17:05 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LH4fO063401;
Thu, 8 Feb 2018 21:17:04 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LGoWt063250;
Thu, 8 Feb 2018 21:16:50 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082116.w18LGoWt063250@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:16:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329035 - in projects/zfsd/head/tests/sys/cddl/zfs:
include tests/acl tests/acl/cifs tests/atime tests/bootfs tests/cache
tests/cachefile tests/clean_mirror tests/cli_root tests/cli_roo...
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include
tests/acl tests/acl/cifs tests/atime tests/bootfs tests/cache tests/cachefile
tests/clean_mirror tests/cli_root tests/cli_root/zdb tests/cli_root/zfs ...
X-SVN-Commit-Revision: 329035
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:17:06 -0000
Author: asomers
Date: Thu Feb 8 21:16:50 2018
New Revision: 329035
URL: https://svnweb.freebsd.org/changeset/base/329035
Log:
Add vim modelines to the ZFS test suite
Add modelines to all .{cfg,shlib,kshlib} files. This is long overdue.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg
projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/include/libremote.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib
projects/zfsd/head/tests/sys/cddl/zfs/include/testenv.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/default.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_malformed.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/properties.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_list_d.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli_user.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compress.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state003.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state004.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state007.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state008.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/interop.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/iscsi.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/iscsi_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/large_files.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/link_count.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/migration.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/migration.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/vars.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/mv_files.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/mv_files_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/nestedfs.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/enospc.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/quota.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/quota.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/refquota.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/cross_endian.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/cross_endian_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/rebooting.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/remote_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/sharing.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/rename_dirs.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/default.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/snapused.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/snapused.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/sparse.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/threadsappend.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/truncate.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/xattr.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/xattr_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/zones.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/zones_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash.cfg
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,4 +1,5 @@
#!/usr/bin/env ksh93
+# vim: filetype=sh
# Add test-specific binaries to PATH
export PATH=${STF_SUITE}/bin:${PATH}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libgnop.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# Copyright (c) 2017 Spectra Logic Corporation
# All rights reserved.
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libremote.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libremote.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libremote.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/testenv.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/testenv.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/testenv.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
. ${STF_SUITE}/include/libtest.kshlib
. ${STF_SUITE}/include/commands.cfg
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/acl_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,4 +1,5 @@
#!/usr/local/bin/ksh93 -p
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/default.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/default.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/default.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/cli_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_malformed.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_malformed.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_malformed.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/properties.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/properties.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/properties.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_list_d.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_list_d.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_list_d.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,4 +1,5 @@
#!/bin/ksh -p
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
# Common routines used by zpool_import*.
function setup_missing_test_pool # <tvd_type>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli_user.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli_user.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli_user.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compress.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compress.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compress.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_common.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_common.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.kshlib Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inherit.kshlib Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state003.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state003.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state003.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state004.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state004.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state004.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state007.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state007.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state007.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state008.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state008.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state008.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
+# vim: filetype=sh
#
# CDDL HEADER START
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg Thu Feb 8 21:14:28 2018 (r329034)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg Thu Feb 8 21:16:50 2018 (r329035)
@@ -1,3 +1,4 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:17:55 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98AE8F058E1
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:17:55 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4D40B7E676;
Thu, 8 Feb 2018 21:17:55 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 481951B783;
Thu, 8 Feb 2018 21:17:55 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LHtwG063469;
Thu, 8 Feb 2018 21:17:55 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LHtYV063468;
Thu, 8 Feb 2018 21:17:55 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082117.w18LHtYV063468@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:17:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329036 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Commit-Revision: 329036
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:17:55 -0000
Author: asomers
Date: Thu Feb 8 21:17:54 2018
New Revision: 329036
URL: https://svnweb.freebsd.org/changeset/base/329036
Log:
Add gnop to require.progs in a few places where it was missing
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 21:16:50 2018 (r329035)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Thu Feb 8 21:17:54 2018 (r329036)
@@ -352,7 +352,7 @@ atf_test_case zfsd_autoreplace_001_neg cleanup
zfsd_autoreplace_001_neg_head()
{
atf_set "descr" "A pool without autoreplace set will not replace by physical path"
- atf_set "require.progs" zpool camcontrol zfsd
+ atf_set "require.progs" zpool camcontrol zfsd gnop
atf_set "timeout" 3600
}
zfsd_autoreplace_001_neg_body()
@@ -412,7 +412,7 @@ atf_test_case zfsd_autoreplace_003_pos cleanup
zfsd_autoreplace_003_pos_head()
{
atf_set "descr" "A pool with autoreplace set will replace by physical path even if a spare is active"
- atf_set "require.progs" zpool camcontrol zfsd
+ atf_set "require.progs" zpool camcontrol zfsd gnop
atf_set "timeout" 3600
}
zfsd_autoreplace_003_pos_body()
@@ -442,7 +442,7 @@ atf_test_case zfsd_replace_001_pos cleanup
zfsd_replace_001_pos_head()
{
atf_set "descr" "ZFSD will automatically replace a SAS disk that dissapears and reappears in the same location, with the same devname"
- atf_set "require.progs" zpool camcontrol zfsd zfs
+ atf_set "require.progs" zpool camcontrol zfsd zfs gnop
}
zfsd_replace_001_pos_body()
{
@@ -498,7 +498,7 @@ atf_test_case zfsd_replace_003_pos cleanup
zfsd_replace_003_pos_head()
{
atf_set "descr" "ZFSD will correctly replace disks that dissapear and reappear with different devnames"
- atf_set "require.progs" zpool camcontrol zfsd zfs
+ atf_set "require.progs" zpool camcontrol zfsd zfs gnop
}
zfsd_replace_003_pos_body()
{
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:27:20 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE445F063FC
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:27:19 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 51F947EE68;
Thu, 8 Feb 2018 21:27:19 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B26A1B94D;
Thu, 8 Feb 2018 21:27:19 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LRJjk068522;
Thu, 8 Feb 2018 21:27:19 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LRIWi068515;
Thu, 8 Feb 2018 21:27:18 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082127.w18LRIWi068515@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:27:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329037 - in projects/zfsd/head: etc/mtree
tests/sys/cddl/zfs/tests/clean_mirror
tests/sys/cddl/zfs/tests/clean_mirror/assertion_001
tests/sys/cddl/zfs/tests/clean_mirror/assertion_002 ...
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head: etc/mtree
tests/sys/cddl/zfs/tests/clean_mirror
tests/sys/cddl/zfs/tests/clean_mirror/assertion_001
tests/sys/cddl/zfs/tests/clean_mirror/assertion_002
tests/sys/cddl/zfs/tests/...
X-SVN-Commit-Revision: 329037
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:27:20 -0000
Author: asomers
Date: Thu Feb 8 21:27:18 2018
New Revision: 329037
URL: https://svnweb.freebsd.org/changeset/base/329037
Log:
Combine all clean_mirror tests into a single directory
There was never any good reason for using a separate subdirectory for each
test.
Sponsored by: Spectra Logic Corp
Added:
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_001_pos.ksh
- copied unchanged from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/clean_mirror_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_002_pos.ksh
- copied unchanged from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/clean_mirror_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_003_pos.ksh
- copied unchanged from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/clean_mirror_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_004_pos.ksh
- copied unchanged from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/clean_mirror_004_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_test.sh (contents, props changed)
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/
Modified:
projects/zfsd/head/etc/mtree/BSD.tests.dist
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile
Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 21:17:54 2018 (r329036)
+++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 21:27:18 2018 (r329037)
@@ -450,14 +450,6 @@
cachefile
..
clean_mirror
- assertion_001
- ..
- assertion_002
- ..
- assertion_003
- ..
- assertion_004
- ..
..
cli_root
zfs_upgrade
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile Thu Feb 8 21:17:54 2018 (r329036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile Thu Feb 8 21:27:18 2018 (r329037)
@@ -6,14 +6,15 @@ PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror
FILESDIR=${TESTSDIR}
-${PACKAGE}FILES+= setup.ksh
-${PACKAGE}FILES+= default.cfg
-${PACKAGE}FILES+= cleanup.ksh
-${PACKAGE}FILES+= clean_mirror_common.kshlib
+ATF_TESTS_KSH93+= clean_mirror_test
-TESTS_SUBDIRS+= assertion_001
-TESTS_SUBDIRS+= assertion_002
-TESTS_SUBDIRS+= assertion_003
-TESTS_SUBDIRS+= assertion_004
+${PACKAGE}FILES+= clean_mirror_001_pos.ksh
+${PACKAGE}FILES+= clean_mirror_002_pos.ksh
+${PACKAGE}FILES+= clean_mirror_003_pos.ksh
+${PACKAGE}FILES+= clean_mirror_004_pos.ksh
+${PACKAGE}FILES+= clean_mirror_common.kshlib
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= default.cfg
+${PACKAGE}FILES+= setup.ksh
.include <bsd.test.mk>
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_001_pos.ksh (from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/clean_mirror_001_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_001_pos.ksh Thu Feb 8 21:27:18 2018 (r329037, copy of r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/clean_mirror_001_pos.ksh)
@@ -0,0 +1,65 @@
+#! /usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)clean_mirror_001_pos.ksh 1.2 07/01/09 SMI"
+#
+
+. $STF_SUITE/include/libtest.kshlib
+. $STF_SUITE/tests/clean_mirror/clean_mirror_common.kshlib
+
+###############################################################################
+#
+# __stc_assertion_start
+#
+# ID: clean_mirror_001_pos
+#
+# DESCRIPTION:
+# The primary side of a zpool mirror can be zeroed without causing damage
+# to the data in the pool
+#
+# STRATEGY:
+# 1) Write several files to the ZFS filesystem mirror
+# 2) dd from /dev/zero over the primary side of the mirror
+# 3) verify that all the file contents are unchanged on the file system
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2005-07-04)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "global"
+
+log_assert "The primary side of a zpool mirror may be completely wiped" \
+ "without affecting the content of the pool"
+
+overwrite_verify_mirror $SIDE_PRIMARY /dev/zero
+
+log_pass "The overwrite had no effect on the data"
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_002_pos.ksh (from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/clean_mirror_002_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_002_pos.ksh Thu Feb 8 21:27:18 2018 (r329037, copy of r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/clean_mirror_002_pos.ksh)
@@ -0,0 +1,65 @@
+#! /usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)clean_mirror_002_pos.ksh 1.2 07/01/09 SMI"
+#
+
+. $STF_SUITE/include/libtest.kshlib
+. $STF_SUITE/tests/clean_mirror/clean_mirror_common.kshlib
+
+###############################################################################
+#
+# __stc_assertion_start
+#
+# ID: clean_mirror_002_pos
+#
+# DESCRIPTION:
+# The secondary side of a zpool mirror can be zeroed without causing damage
+# to the data in the pool
+#
+# STRATEGY:
+# 1) Write several files to the ZFS filesystem in the mirrored pool
+# 2) dd from /dev/zero over the secondary side of the mirror
+# 3) verify that all the file contents are unchanged on the file system
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2005-07-04)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "global"
+
+log_assert "The primary side of a zpool mirror may be completely wiped" \
+ "without affecting the content of the pool"
+
+overwrite_verify_mirror $SIDE_SECONDARY /dev/zero
+
+log_pass "The overwrite had no effect on the data"
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_003_pos.ksh (from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/clean_mirror_003_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_003_pos.ksh Thu Feb 8 21:27:18 2018 (r329037, copy of r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/clean_mirror_003_pos.ksh)
@@ -0,0 +1,65 @@
+#! /usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)clean_mirror_003_pos.ksh 1.2 07/01/09 SMI"
+#
+
+. $STF_SUITE/include/libtest.kshlib
+. $STF_SUITE/tests/clean_mirror/clean_mirror_common.kshlib
+
+###############################################################################
+#
+# __stc_assertion_start
+#
+# ID: clean_mirror_003_pos
+#
+# DESCRIPTION:
+# The primary side of a zpool mirror can be mangled without causing damage
+# to the data in the pool
+#
+# STRATEGY:
+# 1) Write several files to the ZFS filesystem mirror
+# 2) dd from /dev/urandom over the primary side of the mirror
+# 3) verify that all the file contents are unchanged on the file system
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2005-07-04)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "global"
+
+log_assert "The primary side of a zpool mirror may be completely mangled" \
+ "without affecting the content of the pool"
+
+overwrite_verify_mirror $SIDE_PRIMARY /dev/urandom
+
+log_pass "The overwrite did not have any effect on the data"
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_004_pos.ksh (from r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/clean_mirror_004_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_004_pos.ksh Thu Feb 8 21:27:18 2018 (r329037, copy of r329036, projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/clean_mirror_004_pos.ksh)
@@ -0,0 +1,65 @@
+#! /usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)clean_mirror_004_pos.ksh 1.2 07/01/09 SMI"
+#
+
+. $STF_SUITE/include/libtest.kshlib
+. $STF_SUITE/tests/clean_mirror/clean_mirror_common.kshlib
+
+###############################################################################
+#
+# __stc_assertion_start
+#
+# ID: clean_mirror_004_pos
+#
+# DESCRIPTION:
+# The secondary side of a zpool mirror can be mangled without causing damage
+# to the data in the pool
+#
+# STRATEGY:
+# 1) Write several files to the ZFS filesystem in the mirrored pool
+# 2) dd from /dev/urandom over the secondary side of the mirror
+# 3) verify that all the file contents are unchanged on the file system
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2005-07-04)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "global"
+
+log_assert "The primary side of a zpool mirror may be completely mangled" \
+ "without affecting the content of the pool"
+
+overwrite_verify_mirror $SIDE_SECONDARY /dev/urandom
+
+log_pass "The overwrite had no effect on the data"
Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_test.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_test.sh Thu Feb 8 21:27:18 2018 (r329037)
@@ -0,0 +1,131 @@
+# 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 2018 Spectra Logic. All rights reserved.
+# Use is subject to license terms.
+#
+
+
+atf_test_case clean_mirror_001_pos cleanup
+clean_mirror_001_pos_head()
+{
+ atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool"
+}
+clean_mirror_001_pos_body()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ verify_disk_count "$DISKS" 1
+ ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ ksh93 $(atf_get_srcdir)/clean_mirror_001_pos.ksh || atf_fail "Testcase failed"
+}
+clean_mirror_001_pos_cleanup()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
+}
+
+atf_test_case clean_mirror_002_pos cleanup
+clean_mirror_002_pos_head()
+{
+ atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool"
+}
+clean_mirror_002_pos_body()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ verify_disk_count "$DISKS" 1
+ ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ ksh93 $(atf_get_srcdir)/clean_mirror_002_pos.ksh || atf_fail "Testcase failed"
+}
+clean_mirror_002_pos_cleanup()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
+}
+
+atf_test_case clean_mirror_003_pos cleanup
+clean_mirror_003_pos_head()
+{
+ atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool"
+}
+clean_mirror_003_pos_body()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ verify_disk_count "$DISKS" 1
+ ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ ksh93 $(atf_get_srcdir)/clean_mirror_003_pos.ksh || atf_fail "Testcase failed"
+}
+clean_mirror_003_pos_cleanup()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
+}
+
+atf_test_case clean_mirror_004_pos cleanup
+clean_mirror_004_pos_head()
+{
+ atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool"
+}
+clean_mirror_004_pos_body()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ verify_disk_count "$DISKS" 1
+ ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ ksh93 $(atf_get_srcdir)/clean_mirror_004_pos.ksh || atf_fail "Testcase failed"
+}
+clean_mirror_004_pos_cleanup()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/clean_mirror_common.kshlib
+ . $(atf_get_srcdir)/default.cfg
+
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
+}
+
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case clean_mirror_001_pos
+ atf_add_test_case clean_mirror_002_pos
+ atf_add_test_case clean_mirror_003_pos
+ atf_add_test_case clean_mirror_004_pos
+}
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:28:11 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E81B9F064E0
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:28:10 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 99E8A7EFB8;
Thu, 8 Feb 2018 21:28:10 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 946B51B955;
Thu, 8 Feb 2018 21:28:10 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LSAYm068594;
Thu, 8 Feb 2018 21:28:10 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LSAw2068593;
Thu, 8 Feb 2018 21:28:10 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082128.w18LSAw2068593@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:28:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329038 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade
X-SVN-Commit-Revision: 329038
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:28:11 -0000
Author: asomers
Date: Thu Feb 8 21:28:10 2018
New Revision: 329038
URL: https://svnweb.freebsd.org/changeset/base/329038
Log:
Only use single disk pools for the zfs_upgrade tests.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh Thu Feb 8 21:27:18 2018 (r329037)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh Thu Feb 8 21:28:10 2018 (r329038)
@@ -30,7 +30,7 @@
. $STF_SUITE/include/libtest.kshlib
-verify_runnable "both"
+DISK=${DISKS%% *}
# This should have been set by the .cfg script - verify it's set to something
# (we check that something later on)
@@ -41,4 +41,4 @@ else
log_note "This machine is running ZFS Filesystem version $ZFS_VERSION"
fi
-default_setup "$DISKS"
+default_setup "$DISK"
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:33:24 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31140F06B55
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:33:24 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id D39277F573;
Thu, 8 Feb 2018 21:33:23 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE60F1BAF1;
Thu, 8 Feb 2018 21:33:23 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LXNqY073425;
Thu, 8 Feb 2018 21:33:23 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LXN91073423;
Thu, 8 Feb 2018 21:33:23 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082133.w18LXN91073423@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:33:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329039 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear
X-SVN-Commit-Revision: 329039
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:33:24 -0000
Author: asomers
Date: Thu Feb 8 21:33:23 2018
New Revision: 329039
URL: https://svnweb.freebsd.org/changeset/base/329039
Log:
Fix the zpool_clear tests when no disks are available
zpool_clear_001 through 004 don't actually need disks, but setup.ksh
uselessly creates a disk-backed pool anyway. Delete setup.ksh.
zpool_clear_005 needs 3 disks. Declare it so.
Sponsored by: Spectra Logic Corp
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/setup.ksh
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile Thu Feb 8 21:28:10 2018 (r329038)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile Thu Feb 8 21:33:23 2018 (r329039)
@@ -13,7 +13,6 @@ ${PACKAGE}FILES+= zpool_clear_003_neg.ksh
${PACKAGE}FILES+= zpool_clear_002_neg.ksh
${PACKAGE}FILES+= zpool_clear.cfg
${PACKAGE}FILES+= zpool_clear_001_pos.ksh
-${PACKAGE}FILES+= setup.ksh
${PACKAGE}FILES+= zpool_clear_004_pos.ksh
${PACKAGE}FILES+= zpool_clear_005_pos.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Thu Feb 8 21:28:10 2018 (r329038)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Thu Feb 8 21:33:23 2018 (r329039)
@@ -36,7 +36,6 @@ zpool_clear_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_clear.cfg
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_clear_001_pos.ksh || atf_fail "Testcase failed"
}
zpool_clear_001_pos_cleanup()
@@ -60,7 +59,6 @@ zpool_clear_002_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_clear.cfg
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_clear_002_neg.ksh || atf_fail "Testcase failed"
}
zpool_clear_002_neg_cleanup()
@@ -84,7 +82,6 @@ zpool_clear_003_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_clear.cfg
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_clear_003_neg.ksh || atf_fail "Testcase failed"
}
zpool_clear_003_neg_cleanup()
@@ -108,7 +105,6 @@ zpool_clear_004_pos_body()
. $(atf_get_srcdir)/zpool_clear.cfg
atf_expect_fail "https://www.illumos.org/issues/8641 zpool clear doesn't work on spare or replacing vdevs"
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_clear_004_pos.ksh || atf_fail "Testcase failed"
}
zpool_clear_004_pos_cleanup()
@@ -130,7 +126,7 @@ zpool_clear_005_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_clear.cfg
- ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ verify_disk_count "$DISKS" 3
ksh93 $(atf_get_srcdir)/zpool_clear_005_pos.ksh || atf_fail "Testcase failed"
}
zpool_clear_005_pos_cleanup()
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:35:42 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A0E9F06DAD
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:35:42 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id A3E927F73D;
Thu, 8 Feb 2018 21:35:41 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9EC821BAF9;
Thu, 8 Feb 2018 21:35:41 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LZfPp073551;
Thu, 8 Feb 2018 21:35:41 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LZfRN073550;
Thu, 8 Feb 2018 21:35:41 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082135.w18LZfRN073550@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:35:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329040 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history
X-SVN-Commit-Revision: 329040
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:35:42 -0000
Author: asomers
Date: Thu Feb 8 21:35:41 2018
New Revision: 329040
URL: https://svnweb.freebsd.org/changeset/base/329040
Log:
Remove useless check in the zpool_history tests
FreeBSD's ZFS test suite doesn't need to run on absurdly old versions of
ZFS.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh Thu Feb 8 21:33:23 2018 (r329039)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh Thu Feb 8 21:35:41 2018 (r329040)
@@ -29,9 +29,5 @@
. $STF_SUITE/include/libtest.kshlib
-# Check if the current system support 'zpool history'.
-$ZPOOL history > /dev/null
-(($? != 0)) && log_unsupported
-
DISK=${DISKS%% *}
default_container_volume_setup $DISK
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:38:57 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7A41F07197
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:38:57 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 6B4DA7FAA1;
Thu, 8 Feb 2018 21:38:57 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6634E1BAFD;
Thu, 8 Feb 2018 21:38:57 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LcvN4073822;
Thu, 8 Feb 2018 21:38:57 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LcvNu073821;
Thu, 8 Feb 2018 21:38:57 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082138.w18LcvNu073821@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:38:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329041 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare
X-SVN-Commit-Revision: 329041
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:38:57 -0000
Author: asomers
Date: Thu Feb 8 21:38:57 2018
New Revision: 329041
URL: https://svnweb.freebsd.org/changeset/base/329041
Log:
Fix hotspare_add_003_neg when no disks are present
Remove a superfluous is_disks_physical check
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh Thu Feb 8 21:35:41 2018 (r329040)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh Thu Feb 8 21:38:57 2018 (r329041)
@@ -83,10 +83,6 @@ function cleanup
partition_cleanup
}
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
log_assert "'zpool add [-f]' with hot spares should fail with inapplicable scenarios."
log_onexit cleanup
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:55:48 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5B11F08655
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:55:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 99B778078F;
Thu, 8 Feb 2018 21:55:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 947AE1BE41;
Thu, 8 Feb 2018 21:55:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LtlpQ083741;
Thu, 8 Feb 2018 21:55:47 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LtkGm083732;
Thu, 8 Feb 2018 21:55:46 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082155.w18LtkGm083732@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:55:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329042 - in projects/zfsd/head: etc/mtree
tests/sys/cddl/zfs/tests/mmap tests/sys/cddl/zfs/tests/mmap/mmap_read
tests/sys/cddl/zfs/tests/mmap/mmap_write
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head: etc/mtree
tests/sys/cddl/zfs/tests/mmap tests/sys/cddl/zfs/tests/mmap/mmap_read
tests/sys/cddl/zfs/tests/mmap/mmap_write
X-SVN-Commit-Revision: 329042
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:55:48 -0000
Author: asomers
Date: Thu Feb 8 21:55:46 2018
New Revision: 329042
URL: https://svnweb.freebsd.org/changeset/base/329042
Log:
Collapse the ZFS mmap tests into a single directory
Sponsored by: Spectra Logic Corp
Added:
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/cleanup.ksh
- copied unchanged from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/cleanup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap.cfg
- copied unchanged from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read_001_pos.ksh
- copied unchanged from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh (contents, props changed)
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write_001_pos.ksh
- copied unchanged from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/setup.ksh
- copied unchanged from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/setup.ksh
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/
Modified:
projects/zfsd/head/etc/mtree/BSD.tests.dist
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile
Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 21:38:57 2018 (r329041)
+++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 21:55:46 2018 (r329042)
@@ -596,10 +596,6 @@
migration
..
mmap
- mmap_read
- ..
- mmap_write
- ..
..
mount
..
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile Thu Feb 8 21:38:57 2018 (r329041)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile Thu Feb 8 21:55:46 2018 (r329042)
@@ -2,9 +2,16 @@
.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap
+FILESDIR=${TESTSDIR}
-TESTS_SUBDIRS+= mmap_read
-TESTS_SUBDIRS+= mmap_write
+ATF_TESTS_KSH93+= mmap_test
+
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= mmap.cfg
+${PACKAGE}FILES+= mmap_read_001_pos.ksh
+${PACKAGE}FILES+= mmap_write_001_pos.ksh
+${PACKAGE}FILES+= setup.ksh
.include <bsd.test.mk>
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/cleanup.ksh (from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/cleanup.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/cleanup.ksh Thu Feb 8 21:55:46 2018 (r329042, copy of r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/cleanup.ksh)
@@ -0,0 +1,32 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)cleanup.ksh 1.2 07/01/09 SMI"
+#
+
+. $STF_SUITE/include/libtest.kshlib
+
+default_cleanup
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap.cfg (from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read.cfg)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap.cfg Thu Feb 8 21:55:46 2018 (r329042, copy of r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read.cfg)
@@ -0,0 +1,30 @@
+# vim: filetype=sh
+#
+# 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 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)mmap_read.cfg 1.3 08/08/15 SMI"
+#
+
+export TESTFILE=testfile${TESTCASE_ID}
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read_001_pos.ksh (from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_001_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read_001_pos.ksh Thu Feb 8 21:55:46 2018 (r329042, copy of r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_001_pos.ksh)
@@ -0,0 +1,67 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)mmap_read_001_pos.ksh 1.3 09/01/12 SMI"
+#
+. $STF_SUITE/include/libtest.kshlib
+
+###########################################################################
+#
+# __stc_assertion_start
+#
+# ID: read_mmap_001_pos
+#
+# DESCRIPTION:
+# read()s from mmap()'ed file contain correct data.
+#
+# STRATEGY:
+# 1. Create a pool & dataset
+# 2. Call readmmap binary
+# 3. unmount this file system
+# 4. Verify the integrity of this pool & dateset
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2005-07-04)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "global"
+
+log_assert "read()s from mmap()'ed file contain correct data."
+
+log_must $CHMOD 777 $TESTDIR
+log_must $READMMAP $TESTDIR/$TESTFILE
+log_must $ZFS unmount $TESTPOOL/$TESTFS
+
+typeset dir=$(get_device_dir $DISKS)
+verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir"
+
+log_pass "read(2) calls from a mmap(2)'ed file succeeded."
Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh Thu Feb 8 21:55:46 2018 (r329042)
@@ -0,0 +1,78 @@
+# 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 mmap_read_001_pos cleanup
+mmap_read_001_pos_head()
+{
+ atf_set "descr" "read()s from mmap()'ed file contain correct data."
+ atf_set "require.progs" zfs zdb
+}
+mmap_read_001_pos_body()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/mmap.cfg
+
+ verify_disk_count "$DISKS" 1
+ ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ ksh93 $(atf_get_srcdir)/mmap_read_001_pos.ksh || atf_fail "Testcase failed"
+}
+mmap_read_001_pos_cleanup()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/mmap.cfg
+
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
+}
+
+atf_test_case mmap_write_001_pos cleanup
+mmap_write_001_pos_head()
+{
+ atf_set "descr" "write()s to a file and mmap() that file at the same time does notresult in a deadlock."
+}
+mmap_write_001_pos_body()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/mmap.cfg
+
+ verify_disk_count "$DISKS" 1
+ ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
+ ksh93 $(atf_get_srcdir)/mmap_write_001_pos.ksh || atf_fail "Testcase failed"
+}
+mmap_write_001_pos_cleanup()
+{
+ . $(atf_get_srcdir)/../../include/default.cfg
+ . $(atf_get_srcdir)/mmap.cfg
+
+ ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
+}
+
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case mmap_read_001_pos
+ atf_add_test_case mmap_write_001_pos
+}
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write_001_pos.ksh (from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_001_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write_001_pos.ksh Thu Feb 8 21:55:46 2018 (r329042, copy of r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_001_pos.ksh)
@@ -0,0 +1,91 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)mmap_write_001_pos.ksh 1.3 07/07/31 SMI"
+#
+. $STF_SUITE/include/libtest.kshlib
+
+# ##########################################################################
+#
+# __stc_assertion_start
+#
+# ID: mmap_write_001_pos
+#
+# DESCRIPTION:
+# Writing to a file and mmaping that file at the
+# same time does not result in a deadlock.
+#
+# STRATEGY:
+# 1. Make sure this test executes on multi-processes system.
+# 2. Call mmapwrite binary.
+# 3. wait 120s and make sure the test file existed.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2005-07-04)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+# Default is 120 seconds or 2 minutes
+WAITTIME=${WAITTIME-120}
+
+log_assert "write()s to a file and mmap() that file at the same time does not "\
+ "result in a deadlock."
+
+# Detect and make sure this test must be executed on a multi-process system
+NCPUS=`sysctl -a | awk -F '"' '/cpu count="[0-9+]"/ {print $2; exit}'`
+if [[ $? -ne 0 || -z $NCPUS || $NCPUS -le 1 ]]; then
+ log_unsupported "This test must be executed on a multi-processor system."
+fi
+
+log_must $CHMOD 777 $TESTDIR
+$MMAPWRITE $TESTDIR/$TESTFILE &
+PID_MMAPWRITE=$!
+log_note "$MMAPWRITE $TESTDIR/$TESTFILE pid: $PID_MMAPWRITE"
+log_must $SLEEP 10
+
+typeset -i i=0
+while (( i < $WAITTIME )); do
+ if ! $PS -ef | $PGREP $MMAPWRITE > /dev/null ; then
+ log_must $WAIT $PID_MMAPWRITE
+ break
+ fi
+ $SLEEP 1
+ (( i += 1 ))
+done
+
+if $PS -ef | $PGREP $MMAPWRITE > /dev/null ; then
+ log_must $KILL -9 $PID_MMAPWRITE
+fi
+log_must $LS -l $TESTDIR/$TESTFILE
+
+log_pass "write(2) a mmap(2)'ing file succeeded."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/setup.ksh (from r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/setup.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/setup.ksh Thu Feb 8 21:55:46 2018 (r329042, copy of r329041, projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/setup.ksh)
@@ -0,0 +1,34 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)setup.ksh 1.2 07/01/09 SMI"
+#
+
+. $STF_SUITE/include/libtest.kshlib
+
+DISK=${DISKS%% *}
+
+default_setup $DISK
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:57:36 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81DA3F0890B
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:57:36 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 3435A8096C;
Thu, 8 Feb 2018 21:57:36 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F5791BE47;
Thu, 8 Feb 2018 21:57:36 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18Lvaxi083840;
Thu, 8 Feb 2018 21:57:36 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LvaqZ083839;
Thu, 8 Feb 2018 21:57:36 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082157.w18LvaqZ083839@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:57:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329043 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files
X-SVN-Commit-Revision: 329043
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:57:36 -0000
Author: asomers
Date: Thu Feb 8 21:57:35 2018
New Revision: 329043
URL: https://svnweb.freebsd.org/changeset/base/329043
Log:
Fix ZFS's mv_files tests when no disks are defined
tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh
Delete some extraneous steps from the cleanup that cause the test to
fail if it was skipped.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh Thu Feb 8 21:55:46 2018 (r329042)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh Thu Feb 8 21:57:35 2018 (r329043)
@@ -29,16 +29,10 @@
. $STF_SUITE/include/libtest.kshlib
-verify_runnable "global"
-
[[ -f $TMPDIR/exitsZero.ksh ]] && \
log_must $RM -f $TMPDIR/exitsZero.ksh
[[ -f $TMPDIR/testbackgprocs.ksh ]] && \
log_must $RM -f $TMPDIR/testbackgprocs.ksh
-
-ismounted $TESTPOOL/$TESTFS_TGT
-(( $? == 0 )) && log_must $ZFS umount $TESTPOOL/$TESTFS_TGT
-log_must $ZFS destroy $TESTPOOL/$TESTFS_TGT
if [[ -d $TESTDIR_TGT ]]; then
log_must $RM -rf $TESTDIR_TGT
From owner-svn-src-projects@freebsd.org Thu Feb 8 21:58:21 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75095F089F8
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 21:58:21 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 22D4480ACE;
Thu, 8 Feb 2018 21:58:21 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DD181BE4B;
Thu, 8 Feb 2018 21:58:21 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LwLGh083922;
Thu, 8 Feb 2018 21:58:21 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LwKIe083920;
Thu, 8 Feb 2018 21:58:20 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082158.w18LwKIe083920@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 21:58:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329044 - in projects/zfsd/head/tests/sys/cddl/zfs/tests:
userquota zil
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests: userquota
zil
X-SVN-Commit-Revision: 329044
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 21:58:21 -0000
Author: asomers
Date: Thu Feb 8 21:58:20 2018
New Revision: 329044
URL: https://svnweb.freebsd.org/changeset/base/329044
Log:
Fix the userquota and zil cleanups when no disks are defined
tests/sys/cddl/zfs/tests/userquota/cleanup.ksh
tests/sys/cddl/zfs/tests/zil/cleanup.ksh
Don't do extraneous stuff during cleanup, and don't try to clear a disk
label if there is no $DISK.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh Thu Feb 8 21:57:35 2018 (r329043)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh Thu Feb 8 21:58:20 2018 (r329044)
@@ -34,10 +34,6 @@ if ! is_userquota_supported; then
log_unsupported "userquota is not supported in this system."
fi
-log_must cleanup_quota
log_must clean_user_group
-
-typeset mntp=$(get_prop mountpoint $QFS)
-log_must $CHMOD 0755 $mntp
default_cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh Thu Feb 8 21:57:35 2018 (r329043)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh Thu Feb 8 21:58:20 2018 (r329044)
@@ -33,4 +33,5 @@
# clear its label with labelclear instead of relying on zpool destroy
DISK=${DISKS%% *}
$ZPOOL destroy -f $TESTPOOL
-$ZPOOL labelclear -f $DISK
+[ -n "$DISK" ] && $ZPOOL labelclear -f $DISK
+log_pass
From owner-svn-src-projects@freebsd.org Thu Feb 8 22:06:49 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1C7EF092FA
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 22:06:48 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 531AB81113;
Thu, 8 Feb 2018 22:06:48 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CEC71BFFC;
Thu, 8 Feb 2018 22:06:48 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18M6mWa089006;
Thu, 8 Feb 2018 22:06:48 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18M6k81088988;
Thu, 8 Feb 2018 22:06:46 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082206.w18M6k81088988@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 22:06:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329045 - in projects/zfsd/head/tests/sys/cddl/zfs/tests:
acl/cifs acl/nontrivial acl/trivial atime bootfs cachefile cli_root/zdb
cli_root/zfs cli_root/zfs_clone cli_root/zfs_copies cli...
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests: acl/cifs
acl/nontrivial acl/trivial atime bootfs cachefile cli_root/zdb cli_root/zfs
cli_root/zfs_clone cli_root/zfs_copies cli_root/zfs_create cli_root...
X-SVN-Commit-Revision: 329045
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 22:06:49 -0000
Author: asomers
Date: Thu Feb 8 22:06:46 2018
New Revision: 329045
URL: https://svnweb.freebsd.org/changeset/base/329045
Log:
Skip various ZFS tests when no disks are defined.
Add verify_disk_count statements to all tests as appropriate. This gets the
entire ZFS test suite passing or skipped in that scenario.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh
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_get/zfs_get_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh
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_promote/zfs_promote_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_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/zfs_upgrade/zfs_upgrade_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_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_export/zpool_export_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/large_files_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/migration_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/quota_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/sparse_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/threadsappend_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -37,6 +37,7 @@ cifs_attr_001_pos_body()
. $(atf_get_srcdir)/cifs.kshlib
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cifs_attr_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -63,6 +64,7 @@ cifs_attr_002_pos_body()
. $(atf_get_srcdir)/cifs.kshlib
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cifs_attr_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -89,6 +91,7 @@ cifs_attr_003_pos_body()
. $(atf_get_srcdir)/cifs.kshlib
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cifs_attr_003_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -35,6 +35,7 @@ zfs_acl_chmod_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -59,6 +60,7 @@ zfs_acl_chmod_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -83,6 +85,7 @@ zfs_acl_chmod_aclmode_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_aclmode_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -106,6 +109,7 @@ zfs_acl_chmod_compact_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_compact_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -129,6 +133,7 @@ zfs_acl_chmod_delete_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_delete_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -152,6 +157,7 @@ zfs_acl_chmod_inherit_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_inherit_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -176,6 +182,7 @@ zfs_acl_chmod_inherit_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_inherit_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -200,6 +207,7 @@ zfs_acl_chmod_inherit_003_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_inherit_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -224,6 +232,7 @@ zfs_acl_chmod_inherit_004_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_inherit_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -247,6 +256,7 @@ zfs_acl_chmod_owner_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_owner_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -270,6 +280,7 @@ zfs_acl_chmod_rwacl_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_rwacl_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -293,6 +304,7 @@ zfs_acl_chmod_rwx_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_rwx_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -316,6 +328,7 @@ zfs_acl_chmod_rwx_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_rwx_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -339,6 +352,7 @@ zfs_acl_chmod_rwx_003_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_rwx_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -362,6 +376,7 @@ zfs_acl_chmod_rwx_004_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_rwx_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -386,6 +401,7 @@ zfs_acl_chmod_xattr_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_xattr_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -410,6 +426,7 @@ zfs_acl_chmod_xattr_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_xattr_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -434,6 +451,7 @@ zfs_acl_cp_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_cp_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -458,6 +476,7 @@ zfs_acl_cp_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_cp_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -482,6 +501,7 @@ zfs_acl_cpio_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_cpio_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -506,6 +526,7 @@ zfs_acl_cpio_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_cpio_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -529,6 +550,7 @@ zfs_acl_find_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_find_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -552,6 +574,7 @@ zfs_acl_ls_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_ls_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -575,6 +598,7 @@ zfs_acl_mv_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_mv_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -599,6 +623,7 @@ zfs_acl_tar_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_tar_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -623,6 +648,7 @@ zfs_acl_tar_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_tar_002_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -34,6 +34,7 @@ zfs_acl_chmod_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_chmod_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -57,6 +58,7 @@ zfs_acl_compress_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_compress_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -80,6 +82,7 @@ zfs_acl_cp_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_cp_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -103,6 +106,7 @@ zfs_acl_cp_002_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_cp_002_neg.ksh || atf_fail "Testcase failed"
}
@@ -127,6 +131,7 @@ zfs_acl_cp_003_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_cp_003_neg.ksh || atf_fail "Testcase failed"
}
@@ -150,6 +155,7 @@ zfs_acl_find_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_find_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -174,6 +180,7 @@ zfs_acl_find_002_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_find_002_neg.ksh || atf_fail "Testcase failed"
}
@@ -197,6 +204,7 @@ zfs_acl_ls_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_ls_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -221,6 +229,7 @@ zfs_acl_ls_002_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_ls_002_neg.ksh || atf_fail "Testcase failed"
}
@@ -244,6 +253,7 @@ zfs_acl_mv_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_mv_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -268,6 +278,7 @@ zfs_acl_pack_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_pack_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -292,6 +303,7 @@ zfs_acl_pax_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_pax_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -316,6 +328,7 @@ zfs_acl_pax_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_pax_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -340,6 +353,7 @@ zfs_acl_pax_003_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_pax_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -364,6 +378,7 @@ zfs_acl_pax_004_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_pax_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -388,6 +403,7 @@ zfs_acl_pax_005_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_pax_005_pos.ksh || atf_fail "Testcase failed"
}
@@ -412,6 +428,7 @@ zfs_acl_pax_006_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_pax_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -435,6 +452,7 @@ zfs_acl_tar_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_tar_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -458,6 +476,7 @@ zfs_acl_tar_002_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/../acl.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/../setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_acl_tar_002_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -36,6 +36,7 @@ atime_001_pos_body()
. $(atf_get_srcdir)/atime_common.kshlib
. $(atf_get_srcdir)/atime.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/atime_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -61,6 +62,7 @@ atime_002_neg_body()
. $(atf_get_srcdir)/atime_common.kshlib
. $(atf_get_srcdir)/atime.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/atime_002_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -50,6 +50,7 @@ bootfs_002_neg_body()
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/bootfs.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/bootfs_002_neg.ksh || atf_fail "Testcase failed"
}
@@ -95,6 +96,7 @@ bootfs_005_neg_body()
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/bootfs.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/bootfs_005_neg.ksh || atf_fail "Testcase failed"
}
@@ -125,6 +127,7 @@ bootfs_007_pos_body()
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/bootfs.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/bootfs_007_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -36,6 +36,7 @@ cachefile_001_pos_body()
. $(atf_get_srcdir)/cachefile.kshlib
. $(atf_get_srcdir)/cachefile.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/cachefile_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -52,6 +53,7 @@ cachefile_002_pos_body()
. $(atf_get_srcdir)/cachefile.kshlib
. $(atf_get_srcdir)/cachefile.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/cachefile_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -68,6 +70,7 @@ cachefile_003_pos_body()
. $(atf_get_srcdir)/cachefile.kshlib
. $(atf_get_srcdir)/cachefile.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/cachefile_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -84,6 +87,7 @@ cachefile_004_pos_body()
. $(atf_get_srcdir)/cachefile.kshlib
. $(atf_get_srcdir)/cachefile.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/cachefile_004_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -35,6 +35,7 @@ zdb_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zdb.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zdb_001_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -35,6 +35,7 @@ zfs_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_malformed.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -58,6 +59,7 @@ zfs_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_malformed.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -82,6 +84,7 @@ zfs_003_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_malformed.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_003_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -35,6 +35,7 @@ zfs_clone_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -58,6 +59,7 @@ zfs_clone_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -81,6 +83,7 @@ zfs_clone_003_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -104,6 +107,7 @@ zfs_clone_004_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -127,6 +131,7 @@ zfs_clone_005_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_005_pos.ksh || atf_fail "Testcase failed"
}
@@ -150,6 +155,7 @@ zfs_clone_006_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -173,6 +179,7 @@ zfs_clone_007_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_007_pos.ksh || atf_fail "Testcase failed"
}
@@ -196,6 +203,7 @@ zfs_clone_008_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_008_neg.ksh || atf_fail "Testcase failed"
}
@@ -219,6 +227,7 @@ zfs_clone_009_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_clone.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_009_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -36,6 +36,7 @@ zfs_copies_001_pos_body()
. $(atf_get_srcdir)/zfs_copies.kshlib
. $(atf_get_srcdir)/zfs_copies.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_copies_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -61,6 +62,7 @@ zfs_copies_002_pos_body()
. $(atf_get_srcdir)/zfs_copies.kshlib
. $(atf_get_srcdir)/zfs_copies.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_copies_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -112,6 +114,8 @@ zfs_copies_004_neg_body()
. $(atf_get_srcdir)/zfs_copies.kshlib
. $(atf_get_srcdir)/zfs_copies.cfg
+ verify_disk_count "$DISKS" 1
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_copies_004_neg.ksh || atf_fail "Testcase failed"
}
@@ -137,6 +141,7 @@ zfs_copies_005_neg_body()
. $(atf_get_srcdir)/zfs_copies.kshlib
. $(atf_get_srcdir)/zfs_copies.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_copies_005_neg.ksh || atf_fail "Testcase failed"
}
@@ -162,6 +167,7 @@ zfs_copies_006_pos_body()
. $(atf_get_srcdir)/zfs_copies.kshlib
. $(atf_get_srcdir)/zfs_copies.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_copies_006_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -37,6 +37,7 @@ zfs_create_001_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -64,6 +65,7 @@ zfs_create_002_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -91,6 +93,7 @@ zfs_create_003_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -118,6 +121,7 @@ zfs_create_004_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -145,6 +149,7 @@ zfs_create_005_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_005_pos.ksh || atf_fail "Testcase failed"
}
@@ -172,6 +177,7 @@ zfs_create_006_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -199,6 +205,7 @@ zfs_create_007_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_007_pos.ksh || atf_fail "Testcase failed"
}
@@ -227,6 +234,7 @@ zfs_create_008_neg_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_008_neg.ksh || atf_fail "Testcase failed"
}
@@ -254,6 +262,7 @@ zfs_create_009_neg_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_009_neg.ksh || atf_fail "Testcase failed"
}
@@ -281,6 +290,7 @@ zfs_create_010_neg_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_010_neg.ksh || atf_fail "Testcase failed"
}
@@ -308,6 +318,7 @@ zfs_create_011_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_011_pos.ksh || atf_fail "Testcase failed"
}
@@ -335,6 +346,7 @@ zfs_create_012_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_012_pos.ksh || atf_fail "Testcase failed"
}
@@ -362,6 +374,7 @@ zfs_create_013_pos_body()
. $(atf_get_srcdir)/properties.kshlib
. $(atf_get_srcdir)/zfs_create.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_013_pos.ksh || atf_fail "Testcase failed"
}
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 Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -37,6 +37,7 @@ zfs_destroy_001_pos_body()
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -63,6 +64,7 @@ zfs_destroy_002_pos_body()
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -89,6 +91,7 @@ zfs_destroy_003_pos_body()
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -115,6 +118,7 @@ zfs_destroy_004_pos_body()
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -142,6 +146,7 @@ zfs_destroy_005_neg_body()
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_005_neg.ksh || atf_fail "Testcase failed"
}
@@ -168,6 +173,7 @@ zfs_destroy_006_neg_body()
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_006_neg.ksh || atf_fail "Testcase failed"
}
@@ -194,6 +200,7 @@ zfs_destroy_007_neg_body()
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_007_neg.ksh || atf_fail "Testcase failed"
}
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 Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -36,6 +36,7 @@ zfs_diff_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_diff.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_diff_001_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -37,6 +37,7 @@ zfs_get_001_pos_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -64,6 +65,7 @@ zfs_get_002_pos_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -92,6 +94,7 @@ zfs_get_003_pos_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -119,6 +122,7 @@ zfs_get_004_pos_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -146,6 +150,7 @@ zfs_get_005_neg_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_005_neg.ksh || atf_fail "Testcase failed"
}
@@ -173,6 +178,7 @@ zfs_get_006_neg_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_006_neg.ksh || atf_fail "Testcase failed"
}
@@ -200,6 +206,7 @@ zfs_get_007_neg_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_007_neg.ksh || atf_fail "Testcase failed"
}
@@ -227,6 +234,7 @@ zfs_get_008_pos_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_008_pos.ksh || atf_fail "Testcase failed"
}
@@ -255,6 +263,7 @@ zfs_get_009_pos_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_009_pos.ksh || atf_fail "Testcase failed"
}
@@ -282,6 +291,7 @@ zfs_get_010_neg_body()
. $(atf_get_srcdir)/zfs_get_common.kshlib
. $(atf_get_srcdir)/zfs_get.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_010_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -35,6 +35,7 @@ zfs_inherit_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_inherit.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_inherit_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -58,6 +59,7 @@ zfs_inherit_002_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_inherit.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_inherit_002_neg.ksh || atf_fail "Testcase failed"
}
@@ -81,6 +83,7 @@ zfs_inherit_003_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_inherit.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_inherit_003_pos.ksh || atf_fail "Testcase failed"
}
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 Thu Feb 8 21:58:20 2018 (r329044)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Thu Feb 8 22:06:46 2018 (r329045)
@@ -36,6 +36,7 @@ zfs_mount_001_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -61,6 +62,7 @@ zfs_mount_002_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -86,6 +88,7 @@ zfs_mount_003_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -111,6 +114,7 @@ zfs_mount_004_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -137,6 +141,7 @@ zfs_mount_005_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_005_pos.ksh || atf_fail "Testcase failed"
}
@@ -163,6 +168,7 @@ zfs_mount_006_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -189,6 +195,7 @@ zfs_mount_007_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_007_pos.ksh || atf_fail "Testcase failed"
}
@@ -216,6 +223,7 @@ zfs_mount_008_pos_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_008_pos.ksh || atf_fail "Testcase failed"
}
@@ -244,6 +252,7 @@ zfs_mount_009_neg_body()
[[ -n "$KEEP" ]] && \
atf_skip "Can't test unmount -a when pools are in KEEP"
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_009_neg.ksh || atf_fail "Testcase failed"
}
@@ -270,6 +279,7 @@ zfs_mount_010_neg_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_010_neg.ksh || atf_fail "Testcase failed"
}
@@ -295,6 +305,7 @@ zfs_mount_011_neg_body()
. $(atf_get_srcdir)/zfs_mount.kshlib
. $(atf_get_srcdir)/zfs_mount.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_011_neg.ksh || atf_fail "Testcase failed"
}
@@ -323,6 +334,7 @@ zfs_mount_all_001_pos_body()
[[ -n "$KEEP" ]] && \
atf_skip "Can't test unmount -a when pools are in KEEP"
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_all_001_pos.ksh || atf_fail "Testcase failed"
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@freebsd.org Thu Feb 8 22:09:47 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47578F09625
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 22:09:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id F11B5813D7;
Thu, 8 Feb 2018 22:09:46 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC07A1C002;
Thu, 8 Feb 2018 22:09:46 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18M9kTJ089392;
Thu, 8 Feb 2018 22:09:46 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18M9kp8089389;
Thu, 8 Feb 2018 22:09:46 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082209.w18M9kp8089389@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 22:09:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329046 - in
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate: . zfs_allow
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate: .
zfs_allow
X-SVN-Commit-Revision: 329046
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 22:09:47 -0000
Author: asomers
Date: Thu Feb 8 22:09:46 2018
New Revision: 329046
URL: https://svnweb.freebsd.org/changeset/base/329046
Log:
Remove extraneous cleanup and setup steps from the zfs delegate tests
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh Thu Feb 8 22:06:46 2018 (r329045)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh Thu Feb 8 22:09:46 2018 (r329046)
@@ -29,15 +29,7 @@
. $STF_SUITE/tests/delegate/delegate_common.kshlib
-$ZFS 2>&1 | $GREP "allow" > /dev/null
-(($? != 0)) && log_unsupported
-
cleanup_user_group
-# restore the state of svc:/network/nis/client:default
-if [[ -e $NISSTAFILE ]]; then
- log_must $SVCADM enable svc:/network/nis/client:default
- log_must $RM -f $NISSTAFILE
-fi
-
default_cleanup
+log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh Thu Feb 8 22:06:46 2018 (r329045)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh Thu Feb 8 22:09:46 2018 (r329046)
@@ -29,18 +29,6 @@
. $STF_SUITE/tests/delegate/delegate_common.kshlib
-$ZFS 2>&1 | $GREP "allow" > /dev/null
-(($? != 0)) && log_unsupported
-
-# check svc:/network/nis/client:default state
-# disable it if the state is ON
-# and the state will be restored during cleanup.ksh
-log_must $RM -f $NISSTAFILE
-if [[ "ON" == $($SVCS -H -o sta svc:/network/nis/client:default) ]]; then
- log_must $SVCADM disable -t svc:/network/nis/client:default
- log_must $TOUCH $NISSTAFILE
-fi
-
cleanup_user_group
# Create staff group and add two user to it
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh Thu Feb 8 22:06:46 2018 (r329045)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh Thu Feb 8 22:09:46 2018 (r329046)
@@ -29,12 +29,4 @@
. $STF_SUITE/tests/delegate/delegate_common.kshlib
-$ZFS 2>&1 | $GREP "allow" > /dev/null
-(($? != 0)) && log_unsupported
-
-if is_global_zone ; then
- log_must $ZPOOL set delegation=on $TESTPOOL
-fi
-log_must restore_root_datasets
-
log_pass
From owner-svn-src-projects@freebsd.org Thu Feb 8 22:34:38 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E2D6F0B495
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 22:34:38 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4C23F82895;
Thu, 8 Feb 2018 22:34:38 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46D471C4DB;
Thu, 8 Feb 2018 22:34:38 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18MYcjM004751;
Thu, 8 Feb 2018 22:34:38 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18MYbCB004738;
Thu, 8 Feb 2018 22:34:37 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082234.w18MYbCB004738@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 22:34:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329047 - in projects/zfsd/head: etc/mtree
tests/sys/cddl/zfs/tests/delegate tests/sys/cddl/zfs/tests/delegate/zfs_allow
tests/sys/cddl/zfs/tests/delegate/zfs_unallow
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head: etc/mtree
tests/sys/cddl/zfs/tests/delegate tests/sys/cddl/zfs/tests/delegate/zfs_allow
tests/sys/cddl/zfs/tests/delegate/zfs_unallow
X-SVN-Commit-Revision: 329047
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 22:34:39 -0000
Author: asomers
Date: Thu Feb 8 22:34:37 2018
New Revision: 329047
URL: https://svnweb.freebsd.org/changeset/base/329047
Log:
Collapse the ZFS delegate tests into a single directory
Sponsored by: Spectra Logic Corp
Added:
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_001_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_002_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_003_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_004_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_004_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_005_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_005_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_006_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_006_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_007_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_007_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_008_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_008_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_009_neg.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_009_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_010_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_010_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_011_neg.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_011_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_012_neg.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_012_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh
- copied, changed from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_001_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_002_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_003_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_004_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_004_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_005_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_005_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_006_pos.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_006_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_007_neg.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_007_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_008_neg.ksh
- copied unchanged from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_008_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh
- copied, changed from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_test.sh
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/
Modified:
projects/zfsd/head/etc/mtree/BSD.tests.dist
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile
Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 22:09:46 2018 (r329046)
+++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 8 22:34:37 2018 (r329047)
@@ -558,10 +558,6 @@
ctime
..
delegate
- zfs_allow
- ..
- zfs_unallow
- ..
..
devices
..
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile Thu Feb 8 22:09:46 2018 (r329046)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile Thu Feb 8 22:34:37 2018 (r329047)
@@ -6,12 +6,33 @@ PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/delegate
FILESDIR=${TESTSDIR}
+ATF_TESTS_KSH93+= zfs_allow_test
+ATF_TESTS_KSH93+= zfs_unallow_test
+
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= cleanup.ksh
${PACKAGE}FILES+= delegate.cfg
${PACKAGE}FILES+= delegate_common.kshlib
-${PACKAGE}FILES+= cleanup.ksh
${PACKAGE}FILES+= setup.ksh
-
-TESTS_SUBDIRS+= zfs_allow
-TESTS_SUBDIRS+= zfs_unallow
+${PACKAGE}FILES+= zfs_allow_001_pos.ksh
+${PACKAGE}FILES+= zfs_allow_002_pos.ksh
+${PACKAGE}FILES+= zfs_allow_003_pos.ksh
+${PACKAGE}FILES+= zfs_allow_004_pos.ksh
+${PACKAGE}FILES+= zfs_allow_005_pos.ksh
+${PACKAGE}FILES+= zfs_allow_006_pos.ksh
+${PACKAGE}FILES+= zfs_allow_007_pos.ksh
+${PACKAGE}FILES+= zfs_allow_008_pos.ksh
+${PACKAGE}FILES+= zfs_allow_009_neg.ksh
+${PACKAGE}FILES+= zfs_allow_010_pos.ksh
+${PACKAGE}FILES+= zfs_allow_011_neg.ksh
+${PACKAGE}FILES+= zfs_allow_012_neg.ksh
+${PACKAGE}FILES+= zfs_unallow_001_pos.ksh
+${PACKAGE}FILES+= zfs_unallow_002_pos.ksh
+${PACKAGE}FILES+= zfs_unallow_003_pos.ksh
+${PACKAGE}FILES+= zfs_unallow_004_pos.ksh
+${PACKAGE}FILES+= zfs_unallow_005_pos.ksh
+${PACKAGE}FILES+= zfs_unallow_006_pos.ksh
+${PACKAGE}FILES+= zfs_unallow_007_neg.ksh
+${PACKAGE}FILES+= zfs_unallow_008_neg.ksh
.include <bsd.test.mk>
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_001_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_001_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_001_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_001_pos.ksh)
@@ -0,0 +1,117 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_001_pos.ksh 1.3 08/11/03 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_001_pos
+#
+# DESCRIPTION:
+# "everyone" is interpreted as the keyword "everyone" whatever the same
+# name user or group is existing.
+#
+# STRATEGY:
+# 1. Create user 'everyone'.
+# 2. Verify 'everyone' is interpreted as keywords.
+# 3. Create group 'everyone'.
+# 4. Verify 'everyone' is interpreted as keywords.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-14)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+function cleanup
+{
+ if [[ $user_added == "TRUE" ]] ; then
+ del_user everyone
+ fi
+ if [[ $group_added == "TRUE" ]] ; then
+ del_group everyone
+ fi
+
+ restore_root_datasets
+}
+
+log_assert "everyone' is interpreted as a keyword even if a user " \
+ "or group named 'everyone' exists."
+log_onexit cleanup
+
+eval set -A dataset $DATASETS
+enc=$(get_prop encryption $dataset)
+if [[ $? -eq 0 ]] && [[ -n "$enc" ]] && [[ "$enc" != "off" ]]; then
+ typeset perms="snapshot,reservation,compression,send,allow,\
+userprop"
+else
+ typeset perms="snapshot,reservation,compression,checksum,\
+send,allow,userprop"
+fi
+
+log_note "Create a user called 'everyone'."
+if ! $ID everyone > /dev/null 2>&1; then
+ user_added="TRUE"
+ log_must $USERADD everyone
+fi
+for dtst in $DATASETS ; do
+ log_must $ZFS allow everyone $perms $dtst
+ log_must verify_perm $dtst $perms $EVERYONE "everyone"
+done
+log_must restore_root_datasets
+if [[ $user_added == "TRUE" ]]; then
+ log_must $USERDEL everyone
+fi
+
+log_note "Created a group called 'everyone'."
+if ! $CAT /etc/group | $AWK -F: '{print $1}' | \
+ $GREP -w 'everyone' > /dev/null 2>&1
+then
+ group_added="TRUE"
+ log_must $GROUPADD everyone
+fi
+
+for dtst in $DATASETS ; do
+ log_must $ZFS allow everyone $perms $dtst
+ log_must verify_perm $dtst $perms $EVERYONE
+done
+log_must restore_root_datasets
+if [[ $group_added == "TRUE" ]]; then
+ log_must $GROUPDEL everyone
+fi
+
+log_pass "everyone is always interpreted as keyword passed."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_002_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_002_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_002_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_002_pos.ksh)
@@ -0,0 +1,98 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_002_pos.ksh 1.3 08/11/03 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_002_pos
+#
+# DESCRIPTION:
+# <user|group> argument is interpreted as a user if possible, then as a group as
+# possible.
+#
+# STRATEGY:
+# 1. Create user $STAFF_GROUP
+# 2. Delegate permissions to $STAFF_GROUP
+# 3. Verify user $STAFF_GROUP has the permissions.
+# 4. Delete user $STAFF_GROUP and allow the permission to $STAFF_GROUP
+# 5. Verify $STAFF_GROUP is interpreted as group.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-14)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+function cleanup
+{
+ if $ID $STAFF_GROUP > /dev/null 2>&1; then
+ log_must del_user $STAFF_GROUP
+ fi
+
+ restore_root_datasets
+}
+
+log_assert "<user|group> is interpreted as user if possible, then as group."
+log_onexit cleanup
+
+eval set -A dataset $DATASETS
+enc=$(get_prop encryption $dataset)
+if [[ $? -eq 0 ]] && [[ -n "$enc" ]] && [[ "$enc" != "off" ]]; then
+ typeset perms="snapshot,reservation,compression,send,allow,\
+userprop"
+else
+ typeset perms="snapshot,reservation,compression,checksum,\
+send,allow,userprop"
+fi
+
+log_must $USERADD $STAFF_GROUP
+for dtst in $DATASETS ; do
+ log_must $ZFS allow $STAFF_GROUP $perms $dtst
+ log_must verify_perm $dtst $perms $STAFF_GROUP
+ log_must verify_noperm $dtst $perms $STAFF1 $STAFF2
+done
+
+log_must restore_root_datasets
+
+log_must del_user $STAFF_GROUP
+for dtst in $datasets ; do
+ log_must $ZFS allow $STAFF_GROUP $perms $dtst
+ log_must verify_perm $dtst $perms $STAFF1 $STAFF2
+done
+
+log_pass "<user|group> is interpreted as user if possible, then as group passed."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_003_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_003_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_003_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_003_pos.ksh)
@@ -0,0 +1,116 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_003_pos.ksh 1.4 09/08/06 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_003_pos
+#
+# DESCRIPTION:
+# Verify option '-l' only allow permission to the dataset itself.
+#
+# STRATEGY:
+# 1. Create descendent datasets of $ROOT_TESTFS
+# 2. Select user, group and everyone and set local permission separately.
+# 3. Set locally permissions to $ROOT_TESTFS or $ROOT_TESTVOL.
+# 4. Verify the permissions are only allow on $ROOT_TESTFS or
+# $ROOT_TESTVOL.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-19)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+log_assert "Verify option '-l' only allow permission to the dataset itself."
+log_onexit restore_root_datasets
+
+childfs=$ROOT_TESTFS/childfs
+
+eval set -A dataset $DATASETS
+enc=$(get_prop encryption $dataset)
+if [[ $? -eq 0 ]] && [[ -n "$enc" ]] && [[ "$enc" != "off" ]]; then
+ typeset perms="snapshot,reservation,compression,allow,\
+userprop"
+else
+ typeset perms="snapshot,reservation,compression,checksum,\
+allow,userprop"
+fi
+
+if check_version "5.10" ; then
+ perms="${perms},send"
+fi
+
+log_must $ZFS create $childfs
+
+for dtst in $DATASETS ; do
+ log_must $ZFS allow -l $STAFF1 $perms $dtst
+ log_must verify_perm $dtst $perms $STAFF1
+ if [[ $dtst == $ROOT_TESTFS ]] ; then
+ log_must verify_noperm $childfs $perms \
+ $STAFF1 $STAFF2 $OTHER1 $OTHER2
+ fi
+done
+
+log_must restore_root_datasets
+
+log_must $ZFS create $childfs
+for dtst in $DATASETS ; do
+ log_must $ZFS allow -l -g $STAFF_GROUP $perms $dtst
+ log_must verify_perm $dtst $perms $STAFF1 $STAFF2
+ if [[ $dtst == $ROOT_TESTFS ]] ; then
+ log_must verify_noperm $childfs $perms \
+ $STAFF1 $STAFF2 $OTHER1 $OTHER2
+ fi
+done
+
+log_must restore_root_datasets
+
+log_must $ZFS create $childfs
+for dtst in $DATASETS ; do
+ log_must $ZFS allow -l -e $perms $dtst
+ log_must verify_perm $dtst $perms $STAFF1 $STAFF2 $OTHER1 $OTHER2
+ if [[ $dtst == $ROOT_TESTFS ]] ; then
+ log_must verify_noperm $childfs $perms \
+ $STAFF1 $STAFF2 $OTHER1 $OTHER2
+ fi
+done
+
+log_must restore_root_datasets
+
+log_pass "Verify option '-l' only allow permission to the dataset itself pass."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_004_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_004_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_004_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_004_pos.ksh)
@@ -0,0 +1,119 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_004_pos.ksh 1.4 09/08/06 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_004_pos
+#
+# DESCRIPTION:
+# Verify option '-d' allow permission to the descendent datasets, and not
+# for this dataset itself.
+#
+# STRATEGY:
+# 1. Create descendent datasets of $ROOT_TESTFS
+# 2. Select user, group and everyone and set descendent permission
+# separately.
+# 3. Set descendent permissions to $ROOT_TESTFS or $ROOT_TESTVOL.
+# 4. Verify those permissions are allowed to $ROOT_TESTFS's
+# descendent dataset.
+# 5. Verify the permissions are not allowed to $ROOT_TESTFS or
+# $ROOT_TESTVOL.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-18)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+log_assert "Verify option '-d' allow permission to the descendent datasets."
+log_onexit restore_root_datasets
+
+childfs=$ROOT_TESTFS/childfs
+
+eval set -A dataset $DATASETS
+enc=$(get_prop encryption $dataset)
+if [[ $? -eq 0 ]] && [[ -n "$enc" ]] && [[ "$enc" != "off" ]]; then
+ typeset perms="snapshot,reservation,compression,allow,\
+userprop"
+else
+ typeset perms="snapshot,reservation,compression,checksum,\
+allow,userprop"
+fi
+
+if check_version "5.10" ; then
+ perms="${perms},send"
+fi
+
+# Verify option '-d' only affect sub-datasets
+log_must $ZFS create $childfs
+for dtst in $DATASETS ; do
+ log_must $ZFS allow -d $STAFF1 $perms $dtst
+ log_must verify_noperm $dtst $perms $STAFF1
+ if [[ $dtst == $ROOT_TESTFS ]]; then
+ log_must verify_perm $childfs $perms $STAFF1
+ fi
+done
+
+log_must restore_root_datasets
+
+# Verify option '-d + -g' affect group in sub-datasets.
+log_must $ZFS create $childfs
+for dtst in $DATASETS ; do
+ log_must $ZFS allow -d -g $STAFF_GROUP $perms $dtst
+ log_must verify_noperm $dtst $perms $STAFF2
+ if [[ $dtst == $ROOT_TESTFS ]]; then
+ log_must verify_perm $childfs $perms $STAFF2
+ fi
+done
+
+log_must restore_root_datasets
+
+# Verify option '-d + -e' affect everyone in sub-datasets.
+log_must $ZFS create $childfs
+for dtst in $DATASETS ; do
+ log_must $ZFS allow -d -e $perms $dtst
+ log_must verify_noperm $dtst $perms $OTHER1 $OTHER2
+ if [[ $dtst == $ROOT_TESTFS ]]; then
+ log_must verify_perm $childfs $perms $OTHER1 $OTHER2
+ fi
+done
+
+log_must restore_root_datasets
+
+log_pass "Verify option '-d' allow permission to the descendent datasets pass."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_005_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_005_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_005_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_005_pos.ksh)
@@ -0,0 +1,101 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_005_pos.ksh 1.4 09/08/06 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_005_pos
+#
+# DESCRIPTION:
+# Verify option '-c' will be granted locally to the creator on any
+# newly-created descendent file systems.
+#
+# STRATEGY:
+# 1. Allow create permissions to everyone on $ROOT_TESTFS locally.
+# 2. Allow '-c' create to $ROOT_TESTFS.
+# 3. chmod 777 the mountpoint of $ROOT_TESTFS
+# 4. Verify only creator can create descendent dataset on
+# $ROOT_TESTFS/$user.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-19)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+log_assert "Verify option '-c' will be granted locally to the creator."
+log_onexit restore_root_datasets
+
+eval set -A dataset $DATASETS
+enc=$(get_prop encryption $dataset)
+if [[ $? -eq 0 ]] && [[ -n "$enc" ]] && [[ "$enc" != "off" ]]; then
+ typeset perms="snapshot,reservation,compression,allow,\
+userprop"
+else
+ typeset perms="snapshot,reservation,compression,checksum,\
+allow,userprop"
+fi
+
+if check_version "5.10" ; then
+ perms="${perms},send"
+fi
+
+log_must $ZFS allow -l everyone create,mount $ROOT_TESTFS
+log_must $ZFS allow -c $perms $ROOT_TESTFS
+
+mntpnt=$(get_prop mountpoint $ROOT_TESTFS)
+log_must $CHMOD 777 $mntpnt
+
+for user in $EVERYONE; do
+ childfs=$ROOT_TESTFS/$user
+
+ user_run $user $ZFS create $childfs
+
+ for other in $EVERYONE; do
+ #
+ # Verify only the creator has the $perm time permissions.
+ #
+ if [[ $other == $user ]]; then
+ log_must verify_perm $childfs $perms $user
+ else
+ log_must verify_noperm $childfs $perms $other
+ fi
+ done
+done
+
+log_pass "Verify option '-c' will be granted locally to the creator passed."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_006_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_006_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_006_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_006_pos.ksh)
@@ -0,0 +1,89 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_006_pos.ksh 1.2 08/11/03 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_006_pos
+#
+# DESCRIPTION:
+# Changing permissions in a set will change what is allowed wherever the
+# set is used.
+#
+# STRATEGY:
+# 1. Set create as set @basic.
+# 2. Allow set @basic to $STAFF1 on $ROOT_TESTFS or $ROOT_TESTVOL
+# 3. Verify $STAFF1 has create permissions.
+# 4. Reset snapshot,allow to $basic
+# 5. Verify now $STAFF1 have create,allow,destroy permissions.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-19)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+log_assert "Changing permissions in a set will change what is allowed " \
+ "wherever the set is used."
+log_onexit restore_root_datasets
+
+fs1=$ROOT_TESTFS/fs1; fs2=$ROOT_TESTFS/fs2
+log_must $ZFS create $fs1
+log_must $ZFS create $fs2
+
+eval set -A dataset $DATASETS
+enc=$(get_prop encryption $dataset)
+if [[ $? -eq 0 ]] && [[ -n "$enc" ]] && [[ "$enc" != "off" ]]; then
+ perms1="snapshot,checksum,reservation"
+else
+ perms1="snapshot,reservation"
+fi
+
+for dtst in $DATASETS $fs1 $fs2; do
+ log_must $ZFS allow -s @basic $perms1 $dtst
+ log_must $ZFS allow $STAFF1 @basic $dtst
+ log_must verify_perm $dtst $perms1 $STAFF1
+done
+
+perms2="allow,send,compression,userprop"
+for dtst in $DATASETS $fs1 $fs2; do
+ log_must $ZFS allow -s @basic $perms2 $dtst
+ log_must verify_perm $dtst ${perms1},${perms2} $STAFF1
+done
+
+log_pass "Changing permissions in a set will change what is allowed passed."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_007_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_007_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_007_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_007_pos.ksh)
@@ -0,0 +1,120 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2008 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_007_pos.ksh 1.3 08/11/03 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_007_pos
+#
+# DESCRIPTION:
+# Verify the permissions set will be masked on its descendent
+# datasets by same name set.
+#
+# STRATEGY:
+# 1. Create $ROOT_TESTFS/childfs
+# 2. Set permission $perms1 to @set on $ROOT_TESTFS
+# 3. Reset permission $perms2 to @set on $ROOT_TESTFS/childfs
+# 4. Allow @set to $STAFF1 on $ROOT_TESTFS/childfs
+# 5. Verify $perms2 is delegated on $ROOT_TESTFS/childfs and its
+# descendent.
+# 6. Allow @set to $STAFF1 on $ROOT_TESTFS
+# 7. Verify $perms1 is not appended to $STAFF1 on $ROOT_TESTFS/childfs and
+# its descendent since it is masked
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-19)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+log_assert "Verify permission set can be masked on descendent dataset."
+log_onexit restore_root_datasets
+
+typeset perms1="snapshot,reservation,compression"
+eval set -A dataset $DATASETS
+enc=$(get_prop encryption $dataset)
+if [[ $? -eq 0 ]] && [[ -n "$enc" ]] && [[ "$enc" != "off" ]]; then
+ typeset perms2="send,allow,userprop"
+else
+ typeset perms2="checksum,send,allow,userprop"
+fi
+
+#
+# Define three level filesystems
+#
+childfs=$ROOT_TESTFS/childfs
+grandchild=$childfs/grandchild
+log_must $ZFS create $childfs
+log_must $ZFS create $grandchild
+
+#
+# Setting different permissions to the same set on two level.
+# But only assign the user at one level.
+#
+log_must $ZFS allow -s @set $perms1 $ROOT_TESTFS
+log_must $ZFS allow -s @set $perms2 $childfs
+log_must $ZFS allow $STAFF1 @set $childfs
+
+#
+# Verify only perms2 is valid to user on the level which he was assigned.
+#
+log_must verify_noperm $ROOT_TESTFS $perms1 $STAFF1
+for fs in $childfs $grandchild ; do
+ log_must verify_noperm $childfs $perms1 $STAFF1
+ log_must verify_perm $childfs $perms2 $STAFF1
+done
+
+#
+# Delegate @set to STAFF1 on ROOT_TESTFS, verify $perms1 will not be appended
+# to its descendent datasets since it is masked
+#
+log_must $ZFS allow $STAFF1 @set $ROOT_TESTFS
+log_must verify_perm $ROOT_TESTFS $perms1 $STAFF1
+for fs in $childfs $grandchild ; do
+ log_must verify_noperm $childfs $perms1 $STAFF1
+ log_must verify_perm $childfs $perms2 $STAFF1
+done
+
+# Remove the mask, $perms1 will be allowed to its descendent datasets
+log_must $ZFS unallow -s @set $childfs
+for fs in $childfs $grandchild ; do
+ log_must verify_noperm $childfs $perms2 $STAFF1
+ log_must verify_perm $childfs $perms1 $STAFF1
+done
+
+log_pass "Verify permission set can be masked on descendetn dataset pass."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_008_pos.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_008_pos.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_008_pos.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_008_pos.ksh)
@@ -0,0 +1,90 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_008_pos.ksh 1.2 07/07/31 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_008_pos
+#
+# DESCRIPTION:
+# non-root user can allow any permissions which he is holding to
+# other else user when it get 'allow' permission.
+#
+# STRATEGY:
+# 1. Set two set permissions to two datasets locally.
+# 2. Verify the non-root user can allow permission if he has allow
+# permission.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-20)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+log_assert "Verify non-root user can allow permissions."
+log_onexit restore_root_datasets
+
+perms1="snapshot,reservation"
+perms2="send,compression,checksum,userprop"
+childfs=$ROOT_TESTFS/childfs
+
+log_must $ZFS create $childfs
+
+for dtst in $DATASETS ; do
+ # Delegate local permission to $STAFF1
+ log_must $ZFS allow -l $STAFF1 $perms1 $dtst
+ log_must $ZFS allow -l $STAFF1 allow $dtst
+
+ if [[ $dtst == $ROOT_TESTFS ]]; then
+ log_must $ZFS allow -l $STAFF1 $perms2 $childfs
+ # $perms1 is local permission in $ROOT_TESTFS
+ log_mustnot user_run $STAFF1 $ZFS allow $OTHER1 $perms1 $childfs
+ log_must verify_noperm $childfs $perms1 $OTHER1
+ fi
+
+ # Verify 'allow' give non-privilege user delegated permission.
+ log_must user_run $STAFF1 $ZFS allow -l $OTHER1 $perms1 $dtst
+ log_must verify_perm $dtst $perms1 $OTHER1
+
+ # $perms2 was not allow to $STAFF1, so he have no permission to
+ # delegate permission to other else.
+ log_mustnot user_run $STAFF1 $ZFS allow $OTHER1 $perms2 $dtst
+ log_must verify_noperm $dtst $perms2 $OTHER1
+done
+
+log_pass "Verify non-root user can allow permissions passed."
Copied: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_009_neg.ksh (from r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_009_neg.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_009_neg.ksh Thu Feb 8 22:34:37 2018 (r329047, copy of r329046, projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_009_neg.ksh)
@@ -0,0 +1,76 @@
+#!/usr/local/bin/ksh93 -p
+#
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)zfs_allow_009_neg.ksh 1.1 07/01/09 SMI"
+#
+
+. $STF_SUITE/tests/delegate/delegate_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: zfs_allow_009_neg
+#
+# DESCRIPTION:
+# zfs allow can deal with invalid arguments.(Invalid options or combination)
+#
+# STRATEGY:
+# 1. Verify invalid argumets will cause error.
+# 2. Verify non-optional argument was missing will cause error.
+# 3. Verify invalid options cause error.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# CODING_STATUS: COMPLETED (2006-09-20)
+#
+# __stc_assertion_end
+#
+################################################################################
+
+verify_runnable "both"
+
+log_assert "Verify invalid arguments are handled correctly."
+log_onexit restore_root_datasets
+
+# Permission sets are limited to 64 characters in length.
+longset="set123456789012345678901234567890123456789012345678901234567890123"
+for dtst in $DATASETS ; do
+ log_mustnot eval "$ZFS allow -s @$longset $dtst"
+ # Create non-existent permission set
+ typeset timestamp=$($DATE +'%F-%R:%S')
+ log_mustnot $ZFS allow -s @non-existent $dtst
+ log_mustnot $ZFS allow $STAFF "atime,created,mounted" $dtst
+ log_mustnot $ZFS allow $dtst $TESTPOOL
+ log_mustnot $ZFS allow -c $dtst
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@freebsd.org Thu Feb 8 22:37:20 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91BCCF0B7A9
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 22:37:20 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4069082A9F;
Thu, 8 Feb 2018 22:37:20 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B69F1C4E6;
Thu, 8 Feb 2018 22:37:20 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18MbKX7004893;
Thu, 8 Feb 2018 22:37:20 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18MbKv2004891;
Thu, 8 Feb 2018 22:37:20 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082237.w18MbKv2004891@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 22:37:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329048 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate
X-SVN-Commit-Revision: 329048
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 22:37:20 -0000
Author: asomers
Date: Thu Feb 8 22:37:19 2018
New Revision: 329048
URL: https://svnweb.freebsd.org/changeset/base/329048
Log:
Add appropriate verify_disk_count statements to the delegate tests
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh Thu Feb 8 22:34:37 2018 (r329047)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh Thu Feb 8 22:37:19 2018 (r329048)
@@ -36,6 +36,7 @@ zfs_allow_001_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -61,6 +62,7 @@ zfs_allow_002_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -86,6 +88,7 @@ zfs_allow_003_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -111,6 +114,7 @@ zfs_allow_004_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -136,6 +140,7 @@ zfs_allow_005_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_005_pos.ksh || atf_fail "Testcase failed"
}
@@ -161,6 +166,7 @@ zfs_allow_006_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -186,6 +192,7 @@ zfs_allow_007_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_007_pos.ksh || atf_fail "Testcase failed"
}
@@ -211,6 +218,7 @@ zfs_allow_008_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_008_pos.ksh || atf_fail "Testcase failed"
}
@@ -236,6 +244,7 @@ zfs_allow_009_neg_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_009_neg.ksh || atf_fail "Testcase failed"
}
@@ -261,6 +270,7 @@ zfs_allow_010_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_010_pos.ksh || atf_fail "Testcase failed"
}
@@ -286,6 +296,7 @@ zfs_allow_011_neg_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_011_neg.ksh || atf_fail "Testcase failed"
}
@@ -311,6 +322,7 @@ zfs_allow_012_neg_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_012_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh Thu Feb 8 22:34:37 2018 (r329047)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh Thu Feb 8 22:37:19 2018 (r329048)
@@ -36,6 +36,7 @@ zfs_unallow_001_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -61,6 +62,7 @@ zfs_unallow_002_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -86,6 +88,7 @@ zfs_unallow_003_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -111,6 +114,7 @@ zfs_unallow_004_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_004_pos.ksh || atf_fail "Testcase failed"
}
@@ -136,6 +140,7 @@ zfs_unallow_005_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_005_pos.ksh || atf_fail "Testcase failed"
}
@@ -161,6 +166,7 @@ zfs_unallow_006_pos_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -186,6 +192,7 @@ zfs_unallow_007_neg_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_007_neg.ksh || atf_fail "Testcase failed"
}
@@ -211,6 +218,7 @@ zfs_unallow_008_neg_body()
. $(atf_get_srcdir)/delegate_common.kshlib
. $(atf_get_srcdir)/delegate.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_008_neg.ksh || atf_fail "Testcase failed"
}
From owner-svn-src-projects@freebsd.org Thu Feb 8 22:38:41 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1B12F0B8CF
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 8 Feb 2018 22:38:41 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 5247782CA1;
Thu, 8 Feb 2018 22:38:41 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D3641C4EA;
Thu, 8 Feb 2018 22:38:41 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18Mcf62005090;
Thu, 8 Feb 2018 22:38:41 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18McdqL005077;
Thu, 8 Feb 2018 22:38:39 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082238.w18McdqL005077@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 8 Feb 2018 22:38:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329049 - in projects/zfsd/head/tests/sys/cddl/zfs:
include tests/cache tests/hotspare tests/pool_names tests/slog tests/zinject
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include
tests/cache tests/hotspare tests/pool_names tests/slog tests/zinject
X-SVN-Commit-Revision: 329049
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2018 22:38:41 -0000
Author: asomers
Date: Thu Feb 8 22:38:39 2018
New Revision: 329049
URL: https://svnweb.freebsd.org/changeset/base/329049
Log:
Remove verify_cache_support and verify_slog_support
FreeBSD's ZFS test suite will never need to run on a system that doesn't
support these things.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 8 22:38:39 2018 (r329049)
@@ -1194,11 +1194,9 @@ function zfs_zones_setup #zone_name zone_root zone_ip
#
# If current system support slog, add slog device for pool
#
- if verify_slog_support ; then
- typeset sdevs="$TMPDIR/sdev1 $TMPDIR/sdev2"
- log_must create_vdevs $sdevs
- log_must $ZPOOL add $pool_name log mirror $sdevs
- fi
+ typeset sdevs="$TMPDIR/sdev1 $TMPDIR/sdev2"
+ log_must create_vdevs $sdevs
+ log_must $ZPOOL add $pool_name log mirror $sdevs
# this isn't supported just yet.
# Create a filesystem. In order to add this to
@@ -2637,28 +2635,6 @@ function random_get_with_non
function random_get
{
_random_get "$#" "$@"
-}
-
-#
-# Detect if the current system support slog
-#
-function verify_slog_support
-{
- typeset dir=$TMPDIR/disk.${TESTCASE_ID}
- typeset pool=foo.${TESTCASE_ID}
- typeset vdev=$dir/a
- typeset sdev=$dir/b
-
- $MKDIR -p $dir
- log_must create_vdevs $vdev $sdev
-
- typeset -i ret=0
- if ! $ZPOOL create -n $pool $vdev log $sdev > /dev/null 2>&1; then
- ret=1
- fi
- $RM -r $dir
-
- return $ret
}
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Feb 8 22:38:39 2018 (r329049)
@@ -178,9 +178,3 @@ function verify_cache_device
return 1
}
-
-function verify_cache_support
-{
- $ZPOOL upgrade -v | $GREP "Cache devices" > /dev/null 2>&1
- return $?
-}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! verify_cache_support ; then
- log_unsupported "This system doesn't support cache device"
-fi
-
cleanup
if [[ -d $VDIR ]]; then
log_must $RM -rf $VDIR
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! verify_cache_support ; then
- log_unsupported "This system doesn't support cache device"
-fi
-
if ! $(is_physical_device $LDEV) ; then
log_unsupported "Only physical disk could be cache device"
fi
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib Thu Feb 8 22:38:39 2018 (r329049)
@@ -59,9 +59,7 @@ function set_devs
pooldevs=("${devarray[3]}" "${devarray[4]}" "${devarray[5]}")
- if verify_slog_support ; then
- logdevs="${devarray[7]}"
- fi
+ logdevs="${devarray[7]}"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -137,9 +137,7 @@ set -A POOLNAME "c0t0d0s0" "c0t0d0" "c0t0d19" "c0t5000
"mirror_pool" "raidz_pool" \
"mirror-pool" "raidz-pool" "spare" "spare_pool" \
"spare-pool" "raidz1-" "raidz2:" ":aaa" "-bbb" "_ccc" ".ddd"
-if verify_slog_support ; then
- POOLNAME[${#POOLNAME[@]}]='log'
-fi
+POOLNAME[${#POOLNAME[@]}]='log'
typeset -i i=0
while ((i < ${#POOLNAME[@]})); do
log_mustnot $ZPOOL create -m $TESTDIR ${POOLNAME[$i]} $DISK
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! verify_slog_support ; then
- log_unsupported "This system doesn't support separate intent logs"
-fi
-
if datasetexists $TESTPOOL ; then
log_must $ZPOOL destroy -f $TESTPOOL
fi
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! verify_slog_support ; then
- log_unsupported "This system doesn't support separate intent logs"
-fi
-
if [[ -d $VDEV ]]; then
log_must $RM -rf $VDIR
fi
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg Thu Feb 8 22:38:39 2018 (r329049)
@@ -56,12 +56,6 @@ export VDEV6=${DISK0}p7
export pooldevs="$VDEV0 $VDEV1 $VDEV2"
export sparedevs="$VDEV3"
-if verify_slog_support ; then
- export logdevs="$VDEV4"
-fi
-
-if verify_cache_support ; then
- export cachedevs="$VDEV5"
-fi
+export logdevs="$VDEV4"
export alldevs="$pooldevs $sparedevs $logdevs $cachedevs"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -129,13 +129,8 @@ inject_clear
for type in "${types[@]}"; do
create_pool $TESTPOOL $type $pooldevs spare $sparedevs
- if verify_slog_support ; then
- log_must $ZPOOL add -f $TESTPOOL log $logdevs
- fi
-
- if verify_cache_support ; then
- log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
- fi
+ log_must $ZPOOL add -f $TESTPOOL log $logdevs
+ log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs
log_must $ZFS create $TESTPOOL/$TESTFS
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -128,13 +128,8 @@ inject_clear
for type in "${types[@]}"; do
create_pool $TESTPOOL $type $pooldevs spare $sparedevs
- if verify_slog_support ; then
- log_must $ZPOOL add -f $TESTPOOL log $logdevs
- fi
-
- if verify_cache_support ; then
- log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
- fi
+ log_must $ZPOOL add -f $TESTPOOL log $logdevs
+ log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs
log_must $ZFS create $TESTPOOL/$TESTFS
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -124,13 +124,8 @@ inject_clear
for type in "${types[@]}"; do
create_pool $TESTPOOL $type $pooldevs spare $sparedevs
- if verify_slog_support ; then
- log_must $ZPOOL add -f $TESTPOOL log $logdevs
- fi
-
- if verify_cache_support ; then
- log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
- fi
+ log_must $ZPOOL add -f $TESTPOOL log $logdevs
+ log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs
log_must $ZFS create $TESTPOOL/$TESTFS
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh Thu Feb 8 22:37:19 2018 (r329048)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh Thu Feb 8 22:38:39 2018 (r329049)
@@ -112,13 +112,8 @@ inject_clear
for type in "${types[@]}"; do
create_pool $TESTPOOL $type $pooldevs spare $sparedevs
- if verify_slog_support ; then
- log_must $ZPOOL add -f $TESTPOOL log $logdevs
- fi
-
- if verify_cache_support ; then
- log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
- fi
+ log_must $ZPOOL add -f $TESTPOOL log $logdevs
+ log_must $ZPOOL add -f $TESTPOOL cache $cachedevs
log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs
log_must $ZFS create $TESTPOOL/$TESTFS
From owner-svn-src-projects@freebsd.org Fri Feb 9 15:42:10 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD277F0D01A
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 15:42:10 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 8F27B6959F;
Fri, 9 Feb 2018 15:42:10 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A2E526B9E;
Fri, 9 Feb 2018 15:42:10 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19FgAjC016820;
Fri, 9 Feb 2018 15:42:10 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19FgAEW016819;
Fri, 9 Feb 2018 15:42:10 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802091542.w19FgAEW016819@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 15:42:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329062 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb
X-SVN-Commit-Revision: 329062
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 15:42:11 -0000
Author: asomers
Date: Fri Feb 9 15:42:10 2018
New Revision: 329062
URL: https://svnweb.freebsd.org/changeset/base/329062
Log:
Fix zdb_001_neg
The "-q" option was added in r324221. "-V" in r324344.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh Fri Feb 9 14:31:11 2018 (r329061)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh Fri Feb 9 15:42:10 2018 (r329062)
@@ -68,9 +68,9 @@ set -A args "create" "add" "destroy" "import fakepool"
"add raidz1 fakepool" "add raidz2 fakepool" \
"setvprop" "blah blah" "-%" "--?" "-*" "-=" \
"-a" "-f" "-g" "-h" "-j" "-k" "-m" "-n" "-p" "-p /tmp" \
- "-q" "-r" "-t" "-w" "-x" "-y" "-z" \
+ "-r" "-t" "-w" "-x" "-y" "-z" \
"-D" "-E" "-G" "-H" "-I" "-J" "-K" "-M" \
- "-N" "-Q" "-T" "-V" "-W"
+ "-N" "-Q" "-T" "-W"
log_assert "Execute zdb using invalid parameters."
From owner-svn-src-projects@freebsd.org Fri Feb 9 15:49:57 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8CB97F0D7CC
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 15:49:57 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 3B88A6991E;
Fri, 9 Feb 2018 15:49:57 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3196F26CAD;
Fri, 9 Feb 2018 15:49:57 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19Fnvd1018085;
Fri, 9 Feb 2018 15:49:57 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19Fnvh1018084;
Fri, 9 Feb 2018 15:49:57 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802091549.w19Fnvh1018084@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 15:49:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329063 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy
X-SVN-Commit-Revision: 329063
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 15:49:57 -0000
Author: asomers
Date: Fri Feb 9 15:49:56 2018
New Revision: 329063
URL: https://svnweb.freebsd.org/changeset/base/329063
Log:
Clear an expected failure added in r273994 that no longer fails.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_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 Fri Feb 9 15:42:10 2018 (r329062)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh Fri Feb 9 15:49:56 2018 (r329063)
@@ -141,7 +141,6 @@ zfs_destroy_005_neg_head()
}
zfs_destroy_005_neg_body()
{
- atf_fail "This test causes a panic on FreeBSD"
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_destroy_common.kshlib
. $(atf_get_srcdir)/zfs_destroy.cfg
From owner-svn-src-projects@freebsd.org Fri Feb 9 15:54:25 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B6C7F0DF69
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 15:54:25 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 2C42E69FDA;
Fri, 9 Feb 2018 15:54:25 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 220BE26E3D;
Fri, 9 Feb 2018 15:54:25 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19FsOjq022898;
Fri, 9 Feb 2018 15:54:24 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19FsObl022897;
Fri, 9 Feb 2018 15:54:24 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802091554.w19FsObl022897@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 15:54:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329065 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff
X-SVN-Commit-Revision: 329065
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 15:54:25 -0000
Author: asomers
Date: Fri Feb 9 15:54:24 2018
New Revision: 329065
URL: https://svnweb.freebsd.org/changeset/base/329065
Log:
Clear an expected failure that was fixed in r324346
PR: 221234
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh
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 Fri Feb 9 15:50:32 2018 (r329064)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh Fri Feb 9 15:54:24 2018 (r329065)
@@ -32,7 +32,6 @@ zfs_diff_001_pos_head()
}
zfs_diff_001_pos_body()
{
- 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
From owner-svn-src-projects@freebsd.org Fri Feb 9 15:58:34 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00022F0E432
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 15:58:33 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id A59826A296;
Fri, 9 Feb 2018 15:58:33 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 99F6326E3F;
Fri, 9 Feb 2018 15:58:33 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19FwXOC023114;
Fri, 9 Feb 2018 15:58:33 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19FwXXf023113;
Fri, 9 Feb 2018 15:58:33 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802091558.w19FwXXf023113@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 15:58:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329066 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount
X-SVN-Commit-Revision: 329066
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 15:58:34 -0000
Author: asomers
Date: Fri Feb 9 15:58:33 2018
New Revision: 329066
URL: https://svnweb.freebsd.org/changeset/base/329066
Log:
Clear an incorrect expected failure added in r273994.
The test probably failed only because the tester was booting from ZFS and
didn't set the keep_pools variable. It would be nice for the test suite to
handle this automatically, but right now it doesn't.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh
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 Fri Feb 9 15:54:24 2018 (r329065)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh Fri Feb 9 15:58:33 2018 (r329066)
@@ -240,7 +240,6 @@ zfs_unmount_009_pos_head()
}
zfs_unmount_009_pos_body()
{
- atf_fail "This test causes a panic on FreeBSD"
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zfs_unmount.kshlib
. $(atf_get_srcdir)/zfs_unmount.cfg
From owner-svn-src-projects@freebsd.org Fri Feb 9 16:19:48 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED677F0FD81
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 16:19:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 9FB346B356;
Fri, 9 Feb 2018 16:19:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9699D27182;
Fri, 9 Feb 2018 16:19:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19GJlfb033198;
Fri, 9 Feb 2018 16:19:47 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19GJlic033197;
Fri, 9 Feb 2018 16:19:47 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802091619.w19GJlic033197@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 16:19:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329068 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add
X-SVN-Commit-Revision: 329068
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 16:19:48 -0000
Author: asomers
Date: Fri Feb 9 16:19:47 2018
New Revision: 329068
URL: https://svnweb.freebsd.org/changeset/base/329068
Log:
Remove expected failure fixed by r329067
MFC after: 3 weeks
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Fri Feb 9 16:08:57 2018 (r329067)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Fri Feb 9 16:19:47 2018 (r329068)
@@ -290,7 +290,6 @@ zpool_add_010_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- atf_expect_fail "PR 225546 zpool add crashes in the presence of a replacing vdev with a spare child"
verify_disk_count "$DISKS" 5
ksh93 $(atf_get_srcdir)/zpool_add_010_pos.ksh || atf_fail "Testcase failed"
From owner-svn-src-projects@freebsd.org Fri Feb 9 17:01:30 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D49AFF12F62
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 17:01:30 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 836C56D176;
Fri, 9 Feb 2018 17:01:30 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E15427917;
Fri, 9 Feb 2018 17:01:30 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19H1UtZ055563;
Fri, 9 Feb 2018 17:01:30 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19H1UKx055562;
Fri, 9 Feb 2018 17:01:30 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802091701.w19H1UKx055562@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 17:01:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329069 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear
X-SVN-Commit-Revision: 329069
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 17:01:31 -0000
Author: asomers
Date: Fri Feb 9 17:01:30 2018
New Revision: 329069
URL: https://svnweb.freebsd.org/changeset/base/329069
Log:
Clear an expected failure that was fixed by r328250
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Fri Feb 9 16:19:47 2018 (r329068)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Fri Feb 9 17:01:30 2018 (r329069)
@@ -104,7 +104,6 @@ zpool_clear_004_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_clear.cfg
- atf_expect_fail "https://www.illumos.org/issues/8641 zpool clear doesn't work on spare or replacing vdevs"
ksh93 $(atf_get_srcdir)/zpool_clear_004_pos.ksh || atf_fail "Testcase failed"
}
zpool_clear_004_pos_cleanup()
From owner-svn-src-projects@freebsd.org Fri Feb 9 18:42:35 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED9D2F1A889
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 18:42:34 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 9FF3F723D2;
Fri, 9 Feb 2018 18:42:34 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B01FA31;
Fri, 9 Feb 2018 18:42:34 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19IgYdi007762;
Fri, 9 Feb 2018 18:42:34 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19IgYLJ007761;
Fri, 9 Feb 2018 18:42:34 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201802091842.w19IgYLJ007761@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Fri, 9 Feb 2018 18:42:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329074 - projects/zfsd/head/etc/mtree
X-SVN-Group: projects
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: projects/zfsd/head/etc/mtree
X-SVN-Commit-Revision: 329074
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 18:42:35 -0000
Author: brd (doc,ports committer)
Date: Fri Feb 9 18:42:34 2018
New Revision: 329074
URL: https://svnweb.freebsd.org/changeset/base/329074
Log:
Add missing sbin dir.
Approved by: asomers
Modified:
projects/zfsd/head/etc/mtree/BSD.tests.dist
Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.tests.dist Fri Feb 9 18:18:35 2018 (r329073)
+++ projects/zfsd/head/etc/mtree/BSD.tests.dist Fri Feb 9 18:42:34 2018 (r329074)
@@ -62,6 +62,8 @@
cddl
lib
..
+ sbin
+ ..
usr.bin
ctfconvert
..
From owner-svn-src-projects@freebsd.org Fri Feb 9 20:56:13 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16D8DF017A0
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 20:56:13 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id BBF2A78DBC;
Fri, 9 Feb 2018 20:56:12 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2B1F1FC6;
Fri, 9 Feb 2018 20:56:12 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19KuCuR074868;
Fri, 9 Feb 2018 20:56:12 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19KuCwC074867;
Fri, 9 Feb 2018 20:56:12 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802092056.w19KuCwC074867@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 20:56:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329081 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare
X-SVN-Commit-Revision: 329081
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 20:56:13 -0000
Author: asomers
Date: Fri Feb 9 20:56:12 2018
New Revision: 329081
URL: https://svnweb.freebsd.org/changeset/base/329081
Log:
Fix intermittency in zpool_import_001_pos
Add multiple retries to pool export.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh Fri Feb 9 20:09:32 2018 (r329080)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh Fri Feb 9 20:56:12 2018 (r329081)
@@ -76,15 +76,25 @@ function verify_export_import #pool #file #chksum
typeset pool=$1
typeset file=$2
typeset checksum1=$3
+ typeset -i n=0
if ! $ZPOOL export $pool; then
# Rarely, this can fail with EBUSY if the pool's configuration
# has already changed within the same transaction group. In
# that case, it is appropriate to retry.
- $SYNC
- log_must $ZPOOL export $POOL
+ while ((n < 3)); do
+ $SYNC
+ log_note "$ZPOOL busy, retrying export (${n})..."
+ if ((n == 2)); then
+ log_must $ZPOOL export $pool
+ else
+ $ZPOOL export $pool && break
+ fi
+ $SLEEP 1
+ n=$((n + 1))
+ done
fi
- log_must $ZPOOL import -d $HOTSPARE_TMPDIR $POOL
+ log_must $ZPOOL import -d $HOTSPARE_TMPDIR $pool
[[ ! -e $file ]] && \
log_fail "$file missing after detach hotspare."
From owner-svn-src-projects@freebsd.org Fri Feb 9 21:12:39 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F4120F029F0
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 21:12:38 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 9A7F379A34;
Fri, 9 Feb 2018 21:12:38 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 957C022EF;
Fri, 9 Feb 2018 21:12:38 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19LCcPV084464;
Fri, 9 Feb 2018 21:12:38 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19LCcgt084463;
Fri, 9 Feb 2018 21:12:38 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802092112.w19LCcgt084463@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 21:12:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329082 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot
X-SVN-Commit-Revision: 329082
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 21:12:39 -0000
Author: asomers
Date: Fri Feb 9 21:12:38 2018
New Revision: 329082
URL: https://svnweb.freebsd.org/changeset/base/329082
Log:
Expect failure for snapshot_018_pos
The ZFS ctldir lacks support for pathconf(2)
PR: 225793
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Fri Feb 9 20:56:12 2018 (r329081)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Fri Feb 9 21:12:38 2018 (r329082)
@@ -521,6 +521,7 @@ snapshot_018_pos_body()
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/snapshot.cfg
+ atf_expect_fail "PR 225793 pathconf(2) doesn't work in ZFS's .zfs directory"
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/snapshot_018_pos.ksh || atf_fail "Testcase failed"
}
From owner-svn-src-projects@freebsd.org Fri Feb 9 21:13:21 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28C91F02A8A
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 21:13:21 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id CF32679B5C;
Fri, 9 Feb 2018 21:13:20 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C97D522F1;
Fri, 9 Feb 2018 21:13:20 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19LDKoE084547;
Fri, 9 Feb 2018 21:13:20 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19LDKq0084546;
Fri, 9 Feb 2018 21:13:20 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802092113.w19LDKq0084546@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 21:13:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329083 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot
X-SVN-Commit-Revision: 329083
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 21:13:21 -0000
Author: asomers
Date: Fri Feb 9 21:13:20 2018
New Revision: 329083
URL: https://svnweb.freebsd.org/changeset/base/329083
Log:
Skip snapshot_019_pos
This test frequently panics: "panic: found unreferenced mountpoint"
PR: 225795
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Fri Feb 9 21:12:38 2018 (r329082)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Fri Feb 9 21:13:20 2018 (r329083)
@@ -546,6 +546,7 @@ snapshot_019_pos_body()
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/snapshot.cfg
+ atf_skip "PR 225795 panic: found unreferenced mountpoint when accessing and unmounting snapshots in parallel"
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/snapshot_019_pos.ksh || atf_fail "Testcase failed"
}
From owner-svn-src-projects@freebsd.org Fri Feb 9 21:33:47 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8F89F03EF2
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 21:33:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 5E1EA7A96C;
Fri, 9 Feb 2018 21:33:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58DF7264D;
Fri, 9 Feb 2018 21:33:47 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19LXlS1094794;
Fri, 9 Feb 2018 21:33:47 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19LXlnU094793;
Fri, 9 Feb 2018 21:33:47 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802092133.w19LXlnU094793@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 21:33:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329084 -
projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation
X-SVN-Commit-Revision: 329084
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 21:33:47 -0000
Author: asomers
Date: Fri Feb 9 21:33:47 2018
New Revision: 329084
URL: https://svnweb.freebsd.org/changeset/base/329084
Log:
Fix reservation_017_pos on systems more recent than FreeBSD 11.1
At some point after when 11.1 was forked, I'm not sure exactly when, "zfs
get" will show "-" for zvols with the default volblocksize of 8k. Fix the
test by explicitly specifying 16KB. This test doesn't care about the exact
value.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh Fri Feb 9 21:13:20 2018 (r329083)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh Fri Feb 9 21:33:47 2018 (r329084)
@@ -66,8 +66,8 @@ log_assert "Verify that the volsize changes of sparse
#Create a regular and sparse volume for testing.
regvol=$TESTPOOL/$TESTVOL
sparsevol=$TESTPOOL/$TESTVOL2
-log_must $ZFS create -V $VOLSIZE $regvol
-log_must $ZFS create -s -V $VOLSIZE $sparsevol
+log_must $ZFS create -V $VOLSIZE -o volblocksize=16k $regvol
+log_must $ZFS create -s -V $VOLSIZE -o volblocksize=16k $sparsevol
typeset -l vsize=$(get_prop available $TESTPOOL)
typeset -i iterate=10
@@ -76,7 +76,7 @@ typeset -l sparsereserv
typeset -l vblksize1=$(get_prop volblocksize $regvol)
typeset -l vblksize2=$(get_prop volblocksize $sparsevol)
typeset -l blknum=0
-if (( $vblksize1 != $vblksize2 )); then
+if [ "$vblksize1" != "$vblksize2" ]; then
log_must $ZFS set volblocksize=$vblksize1 $sparsevol
fi
(( blknum = vsize / vblksize1 ))
From owner-svn-src-projects@freebsd.org Fri Feb 9 21:51:12 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C3FCF05250
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 21:51:12 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id F19607B56F;
Fri, 9 Feb 2018 21:51:11 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC53228FE;
Fri, 9 Feb 2018 21:51:11 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19LpBek005194;
Fri, 9 Feb 2018 21:51:11 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19Lp9uK005157;
Fri, 9 Feb 2018 21:51:09 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802092151.w19Lp9uK005157@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 21:51:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329086 - in projects/zfsd/head/tests/sys/cddl/zfs:
include tests/cache tests/clean_mirror tests/cli_root/zpool_add
tests/cli_root/zpool_create tests/cli_root/zpool_destroy tests/cli_ro...
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include
tests/cache tests/clean_mirror tests/cli_root/zpool_add
tests/cli_root/zpool_create tests/cli_root/zpool_destroy
tests/cli_root/zpool_remove tests/gro...
X-SVN-Commit-Revision: 329086
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 21:51:12 -0000
Author: asomers
Date: Fri Feb 9 21:51:08 2018
New Revision: 329086
URL: https://svnweb.freebsd.org/changeset/base/329086
Log:
Remove the is_physical_device ATF variable from the ZFS test suite
It's a holdover from the Solaris days. Frankly, I'm not 100% sure why it
exists. It seems like the purpose is to skip tests that partition disks
from running with file-backed vdevs. However, that's kind of useless since
the only reason to partition disks is to get a greater number, and
file-backed vdevs are unlimited. A better solution would be to remove
partitioning from all tests; if the system has insufficient disks then just
skip the tests. Besides, FreeBSD can always use vnode-backed md(4) devices,
which are unlimited in number and can be partitioned.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Feb 9 21:51:08 2018 (r329086)
@@ -2982,31 +2982,13 @@ function get_substr #src_str pos offset
}
#
-# Check if the given device is physical device
-#
-function is_physical_device #device
-{
- dev_file=`find_disks $1`
- [ -c "${dev_file}" -o -b "${dev_file}" ]
-
- return $?
-}
-
-#
# Get the directory path of given device
#
function get_device_dir #device
{
typeset device=$1
- if ! $(is_physical_device $device) ; then
- if [[ $device != "/" ]]; then
- device=${device%/*}
- fi
- $ECHO $device
- else
- $ECHO "/dev"
- fi
+ $ECHO "/dev"
}
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $LDEV) ; then
- log_unsupported "Only physical disk could be cache device"
-fi
-
if [[ -d $VDEV ]]; then
log_must $RM -rf $VDIR
fi
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $SINGLE_DISK ]]; then
log_note "Partitioning a single disk ($SINGLE_DISK)"
else
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -32,10 +32,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
#
# Use 'zpool create' to clean up the infomation in
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zpool_add_001_pos cleanup
zpool_add_001_pos_head()
{
atf_set "descr" "'zpool add <pool> <vdev> ...' can add devices to the pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -56,7 +55,6 @@ atf_test_case zpool_add_002_pos cleanup
zpool_add_002_pos_head()
{
atf_set "descr" "'zpool add -f <pool> <vdev> ...' can successfully add devices to the pool in some cases."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -84,7 +82,6 @@ atf_test_case zpool_add_003_pos cleanup
zpool_add_003_pos_head()
{
atf_set "descr" "'zpool add -n <pool> <vdev> ...' can display the configuration without actually adding devices to the pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -112,7 +109,6 @@ atf_test_case zpool_add_004_pos cleanup
zpool_add_004_pos_head()
{
atf_set "descr" "'zpool add <pool> <vdev> ...' can add zfs volume to the pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -140,7 +136,6 @@ atf_test_case zpool_add_005_pos cleanup
zpool_add_005_pos_head()
{
atf_set "descr" "'zpool add' should fail with inapplicable scenarios."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zpool
atf_set "timeout" 2400
}
@@ -169,7 +164,6 @@ atf_test_case zpool_add_006_pos cleanup
zpool_add_006_pos_head()
{
atf_set "descr" "'zpool add [-f]' can add large numbers of vdevs to the specified pool without any errors."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -197,7 +191,6 @@ atf_test_case zpool_add_007_neg cleanup
zpool_add_007_neg_head()
{
atf_set "descr" "'zpool add' should return an error with badly-formed parameters."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -225,7 +218,6 @@ atf_test_case zpool_add_008_neg cleanup
zpool_add_008_neg_head()
{
atf_set "descr" "'zpool add' should return an error with nonexistent pools and vdevs"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -253,7 +245,6 @@ atf_test_case zpool_add_009_neg cleanup
zpool_add_009_neg_head()
{
atf_set "descr" "'zpool add' should fail if vdevs are the same or vdev iscontained in the given pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -32,10 +32,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
#
# Use 'zpool create' to clean up the infomation in
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zpool_create_001_pos cleanup
zpool_create_001_pos_head()
{
atf_set "descr" "'zpool create <pool> <vspec> ...' can successfully createa new pool with a name in ZFS namespace."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -56,7 +55,6 @@ atf_test_case zpool_create_002_pos cleanup
zpool_create_002_pos_head()
{
atf_set "descr" "'zpool create -f <pool> <vspec> ...' can successfully createa new pool in some cases."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -84,7 +82,6 @@ atf_test_case zpool_create_003_pos cleanup
zpool_create_003_pos_head()
{
atf_set "descr" "'zpool create -n <pool> <vspec> ...' can display the configureationwithout actually creating the pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -112,7 +109,6 @@ atf_test_case zpool_create_004_pos cleanup
zpool_create_004_pos_head()
{
atf_set "descr" "'zpool create [-f]' can create a storage pool with large numbers of vdevswithout any errors."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -140,7 +136,6 @@ atf_test_case zpool_create_005_pos cleanup
zpool_create_005_pos_head()
{
atf_set "descr" "'zpool create [-R root][-m mountpoint] <pool> <vdev> ...' can createan alternate pool or a new pool mounted at the specified mountpoint."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool zfs
atf_set "timeout" 2400
}
@@ -168,7 +163,6 @@ atf_test_case zpool_create_006_pos cleanup
zpool_create_006_pos_head()
{
atf_set "descr" "Verify 'zpool create' succeed with keywords combination."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -196,7 +190,6 @@ atf_test_case zpool_create_007_neg cleanup
zpool_create_007_neg_head()
{
atf_set "descr" "'zpool create' should return an error with badly-formed parameters."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -224,7 +217,6 @@ atf_test_case zpool_create_008_pos cleanup
zpool_create_008_pos_head()
{
atf_set "descr" "'zpool create' have to use '-f' scenarios"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool format
atf_set "timeout" 2400
}
@@ -252,7 +244,6 @@ atf_test_case zpool_create_009_neg cleanup
zpool_create_009_neg_head()
{
atf_set "descr" "Create a pool with same devices twice or create two pools withsame devices, 'zpool create' should fail."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -280,7 +271,6 @@ atf_test_case zpool_create_010_neg cleanup
zpool_create_010_neg_head()
{
atf_set "descr" "'zpool create' should return an error with VDEVs <64mb"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -308,7 +298,6 @@ atf_test_case zpool_create_011_neg cleanup
zpool_create_011_neg_head()
{
atf_set "descr" "'zpool create' should be failed with inapplicable scenarios."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zpool
atf_set "timeout" 2400
}
@@ -336,7 +325,6 @@ atf_test_case zpool_create_012_neg cleanup
zpool_create_012_neg_head()
{
atf_set "descr" "'zpool create' should fail with disk slice in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool swap
atf_set "timeout" 2400
}
@@ -363,7 +351,6 @@ atf_test_case zpool_create_013_neg cleanup
zpool_create_013_neg_head()
{
atf_set "descr" "'zpool create' should fail with metadevice in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" metadb metaclear metastat zpool metainit swap
atf_set "timeout" 2400
}
@@ -390,7 +377,6 @@ atf_test_case zpool_create_014_neg cleanup
zpool_create_014_neg_head()
{
atf_set "descr" "'zpool create' should fail with regular file in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs swap zpool
atf_set "timeout" 2400
}
@@ -418,7 +404,6 @@ atf_test_case zpool_create_015_neg cleanup
zpool_create_015_neg_head()
{
atf_set "descr" "'zpool create' should fail with zfs vol device in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool swap
atf_set "timeout" 2400
}
@@ -446,7 +431,6 @@ atf_test_case zpool_create_016_pos cleanup
zpool_create_016_pos_head()
{
atf_set "descr" "'zpool create' should success with no device in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm swapadd zpool swap
atf_set "timeout" 2400
}
@@ -474,7 +458,6 @@ atf_test_case zpool_create_017_neg cleanup
zpool_create_017_neg_head()
{
atf_set "descr" "'zpool create' should fail with mountpoint exists and not empty."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -504,7 +487,6 @@ atf_test_case zpool_create_018_pos cleanup
zpool_create_018_pos_head()
{
atf_set "descr" "zpool create can create pools with specified properties"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -532,7 +514,6 @@ atf_test_case zpool_create_019_pos cleanup
zpool_create_019_pos_head()
{
atf_set "descr" "zpool create cannot create pools specifying readonly properties"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -560,7 +541,6 @@ atf_test_case zpool_create_020_pos cleanup
zpool_create_020_pos_head()
{
atf_set "descr" "zpool create -R works as expected"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -588,7 +568,6 @@ atf_test_case zpool_create_021_pos cleanup
zpool_create_021_pos_head()
{
atf_set "descr" "'zpool create -O property=value pool' can successfully create a poolwith correct filesystem property set."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -616,7 +595,6 @@ atf_test_case zpool_create_022_pos cleanup
zpool_create_022_pos_head()
{
atf_set "descr" "'zpool create -O property=value pool' can successfully create a poolwith multiple filesystem properties set."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -644,7 +622,6 @@ atf_test_case zpool_create_023_neg cleanup
zpool_create_023_neg_head()
{
atf_set "descr" "'zpool create -O' should return an error with badly formed parameters."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -64,10 +64,6 @@ function cleanup
set -A datasets "$TESTPOOL" "$TESTPOOL2"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This case cannot be run on raw files."
-fi
-
log_assert "'zpool destroy <pool>' can destroy a specified pool."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zpool_destroy_001_pos cleanup
zpool_destroy_001_pos_head()
{
atf_set "descr" "'zpool destroy <pool>' can destroy a specified pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
}
zpool_destroy_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -30,10 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
partition_disk $SIZE $DISK 6
log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zpool_remove_001_neg cleanup
zpool_remove_001_neg_head()
{
atf_set "descr" "Check zpool remove <pool> <device> can not removeactive device from pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
}
zpool_remove_001_neg_body()
@@ -53,7 +52,6 @@ atf_test_case zpool_remove_002_pos cleanup
zpool_remove_002_pos_head()
{
atf_set "descr" "zpool remove can only remove inactive hotspare device from pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
}
zpool_remove_002_pos_body()
@@ -78,7 +76,6 @@ atf_test_case zpool_remove_003_pos cleanup
zpool_remove_003_pos_head()
{
atf_set "descr" "zpool remove can remove hotspare device which state go though active to inactive in pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
}
zpool_remove_003_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case grow_pool_001_pos cleanup
grow_pool_001_pos_head()
{
atf_set "descr" "A zpool may be increased in capacity by adding a disk"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
}
grow_pool_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
log_note "No spare disks available. Using slices on $DISK"
log_must partition_disk $SIZE $DISK 2
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case grow_replicas_001_pos cleanup
grow_replicas_001_pos_head()
{
atf_set "descr" "A zpool mirror/raidz may be increased in capacity by adding a disk."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
}
grow_replicas_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
log_note "Creating pool type: $POOLTYPE"
if [[ -n $DISK ]]; then
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -70,10 +70,6 @@ function cleanup
partition_cleanup
}
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This test cannot be run on raw files."
-fi
-
log_assert "'zpool add [-f]' will not allow a swap device to be used as a hotspare'"
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -79,10 +79,6 @@ function cleanup
partition_cleanup
}
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
log_assert "'zpool create [-f]' with hot spares should be failed " \
"with inapplicable scenarios."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -79,7 +79,6 @@ atf_test_case hotspare_add_003_neg cleanup
hotspare_add_003_neg_head()
{
atf_set "descr" "'zpool add [-f]' with hot spares should fail with inapplicable scenarios."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 3600
}
@@ -106,7 +105,6 @@ atf_test_case hotspare_add_004_neg cleanup
hotspare_add_004_neg_head()
{
atf_set "descr" "'zpool add [-f]' will not allow a swap device to be used as a hotspare'"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool swapon swapoff swapctl
}
hotspare_add_004_neg_body()
@@ -185,7 +183,6 @@ atf_test_case hotspare_create_001_neg cleanup
hotspare_create_001_neg_head()
{
atf_set "descr" "'zpool create [-f]' with hot spares should be failedwith inapplicable scenarios."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zpool
atf_set "timeout" 3600
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case enospc_001_pos cleanup
enospc_001_pos_head()
{
atf_set "descr" "ENOSPC is returned when file system is full."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
enospc_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -30,10 +30,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
DISK=${DISKS%% *}
wipe_partition_table $DISK
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case scrub_mirror_001_pos cleanup
scrub_mirror_001_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_001_pos_body()
@@ -55,7 +54,6 @@ atf_test_case scrub_mirror_002_pos cleanup
scrub_mirror_002_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_002_pos_body()
@@ -82,7 +80,6 @@ atf_test_case scrub_mirror_003_pos cleanup
scrub_mirror_003_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_003_pos_body()
@@ -109,7 +106,6 @@ atf_test_case scrub_mirror_004_pos cleanup
scrub_mirror_004_pos_head()
{
atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_004_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $SINGLE_DISK ]]; then
log_note "Partitioning a single disk ($SINGLE_DISK)"
else
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 Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -185,7 +185,6 @@ 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()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
DISK=${DISKS%% *}
wipe_partition_table $DISK
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case write_dirs_001_pos cleanup
write_dirs_001_pos_head()
{
atf_set "descr" "Creating directories with 50 big files in each, until file systemis full."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 1200
}
@@ -54,7 +53,6 @@ atf_test_case write_dirs_002_pos cleanup
write_dirs_002_pos_head()
{
atf_set "descr" "Creating directories with 5000 files in each, until file systemis full."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 1200
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
#
# Use 'zpool create' to clean up the infomation in
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zinject_001_pos cleanup
zinject_001_pos_head()
{
atf_set "descr" "Verify fault inject handle content error successfully."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
@@ -55,7 +54,6 @@ atf_test_case zinject_002_pos cleanup
zinject_002_pos_head()
{
atf_set "descr" "Verify fault inject handle metadnode error successfully."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
@@ -82,7 +80,6 @@ atf_test_case zinject_003_pos cleanup
zinject_003_pos_head()
{
atf_set "descr" "Verify fault inject handle into first metadnodecause filesystem unmountable."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
@@ -109,7 +106,6 @@ atf_test_case zinject_004_pos cleanup
zinject_004_pos_head()
{
atf_set "descr" "Verify fault inject handle device error successfully."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -32,10 +32,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
default_zvol_setup $DISK $VOLSIZE
log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zvol_misc_001_neg cleanup
zvol_misc_001_neg_head()
{
atf_set "descr" "Verify that ZFS volume cannot act as dump device until dumpswap supported."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm
}
zvol_misc_001_neg_body()
@@ -53,7 +52,6 @@ atf_test_case zvol_misc_002_pos cleanup
zvol_misc_002_pos_head()
{
atf_set "descr" "Verify that ZFS volume snapshot could be fscked"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
zvol_misc_002_pos_body()
@@ -78,7 +76,6 @@ atf_test_case zvol_misc_003_neg cleanup
zvol_misc_003_neg_head()
{
atf_set "descr" "Verify create storage pool or newfs over dump volume is denied."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zpool
}
zvol_misc_003_neg_body()
@@ -103,7 +100,6 @@ atf_test_case zvol_misc_004_pos cleanup
zvol_misc_004_pos_head()
{
atf_set "descr" "Verify permit to create snapshot over dumpswap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs swap
}
zvol_misc_004_pos_body()
@@ -128,7 +124,6 @@ atf_test_case zvol_misc_005_neg cleanup
zvol_misc_005_neg_head()
{
atf_set "descr" "Verify a device cannot be dump and swap at the same time."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm swap
}
zvol_misc_005_neg_body()
@@ -153,7 +148,6 @@ atf_test_case zvol_misc_006_pos cleanup
zvol_misc_006_pos_head()
{
atf_set "descr" "zfs volume as dumpdevice should have 128k volblocksize"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zfs
}
zvol_misc_006_pos_body()
@@ -178,7 +172,6 @@ atf_test_case zvol_misc_007_pos cleanup
zvol_misc_007_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
atf_set "timeout" 1200
}
@@ -205,7 +198,6 @@ atf_test_case zvol_misc_008_pos cleanup
zvol_misc_008_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
atf_set "timeout" 1200
}
@@ -232,7 +224,6 @@ atf_test_case zvol_misc_009_pos cleanup
zvol_misc_009_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
atf_set "timeout" 1200
}
From owner-svn-src-projects@freebsd.org Fri Feb 9 22:33:24 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB413F07BB1
for <svn-src-projects@mailman.ysv.freebsd.org>;
Fri, 9 Feb 2018 22:33:23 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 9E7FB7CF2C;
Fri, 9 Feb 2018 22:33:23 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9967E2FEC;
Fri, 9 Feb 2018 22:33:23 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19MXNgX027075;
Fri, 9 Feb 2018 22:33:23 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19MXNqP027070;
Fri, 9 Feb 2018 22:33:23 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802092233.w19MXNqP027070@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 9 Feb 2018 22:33:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329089 - in projects/zfsd/head/tests/sys/cddl/zfs:
include tests/cli_root/zpool_clear tests/redundancy
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include
tests/cli_root/zpool_clear tests/redundancy
X-SVN-Commit-Revision: 329089
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2018 22:33:24 -0000
Author: asomers
Date: Fri Feb 9 22:33:22 2018
New Revision: 329089
URL: https://svnweb.freebsd.org/changeset/base/329089
Log:
Fix ZFS tests that use corrupt_file
There was some broken crap that snuck in due to a SpectraLogic-specific
change to zdb that was never upstreamed and later reverted, but the tests
were not reverted.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt
projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Fri Feb 9 22:33:22 2018 (r329088)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Fri Feb 9 22:33:22 2018 (r329089)
@@ -147,6 +147,7 @@
#%%STFSUITEDIR%%/bin/swap
#/sbin/swapadd
/usr/bin/sort
+/usr/bin/stat
/usr/bin/strings
/bin/sync
/usr/bin/tar
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Feb 9 22:33:22 2018 (r329088)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Feb 9 22:33:22 2018 (r329089)
@@ -3311,16 +3311,18 @@ function file_dva # dataset filepath [level] [offset]
typeset -i offset=$4
typeset -i dva_num=$5
- # A lot of these numbers can be larger than 32-bit, so we have to
- # use floats to manage them... :(
- typeset -i blksz=0
- typeset -i blknum=0
- typeset -i startoff
+ typeset -li blksz=0
+ typeset -li blknum=0
+ typeset -li startoff
+ typeset -li inode
+ eval `$STAT -s "$filepath"`
+ inode="$st_ino"
+
# The inner match is for 'DVA[0]=<0:1b412600:200>', in which the
# text surrounding the actual DVA is a fixed size with 8 characters
# before it and 1 after.
- $ZDB -P -vvvvv -o "ZFS plain file" $dataset $filepath | \
+ $ZDB -P -vvvvv $dataset $inode | \
$AWK -v level=${level} -v dva_num=${dva_num} '
BEGIN { stage = 0; }
(stage == 0) && ($1=="Object") { stage = 1; next; }
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh Fri Feb 9 22:33:22 2018 (r329088)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh Fri Feb 9 22:33:22 2018 (r329089)
@@ -83,7 +83,7 @@ function test_clear
log_note "Testing ${type} clear type ..."
[ "$type" = "device" ] && vdev_arg="${fbase}.0"
- corrupt_file $TESTPOOL1 /f
+ corrupt_file $TESTPOOL1 /$TESTPOOL1/f
log_must $ZPOOL scrub $TESTPOOL1
wait_for 20 1 is_pool_scrubbed $TESTPOOL1
log_must pool_has_errors $TESTPOOL1
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib Fri Feb 9 22:33:22 2018 (r329088)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib Fri Feb 9 22:33:22 2018 (r329089)
@@ -212,7 +212,7 @@ function damage_devs
typeset -i i=0
log_mustnot pool_has_errors $pool
while [ $i -lt $cnt ]; do
- corrupt_file $TESTPOOL /file $i
+ corrupt_file $TESTPOOL $TESTDIR/file $i
(( i += 1 ))
done
sync_pool $pool