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 ***