From owner-svn-src-projects@freebsd.org Tue Feb 13 17:42:22 2018 Return-Path: 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 E28F0F14847 for ; Tue, 13 Feb 2018 17:42: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 3B1D08629E; Tue, 13 Feb 2018 17:42: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 3505724029; Tue, 13 Feb 2018 17:42: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 w1DHgLXc002045; Tue, 13 Feb 2018 17:42:21 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHgGLF001998; Tue, 13 Feb 2018 17:42:16 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131742.w1DHgGLF001998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:42:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329227 - projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance X-SVN-Commit-Revision: 329227 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 17:42:22 -0000 Author: asomers Date: Tue Feb 13 17:42:16 2018 New Revision: 329227 URL: https://svnweb.freebsd.org/changeset/base/329227 Log: In inheritance/inherit_001_pos, don't create a pool named TESTPOOL Every other test creates a pool named testpool.XXXX, where XXXX is a decimal hash. For technical reasons, it's hard to do the same for this test. But "testpool.inherit" is more conventional than TESTPOOL. Sponsored by: Spectra Logic Corp Modified: 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/state001.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.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/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 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config001.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config002.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config003.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config004.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config005.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config006.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config007.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config008.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS default +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config009.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS default +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config010.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS default +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config011.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config012.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config013.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config014.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config015.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config016.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config017.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config018.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config019.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config020.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config021.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config022.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config023.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config024.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -38,5 +38,5 @@ -:- # local local -TESTPOOL TESTPOOL -TESTPOOL TESTPOOL +testpool.inherit testpool.inherit +testpool.inherit testpool.inherit Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,4 +40,4 @@ # default default local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,4 +40,4 @@ # local local local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -41,5 +41,5 @@ # # local local -TESTPOOL TESTPOOL +testpool.inherit testpool.inherit local local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -35,19 +35,19 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # default default default default default default # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -34,19 +34,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default default default default default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -36,19 +36,19 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # default default default default local local # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default local local # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,19 +40,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default default default local default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -34,19 +34,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit +testpool.inherit:inherit # default default local local local local # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default local local # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,19 +40,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default local default local default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -43,21 +43,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # default default local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default -TESTPOOL/TESTCTR default +testpool.inherit/TESTCTR default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,19 +40,19 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default local default -TESTPOOL default +testpool.inherit default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -44,21 +44,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # local default local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default -TESTPOOL/TESTCTR default +testpool.inherit/TESTCTR default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -41,21 +41,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default local default -TESTPOOL/TESTCTR default +testpool.inherit/TESTCTR default # # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -39,21 +39,21 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit +testpool.inherit:inherit # local default -TESTPOOL default -TESTPOOL default +testpool.inherit default +testpool.inherit default # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,21 +40,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default -TESTPOOL default -TESTPOOL default +testpool.inherit default +testpool.inherit default # # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,21 +40,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # local default -TESTPOOL default +testpool.inherit default local local # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default local local # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -39,21 +39,21 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default -TESTPOOL default +testpool.inherit default local default # # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -41,21 +41,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # local default local local local local # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default local local # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -39,21 +39,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default local default local default # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default From owner-svn-src-projects@freebsd.org Tue Feb 13 17:44:55 2018 Return-Path: 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 618ABF14BF1 for ; Tue, 13 Feb 2018 17:44: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 1410C8662B; Tue, 13 Feb 2018 17:44: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 0F0E82403F; Tue, 13 Feb 2018 17:44: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 w1DHisUW002236; Tue, 13 Feb 2018 17:44:54 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHisnH002235; Tue, 13 Feb 2018 17:44:54 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131744.w1DHisnH002235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:44:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329229 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename X-SVN-Commit-Revision: 329229 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 17:44:55 -0000 Author: asomers Date: Tue Feb 13 17:44:54 2018 New Revision: 329229 URL: https://svnweb.freebsd.org/changeset/base/329229 Log: Remove the cleanup step in zfs_rename_009_neg tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Remove the cleanup step. It's redundant with the standard cleanup in cleanup.ksh. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Tue Feb 13 17:43:54 2018 (r329228) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Tue Feb 13 17:44:54 2018 (r329229) @@ -63,32 +63,7 @@ if (($? != 0)); then log_unsupported fi -function cleanup -{ - typeset snaps=$($ZFS list -H -t snapshot -o name) - typeset exclude - typeset snap - typeset pool_name - - if [[ -n $KEEP ]]; then - exclude=`eval $ECHO \"'(${KEEP})'\"` - fi - - for snap in $snaps; do - pool_name=$($ECHO "$snap" | $AWK -F/ '{print $1}') - if [[ -n $exclude ]]; then - $ECHO "$pool_name" | $EGREP -v "$exclude" > /dev/null 2>&1 - if [[ $? -eq 0 ]]; then - log_must $ZFS destroy $snap - fi - else - log_must $ZFS destroy $snap - fi - done -} - log_assert "zfs rename -r failed, when snapshot name is already existing." -log_onexit cleanup set -A datasets $TESTPOOL $TESTPOOL/$TESTCTR \ $TESTPOOL/$TESTCTR/$TESTFS1 $TESTPOOL/$TESTFS From owner-svn-src-projects@freebsd.org Tue Feb 13 17:49:10 2018 Return-Path: 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 1457DF15150 for ; Tue, 13 Feb 2018 17:49: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 B292486A2A; Tue, 13 Feb 2018 17:49:09 +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 AD72124046; Tue, 13 Feb 2018 17:49:09 +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 w1DHn9fK002633; Tue, 13 Feb 2018 17:49:09 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHn8if002619; Tue, 13 Feb 2018 17:49:08 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131749.w1DHn8if002619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:49:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329230 - in projects/zfsd/head: share/man/man7 tests/sys/cddl/zfs/include tests/sys/cddl/zfs/tests/cli_root/zfs_mount tests/sys/cddl/zfs/tests/cli_root/zfs_set tests/sys/cddl/zfs/tests... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head: share/man/man7 tests/sys/cddl/zfs/include tests/sys/cddl/zfs/tests/cli_root/zfs_mount tests/sys/cddl/zfs/tests/cli_root/zfs_set tests/sys/cddl/zfs/tests/cli_root/zfs_unmount tes... X-SVN-Commit-Revision: 329230 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 17:49:10 -0000 Author: asomers Date: Tue Feb 13 17:49:08 2018 New Revision: 329230 URL: https://svnweb.freebsd.org/changeset/base/329230 Log: Eliminate the test_suites.FreeBSD.keep_pools Kyua config variable Failing to set this variable would result in bad stuff happening, like the ZFS test suite destroying or exporting your existing pools. Instead, modify the test suite to always ignore every pool whose name doesn't match /^testpool/. tests/sys/cddl/zfs/include/libtest.kshlib * Add other_pools_exist. It returns true if the system contains any pools whose names don't match /^testpool/ * Modify all_pools to exclude pools whose names don't match /^testpool/, and ignore KEEP. tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_009_neg.ksh tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_002_pos.ksh tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh tests/sys/cddl/zfs/tests/mount/mount_test.sh tests/sys/cddl/zfs/tests/mount/mounttest.ksh Conditionally skip tests based on other_pools_exist, not KEEP. share/man/man7/tests.7 Remove keep_pools from the man page Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/share/man/man7/tests.7 projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_009_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh 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_set/canmount_002_pos.ksh 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_unmount/zfs_unmount_009_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh 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_upgrade/zpool_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mounttest.ksh Modified: projects/zfsd/head/share/man/man7/tests.7 ============================================================================== --- projects/zfsd/head/share/man/man7/tests.7 Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/share/man/man7/tests.7 Tue Feb 13 17:49:08 2018 (r329230) @@ -26,7 +26,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 21, 2017 +.Dd February 13, 2018 .Dt TESTS 7 .Os .Sh NAME @@ -186,11 +186,6 @@ Tests are not required to preserve any data present on Must be set to a space delimited list of FIBs (routing tables). Tests that need to modify a routing table may use any of these. Tests will cleanup any new routes that they create. -.It keep_pools -Must be set to a space delimited list of -.Xr zfs 8 -pools that the tests should not modify. No test may modify any of these pools, -other than by writing temporary files in the usual locations. .El .Ss What to do if something fails? If there is Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Feb 13 17:49:08 2018 (r329230) @@ -376,11 +376,18 @@ function default_cleanup function all_pools { - cmd="$ZPOOL list -H -o name | $GREP -v '$NO_POOLS'" - if [[ -n $KEEP ]]; then - cmd="$cmd | $EGREP -v '(${KEEP})'" - fi + cmd="$ZPOOL list -H -o name | $GREP 'testpool'" eval $cmd +} + +# +# Returns 0 if the system contains any pools that must not be modified by the +# ZFS tests. +# +function other_pools_exist +{ + typeset pool_count=`$ZPOOL list -H | $GREP -v '^testpool' | $WC -l` + [ "$pool_count" -ne 0 ] } function default_cleanup_noexit Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_009_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_009_neg.ksh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_009_neg.ksh Tue Feb 13 17:49:08 2018 (r329230) @@ -107,10 +107,6 @@ function verify_all log_assert "Badly-formed 'zfs $mountcmd' with inapplicable scenarios " \ "should return an error." -if [[ -n $KEEP ]]; then - log_unsupported "Can't test unmount -a when pools are in KEEP" -fi - log_onexit cleanup_all log_must setup_all Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh Tue Feb 13 17:49:08 2018 (r329230) @@ -176,10 +176,6 @@ function verify_all log_assert "Verify that 'zfs $mountall' succeeds as root, " \ "and all available ZFS filesystems are mounted." -if [[ -n $KEEP ]]; then - log_unsupported "Can't test unmount -a when pools are in KEEP" -fi - log_onexit cleanup_all log_must setup_all Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Tue Feb 13 17:49:08 2018 (r329230) @@ -37,6 +37,10 @@ zfs_mount_001_pos_body() . $(atf_get_srcdir)/zfs_mount.cfg verify_disk_count "$DISKS" 1 + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi + ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_mount_001_pos.ksh || atf_fail "Testcase failed" } @@ -249,8 +253,9 @@ zfs_mount_009_neg_body() . $(atf_get_srcdir)/zfs_mount.kshlib . $(atf_get_srcdir)/zfs_mount.cfg - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" @@ -331,8 +336,9 @@ zfs_mount_all_001_pos_body() . $(atf_get_srcdir)/zfs_mount.kshlib . $(atf_get_srcdir)/zfs_mount.cfg - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_002_pos.ksh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_002_pos.ksh Tue Feb 13 17:49:08 2018 (r329230) @@ -114,9 +114,6 @@ function cleanup } log_assert "Setting canmount=noauto to file system, it must be successful." -if [[ -n $KEEP ]]; then - log_unsupported "Can't test unmount -a when pools are in KEEP" -fi log_onexit cleanup set -A old_mnt Modified: 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_set/zfs_set_test.sh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh Tue Feb 13 17:49:08 2018 (r329230) @@ -117,8 +117,9 @@ canmount_002_pos_body() . $(atf_get_srcdir)/zfs_set_common.kshlib . $(atf_get_srcdir)/zfs_set.cfg - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" @@ -147,8 +148,9 @@ canmount_003_pos_body() . $(atf_get_srcdir)/zfs_set_common.kshlib . $(atf_get_srcdir)/zfs_set.cfg - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh Tue Feb 13 17:49:08 2018 (r329230) @@ -96,9 +96,6 @@ function restore_dataset log_assert "zfs fource unmount and destroy in snapshot directory will not cause error." -if [[ -n $KEEP ]]; then - log_unsupported "Can't test unmount -a when pools are in KEEP" -fi log_onexit cleanup for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh Tue Feb 13 17:49:08 2018 (r329230) @@ -176,10 +176,6 @@ function verify_all log_assert "Verify that 'zfs $unmountall' succeeds as root, " \ "and all available ZFS filesystems are unmounted." -if [[ -n $KEEP ]]; then - log_unsupported "Can't test unmount -a when pools are in KEEP" -fi - log_onexit cleanup_all log_must setup_all 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 Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh Tue Feb 13 17:49:08 2018 (r329230) @@ -244,8 +244,9 @@ zfs_unmount_009_pos_body() . $(atf_get_srcdir)/zfs_unmount.kshlib . $(atf_get_srcdir)/zfs_unmount.cfg - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" @@ -273,8 +274,9 @@ zfs_unmount_all_001_pos_body() . $(atf_get_srcdir)/zfs_unmount.kshlib . $(atf_get_srcdir)/zfs_unmount.cfg - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" Modified: 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/zfs_upgrade/zfs_upgrade_test.sh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh Tue Feb 13 17:49:08 2018 (r329230) @@ -140,8 +140,9 @@ zfs_upgrade_005_pos_body() . $(atf_get_srcdir)/zfs_upgrade.cfg . $(atf_get_srcdir)/zfs_upgrade.kshlib - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Tue Feb 13 17:49:08 2018 (r329230) @@ -119,8 +119,9 @@ zpool_upgrade_004_pos_body() . $(atf_get_srcdir)/zpool_upgrade.cfg verify_disk_count "$DISKS" 2 - [[ -n "$KEEP" ]] && \ - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" + fi ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_004_pos.ksh || atf_fail "Testcase failed" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh Tue Feb 13 17:49:08 2018 (r329230) @@ -59,8 +59,8 @@ umountall_001_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/vars.cfg - if [[ -n "$KEEP" ]]; then - atf_skip "Can't test unmount -a when pools are in KEEP" + if other_pools_exist; then + atf_skip "Can't test unmount -a with existing pools" fi verify_disk_count "$DISKS" 1 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mounttest.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mounttest.ksh Tue Feb 13 17:44:54 2018 (r329229) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mounttest.ksh Tue Feb 13 17:49:08 2018 (r329230) @@ -80,15 +80,9 @@ done log_note Unmount the file systems if [[ $unmountcmd = *all ]] ; then - if [[ -n $KEEP ]]; then - log_unsupported "Can't test unmount -a when pools are in KEEP" - fi log_must $ZFS $unmountcmd -F zfs else if [[ $unmountcmd = *-a ]] ; then - if [[ -n $KEEP ]]; then - log_unsupported "Can't test unmount -a when pools are in KEEP" - fi log_must $ZFS $unmountcmd else for fs in $TESTFSS ; do From owner-svn-src-projects@freebsd.org Tue Feb 13 17:50:36 2018 Return-Path: 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 C98FCF152C6 for ; Tue, 13 Feb 2018 17:50: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 7AA3A86B85; Tue, 13 Feb 2018 17:50: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 7187D2404D; Tue, 13 Feb 2018 17:50: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 w1DHoaeq002746; Tue, 13 Feb 2018 17:50:36 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHoaA0002745; Tue, 13 Feb 2018 17:50:36 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131750.w1DHoaA0002745@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:50:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329231 - projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names X-SVN-Commit-Revision: 329231 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 17:50:37 -0000 Author: asomers Date: Tue Feb 13 17:50:36 2018 New Revision: 329231 URL: https://svnweb.freebsd.org/changeset/base/329231 Log: Remove redundancy cleanup from pool_names_002_neg tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh Don't try to cleanup the disks at the beginning of the test. Cleanup is each test's own responsibility. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh 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 Tue Feb 13 17:49:08 2018 (r329230) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh Tue Feb 13 17:50:36 2018 (r329231) @@ -73,14 +73,6 @@ function cleanup log_onexit cleanup -typeset exclude=`eval $ECHO \"'(${KEEP})'\"` -for pool in $($ZPOOL list -H -o name | \ - $EGREP -v "$exclude" | \ - $GREP -v "$TESTPOOL" | \ - $EGREP -v "$NO_POOLS"); do - log_must $ZPOOL destroy $pool -done - if [[ ! -e $TESTDIR ]]; then log_must $MKDIR $TESTDIR fi From owner-svn-src-projects@freebsd.org Tue Feb 13 17:52:01 2018 Return-Path: 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 06759F155C7 for ; Tue, 13 Feb 2018 17:52:01 +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 AA12686F29; Tue, 13 Feb 2018 17:52:00 +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 A515A241C4; Tue, 13 Feb 2018 17:52:00 +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 w1DHq0qm005934; Tue, 13 Feb 2018 17:52:00 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHq0KL005933; Tue, 13 Feb 2018 17:52:00 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131752.w1DHq0KL005933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:52:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329233 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade X-SVN-Commit-Revision: 329233 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 17:52:01 -0000 Author: asomers Date: Tue Feb 13 17:52:00 2018 New Revision: 329233 URL: https://svnweb.freebsd.org/changeset/base/329233 Log: Remove redundant check in zpool_upgrade_004_pos tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh Delete redundant check for whether to skip the test. It will be caught by the "other_pools_exist" check. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh Tue Feb 13 17:51:16 2018 (r329232) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh Tue Feb 13 17:52:00 2018 (r329233) @@ -65,11 +65,6 @@ function cleanup log_assert "zpool upgrade -a works" -$DF -F zfs / > /dev/null 2>&1 -if (( $? == 0 )); then - log_unsupported "This case should not run on ZFS root system" -fi - log_onexit cleanup # Now build all of our pools From owner-svn-src-projects@freebsd.org Tue Feb 13 17:56:02 2018 Return-Path: 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 D893AF15B06 for ; Tue, 13 Feb 2018 17:56:01 +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 8568087398; Tue, 13 Feb 2018 17:56:01 +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 806A2241F4; Tue, 13 Feb 2018 17:56:01 +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 w1DHu1R4007950; Tue, 13 Feb 2018 17:56:01 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHu07Q007942; Tue, 13 Feb 2018 17:56:00 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131756.w1DHu07Q007942@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:56:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329234 - in projects/zfsd/head/tests/sys/cddl/zfs: bin include tests/clean_mirror tests/cli_root/zfs_upgrade tests/devices tests/largest_pool tests/scrub_mirror X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: bin include tests/clean_mirror tests/cli_root/zfs_upgrade tests/devices tests/largest_pool tests/scrub_mirror X-SVN-Commit-Revision: 329234 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 17:56:02 -0000 Author: asomers Date: Tue Feb 13 17:56:00 2018 New Revision: 329234 URL: https://svnweb.freebsd.org/changeset/base/329234 Log: Use native df(1) in the ZFS test suite Eliminate the weird Illumos partial-compatibility wrapper. tests/sys/cddl/zfs/bin/Makefile tests/sys/cddl/zfs/bin/df.ksh Delete the compatibility wrapper tests/sys/cddl/zfs/include/libtest.kshlib tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh tests/sys/cddl/zfs/tests/devices/devices_common.kshlib tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh Adjust usage of df Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/bin/df.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh 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_005_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Tue Feb 13 17:56:00 2018 (r329234) @@ -8,7 +8,6 @@ BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin SCRIPTSDIR= ${TESTSBASE}/sys/cddl/zfs/bin SCRIPTS+= bsddisks.ksh -SCRIPTS+= df.ksh SCRIPTS+= dircmp.ksh SCRIPTS+= dumpadm.ksh SCRIPTS+= ff.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Feb 13 17:56:00 2018 (r329234) @@ -2756,11 +2756,7 @@ function get_fstype log_fail "Usage: get_fstype " fi - # - # $ df -n / - # / : ufs - # - $DF -n $dir | $AWK '{print $3}' + $DF -T $dir | $AWK '{print $2}' } # @@ -2936,8 +2932,7 @@ function pool_prop_exist # function is_zfsroot { - $DF -n / | $GREP zfs > /dev/null 2>&1 - return $? + $DF -T / | $GREP -q zfs } # Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh Tue Feb 13 17:56:00 2018 (r329234) @@ -31,7 +31,7 @@ verify_runnable "global" -$DF -F zfs -h | $GREP "$TESTFS " >/dev/null +$DF -t zfs -h | $GREP "$TESTFS " >/dev/null [[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR destroy_pool $TESTPOOL 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 Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Tue Feb 13 17:56:00 2018 (r329234) @@ -137,7 +137,7 @@ function default_check_zfs_upgrade #rootfs typeset newv typeset -i df_ret - $DF -F zfs / > /dev/null 2>&1 + $DF -t zfs / > /dev/null 2>&1 df_ret=$? for newv in "" $ZFS_VERSION; do Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh Tue Feb 13 17:56:00 2018 (r329234) @@ -90,7 +90,7 @@ function setup_datasets log_assert "Executing 'zfs upgrade [-V version] -a' command succeeds." -$DF -F zfs / > /dev/null 2>&1 +$DF -t zfs / > /dev/null 2>&1 if (( $? == 0 )) ; then log_unsupported "This case should not run on ZFS root system" fi 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 Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib Tue Feb 13 17:56:00 2018 (r329234) @@ -42,7 +42,7 @@ function create_dev_file case $filetype in b) - devtype=$($DF -n / | $AWK '{print $3}') + devtype=$($DF -T / | $AWK '{print $2}') case $devtype in zfs) rootpool=$($DF / | \ @@ -62,7 +62,7 @@ function create_dev_file # Get the existing block device file in current system. # And bring out the first one. # - devstr=$($DF -lhF ufs | \ + devstr=$($DF -lht ufs | \ $GREP "^/dev/dsk" | \ $AWK '{print $1}') devstr=$($ECHO "$devstr" | \ Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh Tue Feb 13 17:56:00 2018 (r329234) @@ -79,7 +79,7 @@ function parse_expected_output $AWK '{print $2}' | $GREP $CHKUNIT" log_note "Detect the file system in this test machine." - log_must eval "$DF -F zfs -h > $TMPDIR/j.${TESTCASE_ID}" + log_must eval "$DF -t zfs -h > $TMPDIR/j.${TESTCASE_ID}" log_must eval "$GREP $TESTPOOL $TMPDIR/j.${TESTCASE_ID} | \ $AWK '{print $2}' | $GREP $CHKUNIT" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh Tue Feb 13 17:52:00 2018 (r329233) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh Tue Feb 13 17:56:00 2018 (r329234) @@ -31,7 +31,7 @@ verify_runnable "global" -$DF -F zfs -h | $GREP "$TESTFS " >/dev/null +$DF -t zfs -h | $GREP "$TESTFS " >/dev/null [[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR destroy_pool $TESTPOOL From owner-svn-src-projects@freebsd.org Tue Feb 13 17:58:03 2018 Return-Path: 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 9BAC3F15D73 for ; Tue, 13 Feb 2018 17:58:03 +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 4E5F287533; Tue, 13 Feb 2018 17:58:03 +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 4939C241FA; Tue, 13 Feb 2018 17:58:03 +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 w1DHw3Fq008059; Tue, 13 Feb 2018 17:58:03 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHw36x008058; Tue, 13 Feb 2018 17:58:03 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131758.w1DHw36x008058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:58:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329235 - projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool X-SVN-Commit-Revision: 329235 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 17:58:03 -0000 Author: asomers Date: Tue Feb 13 17:58:02 2018 New Revision: 329235 URL: https://svnweb.freebsd.org/changeset/base/329235 Log: Eliminate the "is_zfs_root" kyua config variable. If the user forgets to set it, then certain tests will misbehave. Better to detect a ZFS root filesystem automatically. tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh Automatically skip if there's no ZFS root filesystem Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh Tue Feb 13 17:56:00 2018 (r329234) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh Tue Feb 13 17:58:02 2018 (r329235) @@ -28,12 +28,16 @@ atf_test_case rootpool_001_pos cleanup rootpool_001_pos_head() { atf_set "descr" "rootpool's bootfs property must be equal to " - atf_set "require.config" is_zfs_root } rootpool_001_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + if ! is_zfsroot ; then + atf_skip "This test requires a ZFS root filesystem." + fi + + ksh93 $(atf_get_srcdir)/setup.ksh ksh93 $(atf_get_srcdir)/rootpool_001_pos.ksh || atf_fail "Testcase failed" } rootpool_001_pos_cleanup() @@ -48,13 +52,16 @@ atf_test_case rootpool_002_neg cleanup rootpool_002_neg_head() { atf_set "descr" "zpool/zfs destory should return error" - atf_set "require.config" is_zfs_root atf_set "require.progs" zfs zpool } rootpool_002_neg_body() { . $(atf_get_srcdir)/../../include/default.cfg + if ! is_zfsroot ; then + atf_skip "This test requires a ZFS root filesystem." + fi + ksh93 $(atf_get_srcdir)/rootpool_002_neg.ksh || atf_fail "Testcase failed" } rootpool_002_neg_cleanup() @@ -69,12 +76,15 @@ atf_test_case rootpool_007_neg cleanup rootpool_007_neg_head() { atf_set "descr" "the zfs rootfs's compression property can not set to gzip and gzip[1-9]" - atf_set "require.config" is_zfs_root atf_set "require.progs" zfs } rootpool_007_neg_body() { . $(atf_get_srcdir)/../../include/default.cfg + + if ! is_zfsroot ; then + atf_skip "This test requires a ZFS root filesystem." + fi ksh93 $(atf_get_srcdir)/rootpool_007_neg.ksh || atf_fail "Testcase failed" } From owner-svn-src-projects@freebsd.org Tue Feb 13 22:42:26 2018 Return-Path: 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 E3143F07A71 for ; Tue, 13 Feb 2018 22:42: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 95E8C76444; Tue, 13 Feb 2018 22:42: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 90E3B271C2; Tue, 13 Feb 2018 22:42: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 w1DMgPhI054301; Tue, 13 Feb 2018 22:42:25 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DMgPGC054300; Tue, 13 Feb 2018 22:42:25 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802132242.w1DMgPGC054300@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 22:42:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329248 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade X-SVN-Commit-Revision: 329248 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 22:42:26 -0000 Author: asomers Date: Tue Feb 13 22:42:25 2018 New Revision: 329248 URL: https://svnweb.freebsd.org/changeset/base/329248 Log: Skip zpool_upgrade_007_pos This test frequently panics. Skip it until the panic is fixed PR: 225877 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Tue Feb 13 22:40:33 2018 (r329247) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Tue Feb 13 22:42:25 2018 (r329248) @@ -195,7 +195,7 @@ zpool_upgrade_007_pos_head() { atf_set "descr" "Import pools of all versions - 'zfs upgrade' on each pools works" atf_set "require.progs" zpool - # This test can take quite a while, especially on debug bits. + # This test can take quite a while, especially on debug builds atf_set "timeout" 7200 } zpool_upgrade_007_pos_body() @@ -205,6 +205,7 @@ zpool_upgrade_007_pos_body() . $(atf_get_srcdir)/zpool_upgrade.cfg verify_disk_count "$DISKS" 2 + atf_skip "PR 225877 - panic: solaris assert: newds == os->os_dsl_dataset during" ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_007_pos.ksh || atf_fail "Testcase failed" } From owner-svn-src-projects@freebsd.org Wed Feb 14 17:59:05 2018 Return-Path: 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 53966F131F6 for ; Wed, 14 Feb 2018 17:59: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 08645851A5; Wed, 14 Feb 2018 17:59: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 0368E13203; Wed, 14 Feb 2018 17:59: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 w1EHx4rc030960; Wed, 14 Feb 2018 17:59:04 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1EHx44V030959; Wed, 14 Feb 2018 17:59:04 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802141759.w1EHx44V030959@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 14 Feb 2018 17:59:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329267 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zil X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil X-SVN-Commit-Revision: 329267 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Feb 2018 17:59:05 -0000 Author: asomers Date: Wed Feb 14 17:59:04 2018 New Revision: 329267 URL: https://svnweb.freebsd.org/changeset/base/329267 Log: Unskip zil_test:zil_001_pos Will skipped it in r277876 with the message "this test causes a panic on FreeBSD". I don't know what panic it caused, but it doesn't anymore. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh Wed Feb 14 17:51:51 2018 (r329266) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh Wed Feb 14 17:59:04 2018 (r329267) @@ -32,7 +32,6 @@ zil_001_pos_head() } zil_001_pos_body() { - atf_fail "This test causes a panic on FreeBSD" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/zil.kshlib . $(atf_get_srcdir)/zil.cfg From owner-svn-src-projects@freebsd.org Wed Feb 14 23:58:40 2018 Return-Path: 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 DC152F0824E for ; Wed, 14 Feb 2018 23:58:40 +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 8E04A746A9; Wed, 14 Feb 2018 23:58:40 +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 8911016D8A; Wed, 14 Feb 2018 23:58:40 +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 w1ENwevD012488; Wed, 14 Feb 2018 23:58:40 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1ENwe3F012487; Wed, 14 Feb 2018 23:58:40 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802142358.w1ENwe3F012487@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 14 Feb 2018 23:58:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329285 - 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: 329285 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Feb 2018 23:58:41 -0000 Author: asomers Date: Wed Feb 14 23:58:40 2018 New Revision: 329285 URL: https://svnweb.freebsd.org/changeset/base/329285 Log: Improve reliability of zfsd_replace_003_pos Sometimes the test would fail because the new devices appear so quickly that the zpool returns to health with no need to resilver. Force it to resilver by doing some I/O while the devices are gone. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh 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 Wed Feb 14 23:52:39 2018 (r329284) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh Wed Feb 14 23:58:40 2018 (r329285) @@ -107,6 +107,10 @@ for type in "raidz2" "mirror"; do log_fail "Pool $TESTPOOL not listed as DEGRADED" fi + # Do some I/O to ensure that the old vdevs will be out of date + log_must $DD if=/dev/random of=/$TESTPOOL/randfile bs=1m count=1 + log_must $SYNC + # Recreate the vdevs in the opposite order typeset MD0=`$MDCONFIG -a -t vnode -f ${FILE1}` [ $? -eq 0 ] || atf_fail "Failed to create md device" From owner-svn-src-projects@freebsd.org Thu Feb 15 00:01:20 2018 Return-Path: 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 112DAF084C8 for ; Thu, 15 Feb 2018 00:01: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 B5DCC7488B; Thu, 15 Feb 2018 00:01: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 B0D9116ED5; Thu, 15 Feb 2018 00:01: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 w1F01JES013576; Thu, 15 Feb 2018 00:01:19 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F01JCB013574; Thu, 15 Feb 2018 00:01:19 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150001.w1F01JCB013574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:01:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329286 - 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: 329286 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:01:20 -0000 Author: asomers Date: Thu Feb 15 00:01:19 2018 New Revision: 329286 URL: https://svnweb.freebsd.org/changeset/base/329286 Log: Fix snapshot_018_pos tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh Delete references to ".zfs/shares". It no longer exists. tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Clear the expected failure due to PR 225793 PR: 225793 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh Wed Feb 14 23:58:40 2018 (r329285) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh Thu Feb 15 00:01:19 2018 (r329286) @@ -77,7 +77,7 @@ function verify_dir # directory } typeset -a dirlist -dirlist=( "$TESTDIR/.zfs" "$TESTDIR/.zfs/snapshot" "$TESTDIR/.zfs/shares" ) +dirlist=( "$TESTDIR/.zfs" "$TESTDIR/.zfs/snapshot" ) ctldir=".zfs" for d in ${dirlist[@]}; do verify_dir $d 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 Wed Feb 14 23:58:40 2018 (r329285) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Thu Feb 15 00:01:19 2018 (r329286) @@ -521,7 +521,6 @@ 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 Thu Feb 15 00:09:35 2018 Return-Path: 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 7B11BF0909F for ; Thu, 15 Feb 2018 00:09:35 +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 30FF974EAE; Thu, 15 Feb 2018 00:09:35 +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 2B38C16F53; Thu, 15 Feb 2018 00:09:35 +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 w1F09Zdj017836; Thu, 15 Feb 2018 00:09:35 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F09Zgd017835; Thu, 15 Feb 2018 00:09:35 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150009.w1F09Zgd017835@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:09:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329287 - 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: 329287 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:09:35 -0000 Author: asomers Date: Thu Feb 15 00:09:34 2018 New Revision: 329287 URL: https://svnweb.freebsd.org/changeset/base/329287 Log: Fix mv_files_001_pos tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh You can't delete a mountpoint before unmounting the filesystem. 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 15 00:01:19 2018 (r329286) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh Thu Feb 15 00:09:34 2018 (r329287) @@ -34,8 +34,4 @@ [[ -f $TMPDIR/testbackgprocs.ksh ]] && \ log_must $RM -f $TMPDIR/testbackgprocs.ksh -if [[ -d $TESTDIR_TGT ]]; then - log_must $RM -rf $TESTDIR_TGT -fi - default_cleanup From owner-svn-src-projects@freebsd.org Thu Feb 15 00:11:43 2018 Return-Path: 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 A22B2F0938C for ; Thu, 15 Feb 2018 00:11:43 +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 5478F751D1; Thu, 15 Feb 2018 00:11:43 +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 4F78D170AB; Thu, 15 Feb 2018 00:11:43 +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 w1F0BhcS019470; Thu, 15 Feb 2018 00:11:43 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0BhRu019469; Thu, 15 Feb 2018 00:11:43 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150011.w1F0BhRu019469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:11:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329288 - projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test X-SVN-Commit-Revision: 329288 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:11:43 -0000 Author: asomers Date: Thu Feb 15 00:11:42 2018 New Revision: 329288 URL: https://svnweb.freebsd.org/changeset/base/329288 Log: Fix utils_test_007_pos The test fails due to an fstyp(8) usage difference between Illumos and FreeBSD. Fix the usage. PR: 200823 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh Thu Feb 15 00:09:34 2018 (r329287) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh Thu Feb 15 00:11:42 2018 (r329288) @@ -74,8 +74,8 @@ populate_dir $TESTDIR/$TESTFILE $NUM_FILES $WRITE_COUN log_must $ZFS unmount $TESTDIR -log_must $FSTYP $DISK -detected_filesystem=$( $FSTYP $DISK ) +log_must $FSTYP -u $DISK +detected_filesystem=$( $FSTYP -u $DISK ) if [ "$detected_filesystem" != "zfs" ]; then log_fail "fstyp(8) detected $detected_filesystem instead of zfs" fi From owner-svn-src-projects@freebsd.org Thu Feb 15 00:13:52 2018 Return-Path: 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 441BAF09620 for ; Thu, 15 Feb 2018 00:13:52 +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 E9EDA75415; Thu, 15 Feb 2018 00:13:51 +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 E49F3170E6; Thu, 15 Feb 2018 00:13:51 +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 w1F0Dpk1022551; Thu, 15 Feb 2018 00:13:51 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0DfUf022446; Thu, 15 Feb 2018 00:13:41 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150013.w1F0DfUf022446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:13:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329289 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: acl/cifs acl/nontrivial acl/trivial atime bootfs cache cachefile clean_mirror cli_root/zdb cli_root/zfs cli_root/zfs_clone 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 cache cachefile clean_mirror cli_root/zdb cli_root/zfs cli_root/zfs_clone cli_root/zfs_copies cli_root/... X-SVN-Commit-Revision: 329289 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:13:52 -0000 Author: asomers Date: Thu Feb 15 00:13:41 2018 New Revision: 329289 URL: https://svnweb.freebsd.org/changeset/base/329289 Log: Skip most ZFS tests when unprivileged tests/sys/cddl/zfs/tests/.../Makefile Add TEST_METADATA+=required_user="root" to almost all tests Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -12,5 +12,6 @@ ${PACKAGE}FILES+= cifs_attr_002_pos.ksh ${PACKAGE}FILES+= cifs_attr_003_pos.ksh ATF_TESTS_KSH93+= cifs_test +TEST_METADATA+= required_user="root" .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -34,5 +34,6 @@ ${PACKAGE}FILES+= zfs_acl_tar_001_pos.ksh ${PACKAGE}FILES+= zfs_acl_tar_002_pos.ksh ATF_TESTS_KSH93+= nontrivial_test +TEST_METADATA+= required_user="root" .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -27,5 +27,6 @@ ${PACKAGE}FILES+= zfs_acl_tar_001_pos.ksh ${PACKAGE}FILES+= zfs_acl_tar_002_neg.ksh ATF_TESTS_KSH93+= trivial_test +TEST_METADATA+= required_user="root" .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -14,5 +14,6 @@ ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= setup.ksh ATF_TESTS_KSH93+= atime_test +TEST_METADATA+= required_user="root" .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -18,5 +18,6 @@ ${PACKAGE}FILES+= bootfs_008_neg.ksh ${PACKAGE}FILES+= bootfs_009_neg.ksh ATF_TESTS_KSH93+= bootfs_test +TEST_METADATA+= required_user="root" .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cache FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= cache_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cache_005_neg.ksh ${PACKAGE}FILES+= cache.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cachefile FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= cachefile_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cachefile_002_pos.ksh ${PACKAGE}FILES+= cachefile_003_pos.ksh 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 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= clean_mirror_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= clean_mirror_001_pos.ksh ${PACKAGE}FILES+= clean_mirror_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zdb FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zdb_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zdb_001_neg.ksh ${PACKAGE}FILES+= zdb.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_malformed.cfg ${PACKAGE}FILES+= zfs_001_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_clone_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_clone_005_pos.ksh ${PACKAGE}FILES+= zfs_clone_008_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_copies_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_copies.cfg ${PACKAGE}FILES+= zfs_copies_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_create_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= properties.kshlib ${PACKAGE}FILES+= zfs_create_011_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_destroy_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_destroy_001_pos.ksh ${PACKAGE}FILES+= zfs_destroy.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -8,6 +8,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_diff_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_get_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_get_002_pos.ksh ${PACKAGE}FILES+= zfs_get_007_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_inherit_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zfs_inherit_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_mount_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_mount_004_pos.ksh ${PACKAGE}FILES+= zfs_mount_008_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_promote_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zfs_promote_006_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_property_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_set_property_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_receive_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_receive_004_neg.ksh ${PACKAGE}FILES+= zfs_receive_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_rename_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_rename_002_pos.ksh ${PACKAGE}FILES+= zfs_rename_006_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_reservation_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_reservation.cfg ${PACKAGE}FILES+= zfs_reservation_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_rollback_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_rollback_003_neg.ksh ${PACKAGE}FILES+= zfs_rollback_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_send_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_set_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_set_common.kshlib ${PACKAGE}FILES+= onoffs_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_share_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_share_003_pos.ksh ${PACKAGE}FILES+= zfs_share_006_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_snapshot_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zfs_snapshot_005_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_unmount_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_unmount_003_pos.ksh ${PACKAGE}FILES+= zfs_unmount_all_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_unshare_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_unshare_003_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_upgrade_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_upgrade.cfg ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_001_neg.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_add_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_attach_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zpool_attach_001_neg.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/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_clear_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_clear_003_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_create_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_create_003_pos.ksh ${PACKAGE}FILES+= zpool_create_020_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_destroy_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_detach_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_detach.cfg ${PACKAGE}FILES+= zpool_detach_001_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_expand_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_expand_003_neg.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_export_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_export.cfg ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_get_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zpool_get_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_history_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_import_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_import_006_pos.ksh ${PACKAGE}FILES+= zpool_import_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_offline_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_offline_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_online_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_online.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_remove_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_remove_001_neg.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_replace_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_replace_001_neg.ksh ${PACKAGE}FILES+= zpool_replace_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_scrub_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_scrub_001_neg.ksh ${PACKAGE}FILES+= zpool_scrub_004_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_set_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_set_002_neg.ksh ${PACKAGE}FILES+= zpool_set_003_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_status_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zpool_status.cfg ${PACKAGE}FILES+= zpool_status_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_upgrade_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zpool_upgrade_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zfs_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_list_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= zfs_list_006_pos.ksh ${PACKAGE}FILES+= zfs_list_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/compression FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= compression_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= compress_004_pos.ksh ${PACKAGE}FILES+= compress_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -14,5 +14,6 @@ ${PACKAGE}FILES+= ctime.cfg PROG= ctime_001_pos MAN= ATF_TESTS_KSH93= ctime_test +TEST_METADATA+= required_user="root" .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_allow_test ATF_TESTS_KSH93+= zfs_unallow_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/devices FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= devices_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= devices_common.kshlib ${PACKAGE}FILES+= devices_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= exec_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= exec_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/grow_pool FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= grow_pool_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= grow_pool_001_pos.ksh ${PACKAGE}FILES+= grow_pool.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/grow_replicas FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= grow_replicas_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/history/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= history_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= history_005_neg.ksh ${PACKAGE}FILES+= history_004_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/hotplug FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= hotplug_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= hotplug.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/hotspare FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= hotspare_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= hotspare_create_001_neg.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/inheritance FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= inheritance_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= config015.cfg ${PACKAGE}FILES+= config012.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/interop FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= interop_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= interop_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/inuse FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= inuse_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= inuse.cfg ${PACKAGE}FILES+= inuse_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/iscsi FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= iscsi_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= iscsi_004_pos.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/large_files FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= large_files_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/largest_pool FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= largest_pool_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= largest_pool.cfg ${PACKAGE}FILES+= largest_pool_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/link_count/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= link_count_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= link_count_001.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mdb FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mdb_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= mdb.cfg ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/migration/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= migration_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= migration_011_pos.ksh ${PACKAGE}FILES+= migration_008_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mmap_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= mmap.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mount/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mount_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= vars.cfg ${PACKAGE}FILES+= mounttest.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mv_files FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mv_files_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= mv_files_common.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/nestedfs FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= nestedfs_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= nestedfs.cfg ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/no_space FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= no_space_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= enospc.cfg ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/online_offlin FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= online_offline_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= online_offline_001_pos.ksh ${PACKAGE}FILES+= online_offline.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/pool_names FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= pool_names_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= pool_names_002_neg.ksh ${PACKAGE}FILES+= pool_names.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/poolversion FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= poolversion_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= poolversion_002_pos.ksh ${PACKAGE}FILES+= poolversion_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/privilege FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= privilege_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= privilege_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/quota FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= quota_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= quota_003_pos.ksh ${PACKAGE}FILES+= quota_006_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/redundancy FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= redundancy_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= redundancy.cfg ${PACKAGE}FILES+= redundancy_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/refquota FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= refquota_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= refquota_001_pos.ksh ${PACKAGE}FILES+= refquota_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/refreserv FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= refreserv_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= refreserv_004_pos.ksh ${PACKAGE}FILES+= refreserv_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/remote/cross_ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= cross_endian_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cross_endian.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/remote/reboot FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rebooting_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= rebooting.cfg ${PACKAGE}FILES+= r_setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/remote/sharin FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= sharing_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= r_setup.ksh ${PACKAGE}FILES+= r_cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/rename_dirs FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rename_dirs_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= rename_dirs_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/replacement FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= replacement_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= replacement_002_pos.ksh ${PACKAGE}FILES+= replacement_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests/reservation FILESDIR= ${TESTSDIR} ATF_TESTS_KSH93+= reservation_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= reservation.cfg ${PACKAGE}FILES+= reservation_007_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests/rootpool FILESDIR= ${TESTSDIR} ATF_TESTS_KSH93+= rootpool_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= rootpool_007_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/rsend FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rsend_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= rsend_003_pos.ksh ${PACKAGE}FILES+= rsend_007_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/scrub_mirror FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= scrub_mirror_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= scrub_mirror_004_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/slog FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= slog_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= slog_012_neg.ksh ${PACKAGE}FILES+= slog_013_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/snapshot FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= snapshot_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= rollback_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/snapused FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= snapused_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= snapused_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/sparse FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= sparse_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= sparse_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= threadsappend_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= threadsappend_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/truncate FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= truncate_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= truncate_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= txg_integrity_test +TEST_METADATA+= required_user="root" ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= txg_integrity_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile Thu Feb 15 00:11:42 2018 (r329288) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile Thu Feb 15 00:13:41 2018 (r329289) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/userquota FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= userquota_test *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Thu Feb 15 00:18:29 2018 Return-Path: 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 956A4F09B00 for ; Thu, 15 Feb 2018 00:18:29 +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 435887579A; Thu, 15 Feb 2018 00:18:29 +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 39C49170EF; Thu, 15 Feb 2018 00:18:29 +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 w1F0ITsd022890; Thu, 15 Feb 2018 00:18:29 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0IS1o022888; Thu, 15 Feb 2018 00:18:28 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150018.w1F0IS1o022888@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:18:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329290 - in projects/zfsd/head: etc/mtree tests/sys/cddl/zfs/tests tests/sys/cddl/zfs/tests/remote 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/remote X-SVN-Commit-Revision: 329290 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:18:29 -0000 Author: asomers Date: Thu Feb 15 00:18:28 2018 New Revision: 329290 URL: https://svnweb.freebsd.org/changeset/base/329290 Log: Delete the ZFS "remote" tests. These tests all rely on a specifically configured remote system. As such, they're unlikely to ever be sufficiently well automated to be included in FreeBSD's builtin test suite. Plus, some of them are really tests for NFS, not ZFS. And some test cross-endian import support, which can be done more simply with canned disk images. Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/ 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 15 00:13:41 2018 (r329289) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 15 00:18:28 2018 (r329290) @@ -619,14 +619,6 @@ .. refreserv .. - remote - cross_endian - .. - rebooting - .. - sharing - .. - .. rename_dirs .. replacement Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 15 00:13:41 2018 (r329289) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 15 00:18:28 2018 (r329290) @@ -50,8 +50,6 @@ TESTS_SUBDIRS+= quota TESTS_SUBDIRS+= redundancy TESTS_SUBDIRS+= refquota TESTS_SUBDIRS+= refreserv -# Not yet ported to FreeBSD -# TESTS_SUBDIRS+= remote # Broken on every OS # TESTS_SUBDIRS+= rename_dirs TESTS_SUBDIRS+= replacement From owner-svn-src-projects@freebsd.org Thu Feb 15 00:20:12 2018 Return-Path: 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 D18A9F09C80 for ; Thu, 15 Feb 2018 00:20: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 833217591E; Thu, 15 Feb 2018 00:20: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 79F54170F3; Thu, 15 Feb 2018 00:20: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 w1F0KCXb023021; Thu, 15 Feb 2018 00:20:12 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0KCkA023019; Thu, 15 Feb 2018 00:20:12 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150020.w1F0KCkA023019@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:20:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329291 - in projects/zfsd/head: etc/mtree tests/sys/cddl/zfs/tests tests/sys/cddl/zfs/tests/mdb 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/mdb X-SVN-Commit-Revision: 329291 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:20:13 -0000 Author: asomers Date: Thu Feb 15 00:20:12 2018 New Revision: 329291 URL: https://svnweb.freebsd.org/changeset/base/329291 Log: Delete the ZFS mdb tests. mdb will never be ported to FreeBSD. Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/ 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 15 00:18:28 2018 (r329290) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 15 00:20:12 2018 (r329291) @@ -131,8 +131,6 @@ .. llquantize .. - mdb - .. mib .. misc Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 15 00:18:28 2018 (r329290) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 15 00:20:12 2018 (r329291) @@ -35,7 +35,6 @@ TESTS_SUBDIRS+= large_files # link_count is not yet ported to FreeBSD. I'm not sure what its purpose is. # The assertion message contradicts with the log_fail message. # TESTS_SUBDIRS+= link_count -TESTS_SUBDIRS+= mdb TESTS_SUBDIRS+= migration TESTS_SUBDIRS+= mmap TESTS_SUBDIRS+= mount From owner-svn-src-projects@freebsd.org Thu Feb 15 00:21:54 2018 Return-Path: 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 E7DA2F09F99 for ; Thu, 15 Feb 2018 00:21: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 997F275B78; Thu, 15 Feb 2018 00:21: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 9457217246; Thu, 15 Feb 2018 00:21: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 w1F0LrSH024588; Thu, 15 Feb 2018 00:21:53 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0LrhU024586; Thu, 15 Feb 2018 00:21:53 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150021.w1F0LrhU024586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:21:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329292 - in projects/zfsd/head: etc/mtree tests/sys/cddl/zfs/tests tests/sys/cddl/zfs/tests/privilege 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/privilege X-SVN-Commit-Revision: 329292 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:21:54 -0000 Author: asomers Date: Thu Feb 15 00:21:53 2018 New Revision: 329292 URL: https://svnweb.freebsd.org/changeset/base/329292 Log: Delete the ZFS privilege tests They're really more of a test for Solaris RBAC than for ZFS. FreeBSD doesn't have Solaris's RBAC model. If it ever grows one, it will likely have differences necessitating that the tests be rewritten anyway. Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/ 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 15 00:20:12 2018 (r329291) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 15 00:21:53 2018 (r329292) @@ -607,8 +607,6 @@ .. poolversion .. - privilege - .. quota .. redundancy Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 15 00:20:12 2018 (r329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Thu Feb 15 00:21:53 2018 (r329292) @@ -44,7 +44,6 @@ TESTS_SUBDIRS+= no_space TESTS_SUBDIRS+= online_offline TESTS_SUBDIRS+= pool_names TESTS_SUBDIRS+= poolversion -TESTS_SUBDIRS+= privilege TESTS_SUBDIRS+= quota TESTS_SUBDIRS+= redundancy TESTS_SUBDIRS+= refquota From owner-svn-src-projects@freebsd.org Thu Feb 15 00:23:14 2018 Return-Path: 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 483EBF0A132 for ; Thu, 15 Feb 2018 00:23:14 +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 ECF6F75E76; Thu, 15 Feb 2018 00:23:13 +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 E7E0517282; Thu, 15 Feb 2018 00:23:13 +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 w1F0NDbh027782; Thu, 15 Feb 2018 00:23:13 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0NDAs027780; Thu, 15 Feb 2018 00:23:13 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150023.w1F0NDAs027780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:23:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329293 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC X-SVN-Commit-Revision: 329293 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:23:14 -0000 Author: asomers Date: Thu Feb 15 00:23:13 2018 New Revision: 329293 URL: https://svnweb.freebsd.org/changeset/base/329293 Log: Fix a cleanup timeout in zvol_ENOSPC_001_pos Kyua has a hardcoded 60s timeout in the cleanup phase, and unmounting a full UFS filesystem is apparently a slow prospect. Move the unmount into the test's body. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh Thu Feb 15 00:21:53 2018 (r329292) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh Thu Feb 15 00:23:13 2018 (r329293) @@ -32,11 +32,6 @@ verify_runnable "global" -ismounted $TESTDIR ufs -(( $? == 0 )) && log_must $UMOUNT -f $TESTDIR - -[[ -e $TESTDIR ]] && $RM -rf $TESTDIR - default_zvol_cleanup log_pass Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh Thu Feb 15 00:21:53 2018 (r329292) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh Thu Feb 15 00:23:13 2018 (r329293) @@ -60,7 +60,11 @@ verify_runnable "global" function cleanup { - $RM -rf $TESTDIR/* + # unmounting the UFS filesystem can take more than 60s, and Kyua has a + # hardcoded 60s limit for the cleanup phase. So we must unmount the + # filesystem here rather than cleanup.ksh. + ismounted $TESTDIR ufs && log_must $UMOUNT -f $TESTDIR + $RMDIR $TESTDIR } log_assert "A zvol volume will return ENOSPC when the underlying pool " \ From owner-svn-src-projects@freebsd.org Thu Feb 15 00:27:41 2018 Return-Path: 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 098BBF0A5D7 for ; Thu, 15 Feb 2018 00:27: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 B1E1B762AF; Thu, 15 Feb 2018 00:27:40 +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 924B91728E; Thu, 15 Feb 2018 00:27:40 +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 w1F0ReaG028074; Thu, 15 Feb 2018 00:27:40 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0RUHD027969; Thu, 15 Feb 2018 00:27:30 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150027.w1F0RUHD027969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:27:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329294 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: acl/cifs acl/nontrivial acl/trivial atime bootfs cache cachefile clean_mirror cli_root/zdb cli_root/zfs cli_root/zfs_clone 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 cache cachefile clean_mirror cli_root/zdb cli_root/zfs cli_root/zfs_clone cli_root/zfs_copies cli_root/... X-SVN-Commit-Revision: 329294 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 00:27:41 -0000 Author: asomers Date: Thu Feb 15 00:27:30 2018 New Revision: 329294 URL: https://svnweb.freebsd.org/changeset/base/329294 Log: Set is_exclusive for all ZFS test programs Most ZFS tests create one or more pools using the same set of disks, so they must have exclusive access to those disks. Tests that only use file-backed vdevs and use no other global resources could in theory run in parallel. Also, a few negative tests like zdb_001_neg could theoretically run in parallel. But there's no way to set is_exclusive on a single test case; it can only be set for an entire test program. So set it everywhere. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -13,5 +13,6 @@ ${PACKAGE}FILES+= cifs_attr_003_pos.ksh ATF_TESTS_KSH93+= cifs_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -35,5 +35,6 @@ ${PACKAGE}FILES+= zfs_acl_tar_002_pos.ksh ATF_TESTS_KSH93+= nontrivial_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -28,5 +28,6 @@ ${PACKAGE}FILES+= zfs_acl_tar_002_neg.ksh ATF_TESTS_KSH93+= trivial_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -15,5 +15,6 @@ ${PACKAGE}FILES+= setup.ksh ATF_TESTS_KSH93+= atime_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -19,5 +19,6 @@ ${PACKAGE}FILES+= bootfs_009_neg.ksh ATF_TESTS_KSH93+= bootfs_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= cache_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cache_005_neg.ksh ${PACKAGE}FILES+= cache.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= cachefile_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cachefile_002_pos.ksh ${PACKAGE}FILES+= cachefile_003_pos.ksh 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 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= clean_mirror_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= clean_mirror_001_pos.ksh ${PACKAGE}FILES+= clean_mirror_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zdb_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zdb_001_neg.ksh ${PACKAGE}FILES+= zdb.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_malformed.cfg ${PACKAGE}FILES+= zfs_001_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_clone_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_clone_005_pos.ksh ${PACKAGE}FILES+= zfs_clone_008_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_copies_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_copies.cfg ${PACKAGE}FILES+= zfs_copies_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_create_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= properties.kshlib ${PACKAGE}FILES+= zfs_create_011_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_destroy_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_destroy_001_pos.ksh ${PACKAGE}FILES+= zfs_destroy.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -9,6 +9,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_diff_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_get_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_get_002_pos.ksh ${PACKAGE}FILES+= zfs_get_007_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_inherit_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zfs_inherit_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_mount_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_mount_004_pos.ksh ${PACKAGE}FILES+= zfs_mount_008_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_promote_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zfs_promote_006_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_property_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_set_property_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_receive_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_receive_004_neg.ksh ${PACKAGE}FILES+= zfs_receive_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_rename_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_rename_002_pos.ksh ${PACKAGE}FILES+= zfs_rename_006_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_reservation_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_reservation.cfg ${PACKAGE}FILES+= zfs_reservation_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_rollback_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_rollback_003_neg.ksh ${PACKAGE}FILES+= zfs_rollback_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_send_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_set_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_set_common.kshlib ${PACKAGE}FILES+= onoffs_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_share_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_share_003_pos.ksh ${PACKAGE}FILES+= zfs_share_006_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_snapshot_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zfs_snapshot_005_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_unmount_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_unmount_003_pos.ksh ${PACKAGE}FILES+= zfs_unmount_all_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_unshare_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_unshare_003_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_upgrade_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_upgrade.cfg ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_001_neg.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_add_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_attach_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zpool_attach_001_neg.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/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_clear_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_clear_003_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_create_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_create_003_pos.ksh ${PACKAGE}FILES+= zpool_create_020_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_destroy_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_detach_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_detach.cfg ${PACKAGE}FILES+= zpool_detach_001_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_expand_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_expand_003_neg.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_export_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_export.cfg ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_get_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zpool_get_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_history_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_import_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_import_006_pos.ksh ${PACKAGE}FILES+= zpool_import_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_offline_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_offline_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_online_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_online.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_remove_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_remove_001_neg.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_replace_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_replace_001_neg.ksh ${PACKAGE}FILES+= zpool_replace_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_scrub_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_scrub_001_neg.ksh ${PACKAGE}FILES+= zpool_scrub_004_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_set_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_set_002_neg.ksh ${PACKAGE}FILES+= zpool_set_003_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_status_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_status.cfg ${PACKAGE}FILES+= zpool_status_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_upgrade_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zpool_upgrade_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/misc FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= misc_test +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_rename_001_neg.ksh ${PACKAGE}FILES+= zpool_remove_001_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_list_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zfs_list_006_pos.ksh ${PACKAGE}FILES+= zfs_list_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_iostat_test +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_iostat.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -7,6 +7,7 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zpoo FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_list_test +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= zpool_list_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= compression_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= compress_004_pos.ksh ${PACKAGE}FILES+= compress_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -15,5 +15,6 @@ PROG= ctime_001_pos MAN= ATF_TESTS_KSH93= ctime_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -9,6 +9,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_allow_test ATF_TESTS_KSH93+= zfs_unallow_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= devices_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= devices_common.kshlib ${PACKAGE}FILES+= devices_002_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -9,6 +9,7 @@ BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= exec_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= exec_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= grow_pool_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= grow_pool_001_pos.ksh ${PACKAGE}FILES+= grow_pool.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= grow_replicas_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= history_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= history_005_neg.ksh ${PACKAGE}FILES+= history_004_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= hotplug_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= hotplug.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= hotspare_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= hotspare_create_001_neg.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= inheritance_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= config015.cfg ${PACKAGE}FILES+= config012.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= interop_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= interop_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= inuse_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= inuse.cfg ${PACKAGE}FILES+= inuse_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= iscsi_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= iscsi_004_pos.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= large_files_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= largest_pool_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= largest_pool.cfg ${PACKAGE}FILES+= largest_pool_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= link_count_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= link_count_001.ksh ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= migration_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= migration_011_pos.ksh ${PACKAGE}FILES+= migration_008_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mmap_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= mmap.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mount_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= vars.cfg ${PACKAGE}FILES+= mounttest.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mv_files_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= mv_files_common.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= nestedfs_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= nestedfs.cfg ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= no_space_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= enospc.cfg ${PACKAGE}FILES+= cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= online_offline_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= online_offline_001_pos.ksh ${PACKAGE}FILES+= online_offline.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= pool_names_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= pool_names_002_neg.ksh ${PACKAGE}FILES+= pool_names.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= poolversion_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= poolversion_002_pos.ksh ${PACKAGE}FILES+= poolversion_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= quota_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= quota_003_pos.ksh ${PACKAGE}FILES+= quota_006_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= redundancy_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= redundancy.cfg ${PACKAGE}FILES+= redundancy_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= refquota_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= refquota_001_pos.ksh ${PACKAGE}FILES+= refquota_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= refreserv_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= refreserv_004_pos.ksh ${PACKAGE}FILES+= refreserv_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rename_dirs_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= rename_dirs_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= replacement_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= replacement_002_pos.ksh ${PACKAGE}FILES+= replacement_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR= ${TESTSDIR} ATF_TESTS_KSH93+= reservation_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= reservation.cfg ${PACKAGE}FILES+= reservation_007_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR= ${TESTSDIR} ATF_TESTS_KSH93+= rootpool_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= rootpool_007_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rsend_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= rsend_003_pos.ksh ${PACKAGE}FILES+= rsend_007_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= scrub_mirror_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= scrub_mirror_004_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= slog_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= slog_012_neg.ksh ${PACKAGE}FILES+= slog_013_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= snapshot_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= rollback_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= snapused_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= snapused_005_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= sparse_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= sparse_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -9,6 +9,7 @@ BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= threadsappend_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= threadsappend_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= truncate_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= truncate_001_pos.ksh ${PACKAGE}FILES+= setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -9,6 +9,7 @@ BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= txg_integrity_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= txg_integrity_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= userquota_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= groupspace_001_pos.ksh ${PACKAGE}FILES+= userquota_common.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= utils_test_test TEST_METADATA+= required_user="root" +TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= utils_test_007_pos.ksh ${PACKAGE}FILES+= utils_test_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile Thu Feb 15 00:23:13 2018 (r329293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile Thu Feb 15 00:27:30 2018 (r329294) @@ -8,6 +8,7 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= write_dirs_test TEST_METADATA+= required_user="root" *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Thu Feb 15 16:29:36 2018 Return-Path: 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 32508F05839 for ; Thu, 15 Feb 2018 16:29: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 D991A809AE; Thu, 15 Feb 2018 16:29:35 +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 D47B5211D9; Thu, 15 Feb 2018 16:29:35 +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 w1FGTZD8020295; Thu, 15 Feb 2018 16:29:35 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1FGTZU3020294; Thu, 15 Feb 2018 16:29:35 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802151629.w1FGTZU3020294@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 16:29:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329318 - in projects/zfsd/head/tests/sys/geom/class: . part X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/geom/class: . part X-SVN-Commit-Revision: 329318 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 16:29:36 -0000 Author: asomers Date: Thu Feb 15 16:29:35 2018 New Revision: 329318 URL: https://svnweb.freebsd.org/changeset/base/329318 Log: Delete the geom_part tests in the zfsd branch They weren't very good, and they conflict with head Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/geom/class/part/ Modified: projects/zfsd/head/tests/sys/geom/class/Makefile Modified: projects/zfsd/head/tests/sys/geom/class/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/geom/class/Makefile Thu Feb 15 15:46:14 2018 (r329317) +++ projects/zfsd/head/tests/sys/geom/class/Makefile Thu Feb 15 16:29:35 2018 (r329318) @@ -11,7 +11,6 @@ TESTS_SUBDIRS+= gate #TESTS_SUBDIRS+= gpt TESTS_SUBDIRS+= mirror TESTS_SUBDIRS+= nop -TESTS_SUBDIRS+= part TESTS_SUBDIRS+= raid3 TESTS_SUBDIRS+= shsec TESTS_SUBDIRS+= stripe From owner-svn-src-projects@freebsd.org Thu Feb 15 17:27:39 2018 Return-Path: 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 300BCF0A4DF for ; Thu, 15 Feb 2018 17:27:39 +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 CB171842A5; Thu, 15 Feb 2018 17:27: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 C59A121B9A; Thu, 15 Feb 2018 17:27: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 w1FHRcO9059985; Thu, 15 Feb 2018 17:27:38 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1FHRaYs059957; Thu, 15 Feb 2018 17:27:36 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802151727.w1FHRaYs059957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 17:27:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329324 - in projects/zfsd/head: . bin/df bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/lib/libdtrace cddl/usr.sbin/zfsd contrib/blacklist/libexec contrib/compiler-rt/lib/tsan/rtl cont... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head: . bin/df bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/lib/libdtrace cddl/usr.sbin/zfsd contrib/blacklist/libexec contrib/compiler-rt/lib/tsan/rtl contrib/gcc/config/mips contr... X-SVN-Commit-Revision: 329324 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 17:27:40 -0000 Author: asomers Date: Thu Feb 15 17:27:34 2018 New Revision: 329324 URL: https://svnweb.freebsd.org/changeset/base/329324 Log: MF head @329321 Sponsored by: Spectra Logic Corp Added: projects/zfsd/head/contrib/llvm/lib/CodeGen/IndirectBrExpandPass.cpp - copied unchanged from r329321, head/contrib/llvm/lib/CodeGen/IndirectBrExpandPass.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86RetpolineThunks.cpp - copied unchanged from r329321, head/contrib/llvm/lib/Target/X86/X86RetpolineThunks.cpp projects/zfsd/head/etc/devd/devmatch.conf - copied unchanged from r329321, head/etc/devd/devmatch.conf projects/zfsd/head/etc/rc.d/devmatch - copied unchanged from r329321, head/etc/rc.d/devmatch projects/zfsd/head/lib/libc/stdlib/strtold.c - copied unchanged from r329321, head/lib/libc/stdlib/strtold.c projects/zfsd/head/lib/libc/tests/gen/makecontext_test.c - copied unchanged from r329321, head/lib/libc/tests/gen/makecontext_test.c projects/zfsd/head/sbin/devmatch/ - copied from r329321, head/sbin/devmatch/ projects/zfsd/head/share/man/man9/MODULE_PNP_INFO.9 - copied unchanged from r329321, head/share/man/man9/MODULE_PNP_INFO.9 projects/zfsd/head/share/man/man9/syscall_helper_register.9 - copied unchanged from r329321, head/share/man/man9/syscall_helper_register.9 projects/zfsd/head/stand/common/interp_lua.c - copied unchanged from r329321, head/stand/common/interp_lua.c projects/zfsd/head/stand/common/interp_simple.c - copied unchanged from r329321, head/stand/common/interp_simple.c projects/zfsd/head/stand/common/metadata.c - copied unchanged from r329321, head/stand/common/metadata.c projects/zfsd/head/stand/liblua/ - copied from r329321, head/stand/liblua/ projects/zfsd/head/stand/liblua32/ - copied from r329321, head/stand/liblua32/ projects/zfsd/head/stand/libsa/libsa.3 - copied unchanged from r329321, head/stand/libsa/libsa.3 projects/zfsd/head/stand/libsa/xlocale_private.h - copied unchanged from r329321, head/stand/libsa/xlocale_private.h projects/zfsd/head/stand/lua/ - copied from r329321, head/stand/lua/ projects/zfsd/head/stand/lua.mk - copied unchanged from r329321, head/stand/lua.mk projects/zfsd/head/stand/usb/test/ - copied from r329321, head/stand/usb/test/ projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbdump1.c - copied unchanged from r329321, head/sys/contrib/dev/acpica/common/dmtbdump1.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbdump2.c - copied unchanged from r329321, head/sys/contrib/dev/acpica/common/dmtbdump2.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbdump3.c - copied unchanged from r329321, head/sys/contrib/dev/acpica/common/dmtbdump3.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbinfo1.c - copied unchanged from r329321, head/sys/contrib/dev/acpica/common/dmtbinfo1.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbinfo2.c - copied unchanged from r329321, head/sys/contrib/dev/acpica/common/dmtbinfo2.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbinfo3.c - copied unchanged from r329321, head/sys/contrib/dev/acpica/common/dmtbinfo3.c projects/zfsd/head/sys/dev/bhnd/siba/siba_eromvar.h - copied unchanged from r329321, head/sys/dev/bhnd/siba/siba_eromvar.h projects/zfsd/head/sys/dev/mthca/ - copied from r329321, head/sys/dev/mthca/ projects/zfsd/head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.c - copied unchanged from r329321, head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.c projects/zfsd/head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.h - copied unchanged from r329321, head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.h projects/zfsd/head/sys/gnu/dts/arm/axp81x.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/axp81x.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm-hr2.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/bcm-hr2.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm47094-luxul-abr-4500.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/bcm47094-luxul-abr-4500.dts projects/zfsd/head/sys/gnu/dts/arm/bcm47094-luxul-xbr-4500.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/bcm47094-luxul-xbr-4500.dts projects/zfsd/head/sys/gnu/dts/arm/bcm47189-luxul-xap-1440.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/bcm47189-luxul-xap-1440.dts projects/zfsd/head/sys/gnu/dts/arm/bcm47189-luxul-xap-810.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/bcm47189-luxul-xap-810.dts projects/zfsd/head/sys/gnu/dts/arm/bcm53340-ubnt-unifi-switch8.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/bcm53340-ubnt-unifi-switch8.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5422-odroid-core.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/exynos5422-odroid-core.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5422-odroidhc1.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/exynos5422-odroidhc1.dts projects/zfsd/head/sys/gnu/dts/arm/imx51-zii-rdu1.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx51-zii-rdu1.dts projects/zfsd/head/sys/gnu/dts/arm/imx53-ppd.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx53-ppd.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6s-8034-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6dl-tx6s-8034-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6s-8035-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6dl-tx6s-8035-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6u-8033-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6dl-tx6u-8033-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6u-80xx-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6dl-tx6u-80xx-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-wandboard-revd1.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6dl-wandboard-revd1.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-display5-tianma-tm070-1280x768.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6q-display5-tianma-tm070-1280x768.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-display5.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6q-display5.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6q-pistachio.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6q-pistachio.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-1036-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6q-tx6q-1036-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-10x0-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6q-tx6q-10x0-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-wandboard-revd1.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6q-wandboard-revd1.dts projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-tx6-lcd.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qdl-tx6-lcd.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-tx6-lvds.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qdl-tx6-lvds.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-tx6-mb7.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qdl-tx6-mb7.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-wandboard-revd1.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qdl-wandboard-revd1.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qp-tx6qp-8037-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qp-tx6qp-8037-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6qp-tx6qp-8037.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qp-tx6qp-8037.dts projects/zfsd/head/sys/gnu/dts/arm/imx6qp-tx6qp-8137-mb7.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qp-tx6qp-8137-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6qp-tx6qp-8137.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qp-tx6qp-8137.dts projects/zfsd/head/sys/gnu/dts/arm/imx6qp-wandboard-revd1.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6qp-wandboard-revd1.dts projects/zfsd/head/sys/gnu/dts/arm/imx6sx-softing-vining-2000.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/imx6sx-softing-vining-2000.dts projects/zfsd/head/sys/gnu/dts/arm/iwg20d-q7-common.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/iwg20d-q7-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/iwg20d-q7-dbcm-ca.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/iwg20d-q7-dbcm-ca.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-evm-processor-common.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/omap3-evm-processor-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/owl-s500-cubieboard6.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/owl-s500-cubieboard6.dts projects/zfsd/head/sys/gnu/dts/arm/qcom-msm8974-fairphone-fp2.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/qcom-msm8974-fairphone-fp2.dts projects/zfsd/head/sys/gnu/dts/arm/qcom-msm8974-sony-xperia-castor.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/qcom-msm8974-sony-xperia-castor.dts projects/zfsd/head/sys/gnu/dts/arm/qcom-msm8974pro.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/qcom-msm8974pro.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7743-iwg20d-q7-dbcm-ca.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/r8a7743-iwg20d-q7-dbcm-ca.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7745-iwg22d-sodimm.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/r8a7745-iwg22d-sodimm.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7745-iwg22m.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/r8a7745-iwg22m.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk3288-vyasa.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/rk3288-vyasa.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-olinuxino-micro-emmc.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/sun7i-a20-olinuxino-micro-emmc.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-a83t-tbs-a711.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/sun8i-a83t-tbs-a711.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-r40-bananapi-m2-ultra.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/sun8i-r40-bananapi-m2-ultra.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-r40.dtsi - copied unchanged from r329321, head/sys/gnu/dts/arm/sun8i-r40.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun8i-v40-bananapi-m2-berry.dts - copied unchanged from r329321, head/sys/gnu/dts/arm/sun8i-v40-bananapi-m2-berry.dts projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/mt2712-clk.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/clock/mt2712-clk.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/mt7622-clk.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/clock/mt7622-clk.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/r8a77970-cpg-mssr.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/clock/r8a77970-cpg-mssr.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/gpio/uniphier-gpio.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/gpio/uniphier-gpio.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/stm32-pinfunc.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/pinctrl/stm32-pinfunc.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/power/r8a77970-sysc.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/power/r8a77970-sysc.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/mt7622-reset.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/reset/mt7622-reset.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/thermal/tegra186-bpmp-thermal.h - copied unchanged from r329321, head/sys/gnu/dts/include/dt-bindings/thermal/tegra186-bpmp-thermal.h projects/zfsd/head/sys/i386/i386/sigtramp.s - copied unchanged from r329321, head/sys/i386/i386/sigtramp.s projects/zfsd/head/sys/mips/include/abi.h - copied unchanged from r329321, head/sys/mips/include/abi.h projects/zfsd/head/sys/modules/mthca/ - copied from r329321, head/sys/modules/mthca/ projects/zfsd/head/sys/ofed/include/uapi/rdma/mthca-abi.h - copied unchanged from r329321, head/sys/ofed/include/uapi/rdma/mthca-abi.h projects/zfsd/head/sys/powerpc/conf/GENERIC64-NODEBUG - copied unchanged from r329321, head/sys/powerpc/conf/GENERIC64-NODEBUG projects/zfsd/head/sys/vm/vm_pagequeue.h - copied unchanged from r329321, head/sys/vm/vm_pagequeue.h projects/zfsd/head/tests/sys/geom/class/eli/misc_test.sh - copied unchanged from r329321, head/tests/sys/geom/class/eli/misc_test.sh projects/zfsd/head/tests/sys/geom/class/part/ - copied from r329321, head/tests/sys/geom/class/part/ projects/zfsd/head/tools/boot/lua-img.sh - copied unchanged from r329321, head/tools/boot/lua-img.sh projects/zfsd/head/tools/boot/lua-test.sh - copied unchanged from r329321, head/tools/boot/lua-test.sh projects/zfsd/head/tools/build/options/WITHOUT_LLVM_COV - copied unchanged from r329321, head/tools/build/options/WITHOUT_LLVM_COV projects/zfsd/head/tools/build/options/WITH_LLVM_COV - copied unchanged from r329321, head/tools/build/options/WITH_LLVM_COV projects/zfsd/head/tools/build/options/WITH_LOADER_LUA - copied unchanged from r329321, head/tools/build/options/WITH_LOADER_LUA projects/zfsd/head/tools/diag/prtblknos/ - copied from r329321, head/tools/diag/prtblknos/ Deleted: projects/zfsd/head/contrib/libreadline/ projects/zfsd/head/crypto/openssl/doc/man3/ projects/zfsd/head/etc/devd/usb.conf projects/zfsd/head/gnu/lib/libreadline/ projects/zfsd/head/gnu/usr.bin/gdb/gdbtui/ projects/zfsd/head/secure/usr.bin/openssl/man/c_rehash.1 projects/zfsd/head/stand/forth/pcibios.4th projects/zfsd/head/stand/forth/pnp.4th projects/zfsd/head/stand/libsa/libstand.3 projects/zfsd/head/stand/libsa/strtol.c projects/zfsd/head/stand/libsa/strtoul.c projects/zfsd/head/stand/mips/beri/loader/metadata.c projects/zfsd/head/stand/powerpc/kboot/metadata.c projects/zfsd/head/stand/powerpc/ofw/metadata.c projects/zfsd/head/stand/sparc64/loader/metadata.c projects/zfsd/head/stand/uboot/common/metadata.c projects/zfsd/head/stand/usb/Makefile.test projects/zfsd/head/stand/usb/bsd_usbloader_test.c projects/zfsd/head/sys/amd64/include/varargs.h projects/zfsd/head/sys/arm/conf/BWCT projects/zfsd/head/sys/arm/conf/BWCT.hints projects/zfsd/head/sys/arm/conf/EB9200 projects/zfsd/head/sys/arm/conf/EB9200.hints projects/zfsd/head/sys/arm/conf/ETHERNUT5 projects/zfsd/head/sys/arm/conf/ETHERNUT5.hints projects/zfsd/head/sys/arm/conf/HL200 projects/zfsd/head/sys/arm/conf/HL201 projects/zfsd/head/sys/arm/conf/HL201.hints projects/zfsd/head/sys/arm/conf/KB920X projects/zfsd/head/sys/arm/conf/KB920X.hints projects/zfsd/head/sys/arm/conf/QILA9G20 projects/zfsd/head/sys/arm/conf/QILA9G20.hints projects/zfsd/head/sys/arm/conf/SAM9260EK projects/zfsd/head/sys/arm/conf/SAM9260EK.hints projects/zfsd/head/sys/arm/conf/SAM9X25EK projects/zfsd/head/sys/arm/conf/SAM9X25EK.hints projects/zfsd/head/sys/arm/conf/SN9G45 projects/zfsd/head/sys/dev/bwn/if_bwn_bhnd.c projects/zfsd/head/sys/dev/bwn/if_bwn_chipid.h projects/zfsd/head/sys/dev/bwn/if_bwn_siba.c projects/zfsd/head/sys/dev/bwn/if_bwn_siba.h projects/zfsd/head/sys/dev/bwn/if_bwn_siba_compat.c projects/zfsd/head/sys/dev/bwn/if_bwn_siba_compat.h projects/zfsd/head/sys/dev/siba/ projects/zfsd/head/sys/i386/include/varargs.h projects/zfsd/head/sys/mips/include/varargs.h projects/zfsd/head/sys/modules/bwn_pci/ projects/zfsd/head/sys/modules/siba_bwn/ projects/zfsd/head/sys/powerpc/include/varargs.h projects/zfsd/head/sys/sparc64/include/varargs.h projects/zfsd/head/tools/regression/sockets/socketpair/ projects/zfsd/head/usr.sbin/devmatch/ Modified: projects/zfsd/head/MAINTAINERS (contents, props changed) projects/zfsd/head/Makefile projects/zfsd/head/Makefile.inc1 projects/zfsd/head/ObsoleteFiles.inc projects/zfsd/head/UPDATING projects/zfsd/head/bin/df/df.c projects/zfsd/head/bin/sh/jobs.c projects/zfsd/head/bin/sh/mkbuiltins projects/zfsd/head/bin/sh/mktokens projects/zfsd/head/bin/sh/var.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c projects/zfsd/head/cddl/lib/libdtrace/io.d projects/zfsd/head/cddl/lib/libdtrace/ip.d projects/zfsd/head/cddl/lib/libdtrace/libproc_compat.h projects/zfsd/head/cddl/lib/libdtrace/psinfo.d projects/zfsd/head/cddl/lib/libdtrace/regs_x86.d projects/zfsd/head/cddl/lib/libdtrace/sched.d projects/zfsd/head/cddl/lib/libdtrace/tcp.d projects/zfsd/head/cddl/lib/libdtrace/udp.d projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.h projects/zfsd/head/contrib/blacklist/libexec/blacklistd-helper projects/zfsd/head/contrib/compiler-rt/lib/tsan/rtl/tsan_platform.h projects/zfsd/head/contrib/gcc/config/mips/mips.h projects/zfsd/head/contrib/gdb/gdb/tui/tui-io.c projects/zfsd/head/contrib/jemalloc/FREEBSD-diffs projects/zfsd/head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h projects/zfsd/head/contrib/llvm/include/llvm/Analysis/ValueTracking.h projects/zfsd/head/contrib/llvm/include/llvm/CodeGen/Passes.h projects/zfsd/head/contrib/llvm/include/llvm/CodeGen/TargetInstrInfo.h projects/zfsd/head/contrib/llvm/include/llvm/CodeGen/TargetLowering.h projects/zfsd/head/contrib/llvm/include/llvm/CodeGen/TargetPassConfig.h projects/zfsd/head/contrib/llvm/include/llvm/CodeGen/TargetSubtargetInfo.h projects/zfsd/head/contrib/llvm/include/llvm/InitializePasses.h projects/zfsd/head/contrib/llvm/include/llvm/MC/MCFragment.h projects/zfsd/head/contrib/llvm/include/llvm/MC/MCObjectStreamer.h projects/zfsd/head/contrib/llvm/include/llvm/MC/MCStreamer.h projects/zfsd/head/contrib/llvm/lib/Analysis/ValueTracking.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/CodeGen.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/RegAllocFast.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/TargetPassConfig.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/TargetSubtargetInfo.cpp projects/zfsd/head/contrib/llvm/lib/MC/MCAsmStreamer.cpp projects/zfsd/head/contrib/llvm/lib/MC/MCAssembler.cpp projects/zfsd/head/contrib/llvm/lib/MC/MCMachOStreamer.cpp projects/zfsd/head/contrib/llvm/lib/MC/MCObjectStreamer.cpp projects/zfsd/head/contrib/llvm/lib/MC/MCStreamer.cpp projects/zfsd/head/contrib/llvm/lib/MC/MCWinCOFFStreamer.cpp projects/zfsd/head/contrib/llvm/lib/MC/WasmObjectWriter.cpp projects/zfsd/head/contrib/llvm/lib/Target/AArch64/AArch64FastISel.cpp projects/zfsd/head/contrib/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp projects/zfsd/head/contrib/llvm/lib/Target/AArch64/AArch64Subtarget.cpp projects/zfsd/head/contrib/llvm/lib/Target/AMDGPU/SIInsertSkips.cpp projects/zfsd/head/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp projects/zfsd/head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp projects/zfsd/head/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.h projects/zfsd/head/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp projects/zfsd/head/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp projects/zfsd/head/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86.h projects/zfsd/head/contrib/llvm/lib/Target/X86/X86.td projects/zfsd/head/contrib/llvm/lib/Target/X86/X86AsmPrinter.h projects/zfsd/head/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86ISelLowering.h projects/zfsd/head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td projects/zfsd/head/contrib/llvm/lib/Target/X86/X86InstrControl.td projects/zfsd/head/contrib/llvm/lib/Target/X86/X86InstrInfo.td projects/zfsd/head/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86Subtarget.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/zfsd/head/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp projects/zfsd/head/contrib/llvm/lib/Transforms/Scalar/CallSiteSplitting.cpp projects/zfsd/head/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp projects/zfsd/head/contrib/llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp projects/zfsd/head/contrib/llvm/lib/Transforms/Scalar/StructurizeCFG.cpp projects/zfsd/head/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/zfsd/head/contrib/llvm/tools/clang/lib/Basic/Targets/X86.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Basic/Targets/X86.h projects/zfsd/head/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Driver/ToolChains/Clang.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Driver/ToolChains/Hexagon.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp projects/zfsd/head/contrib/llvm/tools/lld/ELF/AArch64ErrataFix.cpp projects/zfsd/head/contrib/llvm/tools/lld/ELF/Arch/X86.cpp projects/zfsd/head/contrib/llvm/tools/lld/ELF/Arch/X86_64.cpp projects/zfsd/head/contrib/llvm/tools/lld/ELF/Config.h projects/zfsd/head/contrib/llvm/tools/lld/ELF/Driver.cpp projects/zfsd/head/contrib/llvm/tools/lld/ELF/Writer.h projects/zfsd/head/contrib/llvm/tools/opt/opt.cpp projects/zfsd/head/contrib/netbsd-tests/kernel/t_sysv.c projects/zfsd/head/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/zfsd/head/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c projects/zfsd/head/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c projects/zfsd/head/contrib/netbsd-tests/usr.bin/grep/t_grep.sh projects/zfsd/head/etc/autofs/special_media projects/zfsd/head/etc/defaults/rc.conf projects/zfsd/head/etc/devd/Makefile projects/zfsd/head/etc/mtree/BSD.root.dist projects/zfsd/head/etc/rc projects/zfsd/head/etc/rc.d/Makefile projects/zfsd/head/etc/rc.d/cleanvar projects/zfsd/head/etc/rc.d/resolv projects/zfsd/head/etc/regdomain.xml projects/zfsd/head/gnu/lib/Makefile projects/zfsd/head/gnu/usr.bin/gdb/Makefile projects/zfsd/head/gnu/usr.bin/gdb/Makefile.inc projects/zfsd/head/gnu/usr.bin/gdb/gdb/Makefile projects/zfsd/head/gnu/usr.bin/gdb/kgdb/Makefile projects/zfsd/head/include/varargs.h projects/zfsd/head/lib/clang/freebsd_cc_version.h projects/zfsd/head/lib/clang/include/clang/Basic/Version.inc projects/zfsd/head/lib/clang/include/lld/Common/Version.inc projects/zfsd/head/lib/clang/include/llvm/Support/VCSRevision.h projects/zfsd/head/lib/clang/libllvm/Makefile projects/zfsd/head/lib/libc/gen/makecontext.3 projects/zfsd/head/lib/libc/i386/gen/makecontext.c projects/zfsd/head/lib/libc/mips/gen/_ctx_start.S projects/zfsd/head/lib/libc/mips/gen/makecontext.c projects/zfsd/head/lib/libc/powerpc/gen/makecontext.c projects/zfsd/head/lib/libc/powerpc64/gen/makecontext.c projects/zfsd/head/lib/libc/rpc/svc_dg.c projects/zfsd/head/lib/libc/sparc64/sys/__sparc_utrap_setup.c projects/zfsd/head/lib/libc/stdlib/Makefile.inc projects/zfsd/head/lib/libc/stdlib/strtol.c projects/zfsd/head/lib/libc/sys/fsync.2 projects/zfsd/head/lib/libc/sys/socketpair.2 projects/zfsd/head/lib/libc/tests/gen/Makefile projects/zfsd/head/lib/libcasper/libcasper/libcasper.3 projects/zfsd/head/lib/libcompat/4.3/rexec.c projects/zfsd/head/lib/libcompiler_rt/Makefile.inc projects/zfsd/head/lib/libdevdctl/event.cc projects/zfsd/head/lib/libedit/Makefile projects/zfsd/head/lib/libgcc_s/Makefile projects/zfsd/head/lib/libufs/cgread.3 projects/zfsd/head/lib/libufs/sblock.c projects/zfsd/head/lib/msun/src/e_atan2.c projects/zfsd/head/libexec/getty/extern.h projects/zfsd/head/libexec/getty/init.c projects/zfsd/head/libexec/getty/main.c projects/zfsd/head/libexec/getty/subr.c projects/zfsd/head/libexec/rtld-elf/aarch64/reloc.c projects/zfsd/head/libexec/rtld-elf/amd64/reloc.c projects/zfsd/head/libexec/rtld-elf/arm/reloc.c projects/zfsd/head/libexec/rtld-elf/i386/reloc.c projects/zfsd/head/libexec/rtld-elf/mips/reloc.c projects/zfsd/head/libexec/rtld-elf/powerpc/reloc.c projects/zfsd/head/libexec/rtld-elf/powerpc64/reloc.c projects/zfsd/head/libexec/rtld-elf/riscv/reloc.c projects/zfsd/head/libexec/rtld-elf/rtld.c projects/zfsd/head/libexec/rtld-elf/rtld.h projects/zfsd/head/libexec/rtld-elf/sparc64/reloc.c projects/zfsd/head/release/scripts/make-manifest.sh projects/zfsd/head/sbin/Makefile projects/zfsd/head/sbin/devd/devd.cc projects/zfsd/head/sbin/dhclient/dhclient.c projects/zfsd/head/sbin/dumpfs/dumpfs.c projects/zfsd/head/sbin/dumpon/dumpon.8 projects/zfsd/head/sbin/dumpon/dumpon.c projects/zfsd/head/sbin/etherswitchcfg/etherswitchcfg.c projects/zfsd/head/sbin/fsck_ffs/fsck.h projects/zfsd/head/sbin/fsck_ffs/globs.c projects/zfsd/head/sbin/fsck_ffs/main.c projects/zfsd/head/sbin/fsck_ffs/pass5.c projects/zfsd/head/sbin/fsck_ffs/suj.c projects/zfsd/head/sbin/geom/class/cache/geom_cache.c projects/zfsd/head/sbin/geom/class/concat/geom_concat.c projects/zfsd/head/sbin/geom/class/journal/geom_journal.c projects/zfsd/head/sbin/geom/class/label/geom_label.c projects/zfsd/head/sbin/geom/class/mirror/geom_mirror.c projects/zfsd/head/sbin/geom/class/part/gpart.8 projects/zfsd/head/sbin/geom/class/raid3/geom_raid3.c projects/zfsd/head/sbin/geom/class/shsec/geom_shsec.c projects/zfsd/head/sbin/geom/class/stripe/geom_stripe.c projects/zfsd/head/sbin/geom/misc/subr.c projects/zfsd/head/sbin/ipfw/ipfw.8 projects/zfsd/head/sbin/newfs/mkfs.c projects/zfsd/head/sbin/savecore/savecore.c projects/zfsd/head/secure/lib/libcrypto/Makefile.inc projects/zfsd/head/secure/usr.bin/openssl/Makefile.man projects/zfsd/head/share/examples/bhyve/vmrun.sh projects/zfsd/head/share/man/man3/pthread_join.3 projects/zfsd/head/share/man/man4/bwn.4 projects/zfsd/head/share/man/man4/dtrace_tcp.4 projects/zfsd/head/share/man/man4/ng_pppoe.4 projects/zfsd/head/share/man/man4/usb_template.4 projects/zfsd/head/share/man/man5/core.5 projects/zfsd/head/share/man/man5/src.conf.5 projects/zfsd/head/share/man/man7/arch.7 projects/zfsd/head/share/man/man8/rc.subr.8 projects/zfsd/head/share/man/man9/DECLARE_MODULE.9 projects/zfsd/head/share/man/man9/DRIVER_MODULE.9 projects/zfsd/head/share/man/man9/Makefile projects/zfsd/head/share/man/man9/bus_map_resource.9 projects/zfsd/head/share/man/man9/device_add_child.9 projects/zfsd/head/share/man/man9/module.9 projects/zfsd/head/share/man/man9/pmap_qenter.9 projects/zfsd/head/share/misc/committers-src.dot projects/zfsd/head/share/misc/organization.dot projects/zfsd/head/share/misc/pci_vendors projects/zfsd/head/share/mk/bsd.compiler.mk projects/zfsd/head/share/mk/bsd.linker.mk projects/zfsd/head/share/mk/bsd.sys.mk projects/zfsd/head/share/mk/src.libnames.mk projects/zfsd/head/share/mk/src.opts.mk projects/zfsd/head/share/zoneinfo/Makefile projects/zfsd/head/stand/Makefile projects/zfsd/head/stand/Makefile.amd64 projects/zfsd/head/stand/arm/uboot/Makefile projects/zfsd/head/stand/common/boot.c projects/zfsd/head/stand/common/bootstrap.h projects/zfsd/head/stand/common/install.c projects/zfsd/head/stand/common/interp.c projects/zfsd/head/stand/common/interp_backslash.c projects/zfsd/head/stand/common/interp_forth.c projects/zfsd/head/stand/common/interp_parse.c projects/zfsd/head/stand/common/load_elf.c projects/zfsd/head/stand/common/load_elf_obj.c projects/zfsd/head/stand/common/pnp.c projects/zfsd/head/stand/defs.mk projects/zfsd/head/stand/efi/boot1/Makefile projects/zfsd/head/stand/efi/fdt/Makefile projects/zfsd/head/stand/efi/fdt/efi_fdt.c projects/zfsd/head/stand/efi/include/efilib.h projects/zfsd/head/stand/efi/libefi/Makefile projects/zfsd/head/stand/efi/libefi/efipart.c projects/zfsd/head/stand/efi/libefi/env.c projects/zfsd/head/stand/efi/loader/Makefile projects/zfsd/head/stand/efi/loader/main.c projects/zfsd/head/stand/fdt/Makefile projects/zfsd/head/stand/fdt/fdt_loader_cmd.c projects/zfsd/head/stand/ficl.mk projects/zfsd/head/stand/ficl/Makefile projects/zfsd/head/stand/forth/Makefile projects/zfsd/head/stand/forth/loader.4th projects/zfsd/head/stand/geli/Makefile projects/zfsd/head/stand/i386/boot0/Makefile projects/zfsd/head/stand/i386/boot2/boot2.c projects/zfsd/head/stand/i386/btx/btx/Makefile projects/zfsd/head/stand/i386/btx/btxldr/Makefile projects/zfsd/head/stand/i386/btx/lib/Makefile projects/zfsd/head/stand/i386/cdboot/Makefile projects/zfsd/head/stand/i386/kgzldr/Makefile projects/zfsd/head/stand/i386/libfirewire/Makefile projects/zfsd/head/stand/i386/libi386/Makefile projects/zfsd/head/stand/i386/libi386/biospci.c projects/zfsd/head/stand/i386/loader/Makefile projects/zfsd/head/stand/i386/mbr/Makefile projects/zfsd/head/stand/i386/pmbr/Makefile projects/zfsd/head/stand/kshim/bsd_kernel.h projects/zfsd/head/stand/libsa/Makefile projects/zfsd/head/stand/libsa/ip.c projects/zfsd/head/stand/libsa/net.c projects/zfsd/head/stand/libsa/stand.h projects/zfsd/head/stand/libsa/tftp.c projects/zfsd/head/stand/loader.mk projects/zfsd/head/stand/mips/beri/boot2/Makefile projects/zfsd/head/stand/mips/beri/loader/Makefile projects/zfsd/head/stand/mips/beri/loader/exec.c projects/zfsd/head/stand/mips/beri/loader/loader.h projects/zfsd/head/stand/mips/uboot/Makefile projects/zfsd/head/stand/ofw/common/main.c projects/zfsd/head/stand/ofw/libofw/Makefile projects/zfsd/head/stand/ofw/libofw/elf_freebsd.c projects/zfsd/head/stand/ofw/libofw/libofw.h projects/zfsd/head/stand/ofw/libofw/ofw_copy.c projects/zfsd/head/stand/ofw/libofw/ofw_memory.c projects/zfsd/head/stand/ofw/libofw/ppc64_elf_freebsd.c projects/zfsd/head/stand/powerpc/boot1.chrp/Makefile projects/zfsd/head/stand/powerpc/kboot/Makefile projects/zfsd/head/stand/powerpc/kboot/main.c projects/zfsd/head/stand/powerpc/ofw/Makefile projects/zfsd/head/stand/powerpc/ofw/ldscript.powerpc projects/zfsd/head/stand/powerpc/uboot/Makefile projects/zfsd/head/stand/sparc64/boot1/Makefile projects/zfsd/head/stand/sparc64/loader/Makefile projects/zfsd/head/stand/uboot.mk projects/zfsd/head/stand/uboot/fdt/Makefile projects/zfsd/head/stand/uboot/lib/Makefile projects/zfsd/head/stand/uboot/lib/elf_freebsd.c projects/zfsd/head/stand/usb/usbcore.mk projects/zfsd/head/stand/userboot/test/Makefile projects/zfsd/head/stand/userboot/userboot/Makefile projects/zfsd/head/stand/zfs/Makefile projects/zfsd/head/sys/amd64/amd64/db_trace.c projects/zfsd/head/sys/amd64/amd64/efirt_machdep.c (contents, props changed) projects/zfsd/head/sys/amd64/amd64/exception.S projects/zfsd/head/sys/amd64/amd64/genassym.c projects/zfsd/head/sys/amd64/amd64/initcpu.c projects/zfsd/head/sys/amd64/amd64/machdep.c projects/zfsd/head/sys/amd64/amd64/pmap.c projects/zfsd/head/sys/amd64/amd64/support.S projects/zfsd/head/sys/amd64/amd64/uma_machdep.c projects/zfsd/head/sys/amd64/conf/NOTES projects/zfsd/head/sys/amd64/ia32/ia32_exception.S projects/zfsd/head/sys/amd64/include/md_var.h projects/zfsd/head/sys/amd64/include/pcpu.h projects/zfsd/head/sys/amd64/linux/Makefile projects/zfsd/head/sys/amd64/linux/linux.h projects/zfsd/head/sys/amd64/linux/linux_ptrace.c projects/zfsd/head/sys/amd64/linux/linux_sysvec.c projects/zfsd/head/sys/amd64/linux/syscalls.master projects/zfsd/head/sys/amd64/linux32/Makefile projects/zfsd/head/sys/amd64/linux32/linux.h projects/zfsd/head/sys/amd64/linux32/linux32_dummy.c projects/zfsd/head/sys/amd64/linux32/linux32_locore.s projects/zfsd/head/sys/amd64/linux32/linux32_sysvec.c projects/zfsd/head/sys/amd64/linux32/syscalls.master projects/zfsd/head/sys/amd64/vmm/amd/svm.c projects/zfsd/head/sys/amd64/vmm/amd/svm_support.S projects/zfsd/head/sys/amd64/vmm/intel/vmcs.c projects/zfsd/head/sys/amd64/vmm/intel/vmx.h projects/zfsd/head/sys/amd64/vmm/intel/vmx_support.S projects/zfsd/head/sys/arm/allwinner/if_awg.c projects/zfsd/head/sys/arm/arm/gic_acpi.c projects/zfsd/head/sys/arm/arm/machdep.c projects/zfsd/head/sys/arm/arm/pmap-v4.c projects/zfsd/head/sys/arm/arm/pmap-v6.c projects/zfsd/head/sys/arm/include/_types.h projects/zfsd/head/sys/arm64/arm64/efirt_machdep.c projects/zfsd/head/sys/arm64/arm64/pmap.c projects/zfsd/head/sys/arm64/arm64/uma_machdep.c projects/zfsd/head/sys/arm64/include/_types.h projects/zfsd/head/sys/cam/ata/ata_da.c projects/zfsd/head/sys/cam/ata/ata_pmp.c projects/zfsd/head/sys/cam/ata/ata_xpt.c projects/zfsd/head/sys/cam/cam_iosched.c projects/zfsd/head/sys/cam/cam_periph.c projects/zfsd/head/sys/cam/cam_periph.h projects/zfsd/head/sys/cam/ctl/scsi_ctl.c projects/zfsd/head/sys/cam/mmc/mmc_da.c projects/zfsd/head/sys/cam/mmc/mmc_xpt.c projects/zfsd/head/sys/cam/nvme/nvme_da.c projects/zfsd/head/sys/cam/nvme/nvme_xpt.c projects/zfsd/head/sys/cam/scsi/scsi_cd.c projects/zfsd/head/sys/cam/scsi/scsi_da.c projects/zfsd/head/sys/cam/scsi/scsi_enc.c projects/zfsd/head/sys/cam/scsi/scsi_pass.c projects/zfsd/head/sys/cam/scsi/scsi_pt.c projects/zfsd/head/sys/cam/scsi/scsi_sa.c projects/zfsd/head/sys/cam/scsi/scsi_sg.c projects/zfsd/head/sys/cam/scsi/scsi_xpt.c projects/zfsd/head/sys/cddl/compat/opensolaris/sys/kmem.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/zfsd/head/sys/compat/cloudabi32/Makefile projects/zfsd/head/sys/compat/cloudabi64/Makefile projects/zfsd/head/sys/compat/freebsd32/Makefile projects/zfsd/head/sys/compat/freebsd32/freebsd32_ipc.h projects/zfsd/head/sys/compat/linprocfs/linprocfs.c projects/zfsd/head/sys/compat/linux/check_internal_locks.d projects/zfsd/head/sys/compat/linux/linux_emul.c projects/zfsd/head/sys/compat/linux/linux_event.c projects/zfsd/head/sys/compat/linux/linux_file.h projects/zfsd/head/sys/compat/linux/linux_fork.c projects/zfsd/head/sys/compat/linux/linux_ioctl.c projects/zfsd/head/sys/compat/linux/linux_ioctl.h projects/zfsd/head/sys/compat/linux/linux_ipc.c projects/zfsd/head/sys/compat/linux/linux_ipc.h projects/zfsd/head/sys/compat/linux/linux_ipc64.h projects/zfsd/head/sys/compat/linux/linux_misc.c projects/zfsd/head/sys/compat/linux/linux_persona.h projects/zfsd/head/sys/compat/linux/linux_signal.c projects/zfsd/head/sys/compat/linux/linux_socket.c projects/zfsd/head/sys/compat/linux/linux_socket.h projects/zfsd/head/sys/compat/linux/linux_time.c projects/zfsd/head/sys/compat/linux/linux_util.h projects/zfsd/head/sys/compat/linux/stats_timing.d projects/zfsd/head/sys/compat/linux/trace_futexes.d projects/zfsd/head/sys/compat/linuxkpi/common/include/linux/ktime.h projects/zfsd/head/sys/compat/linuxkpi/common/include/linux/mm.h projects/zfsd/head/sys/compat/linuxkpi/common/include/linux/sched.h projects/zfsd/head/sys/compat/linuxkpi/common/src/linux_compat.c projects/zfsd/head/sys/conf/NOTES projects/zfsd/head/sys/conf/files projects/zfsd/head/sys/conf/files.i386 projects/zfsd/head/sys/conf/kern.post.mk projects/zfsd/head/sys/conf/options projects/zfsd/head/sys/contrib/dev/acpica/changes.txt projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbdump.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbinfo.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslerror.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslfold.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslload.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmessages.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmessages.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtcompile.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtexpress.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtparser.l projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtparser.y projects/zfsd/head/sys/contrib/dev/acpica/compiler/dttable.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dttable1.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dttable2.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exnames.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exresop.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nseval.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psargs.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psloop.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psparse.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/pstree.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utcache.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/zfsd/head/sys/contrib/dev/acpica/include/acopcode.h projects/zfsd/head/sys/contrib/dev/acpica/include/acpixf.h projects/zfsd/head/sys/contrib/dev/acpica/include/actbl1.h projects/zfsd/head/sys/contrib/dev/acpica/include/actbl2.h projects/zfsd/head/sys/contrib/dev/acpica/include/actbl3.h projects/zfsd/head/sys/contrib/dev/acpica/include/amlcode.h projects/zfsd/head/sys/contrib/zstd/lib/freebsd/stdlib.h projects/zfsd/head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h projects/zfsd/head/sys/dev/ath/if_ath.c projects/zfsd/head/sys/dev/atkbdc/psm.c projects/zfsd/head/sys/dev/bhnd/bhnd_ids.h projects/zfsd/head/sys/dev/bhnd/siba/siba.c projects/zfsd/head/sys/dev/bhnd/siba/siba_erom.c projects/zfsd/head/sys/dev/bhnd/siba/siba_subr.c projects/zfsd/head/sys/dev/bhnd/siba/sibavar.h projects/zfsd/head/sys/dev/bwn/if_bwn.c projects/zfsd/head/sys/dev/bwn/if_bwn_debug.h projects/zfsd/head/sys/dev/bwn/if_bwn_misc.h projects/zfsd/head/sys/dev/bwn/if_bwn_pci.c projects/zfsd/head/sys/dev/bwn/if_bwn_phy_common.c projects/zfsd/head/sys/dev/bwn/if_bwn_phy_common.h projects/zfsd/head/sys/dev/bwn/if_bwn_phy_g.c projects/zfsd/head/sys/dev/bwn/if_bwn_phy_lp.c projects/zfsd/head/sys/dev/bwn/if_bwn_phy_n.c projects/zfsd/head/sys/dev/bwn/if_bwn_util.c projects/zfsd/head/sys/dev/bwn/if_bwnreg.h projects/zfsd/head/sys/dev/bwn/if_bwnvar.h projects/zfsd/head/sys/dev/cpuctl/cpuctl.c projects/zfsd/head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/zfsd/head/sys/dev/cxgbe/tom/t4_tom.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_7240.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_8316.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_8327.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_9340.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitchreg.h projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitchvar.h projects/zfsd/head/sys/dev/etherswitch/etherswitch.c projects/zfsd/head/sys/dev/etherswitch/etherswitch.h projects/zfsd/head/sys/dev/etherswitch/etherswitch_if.m projects/zfsd/head/sys/dev/mlx5/mlx5_en/en.h projects/zfsd/head/sys/dev/mpr/mpr.c projects/zfsd/head/sys/dev/mpr/mpr_sas.c projects/zfsd/head/sys/dev/mpr/mpr_user.c projects/zfsd/head/sys/dev/mpr/mprvar.h projects/zfsd/head/sys/dev/mps/mps.c projects/zfsd/head/sys/dev/mps/mps_sas.c projects/zfsd/head/sys/dev/mps/mps_user.c projects/zfsd/head/sys/dev/mps/mpsvar.h projects/zfsd/head/sys/dev/mxge/if_mxge.c projects/zfsd/head/sys/dev/ntb/ntb_transport.c projects/zfsd/head/sys/dev/uart/uart_dev_mvebu.c projects/zfsd/head/sys/dev/usb/quirk/usb_quirk.c projects/zfsd/head/sys/dev/usb/serial/uftdi.c projects/zfsd/head/sys/dev/usb/serial/uslcom.c projects/zfsd/head/sys/dev/usb/template/usb_template_audio.c projects/zfsd/head/sys/dev/usb/template/usb_template_cdce.c projects/zfsd/head/sys/dev/usb/template/usb_template_kbd.c projects/zfsd/head/sys/dev/usb/template/usb_template_midi.c projects/zfsd/head/sys/dev/usb/template/usb_template_modem.c projects/zfsd/head/sys/dev/usb/template/usb_template_mouse.c projects/zfsd/head/sys/dev/usb/template/usb_template_msc.c projects/zfsd/head/sys/dev/usb/template/usb_template_mtp.c projects/zfsd/head/sys/dev/usb/template/usb_template_phone.c projects/zfsd/head/sys/dev/usb/template/usb_template_serialnet.c projects/zfsd/head/sys/dev/usb/usb_device.c projects/zfsd/head/sys/dev/usb/usbdevs projects/zfsd/head/sys/dev/usb/usbdi.h projects/zfsd/head/sys/fs/ext2fs/ext2_alloc.c projects/zfsd/head/sys/fs/ext2fs/ext2_extents.c projects/zfsd/head/sys/fs/ext2fs/ext2_inode_cnv.c projects/zfsd/head/sys/fs/ext2fs/ext2_lookup.c projects/zfsd/head/sys/fs/ext2fs/ext2_vfsops.c projects/zfsd/head/sys/fs/ext2fs/ext2fs.h projects/zfsd/head/sys/fs/tmpfs/tmpfs_subr.c projects/zfsd/head/sys/geom/eli/g_eli.c projects/zfsd/head/sys/geom/journal/g_journal.c projects/zfsd/head/sys/geom/label/g_label_ufs.c projects/zfsd/head/sys/geom/mirror/g_mirror.c projects/zfsd/head/sys/geom/part/g_part.c projects/zfsd/head/sys/geom/part/g_part.h projects/zfsd/head/sys/geom/part/g_part_gpt.c projects/zfsd/head/sys/geom/virstor/g_virstor.c projects/zfsd/head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c projects/zfsd/head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h projects/zfsd/head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.c projects/zfsd/head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c projects/zfsd/head/sys/gnu/dts/arm/am33xx.dtsi projects/zfsd/head/sys/gnu/dts/arm/am4372.dtsi projects/zfsd/head/sys/gnu/dts/arm/am437x-cm-t43.dts projects/zfsd/head/sys/gnu/dts/arm/am43x-epos-evm.dts projects/zfsd/head/sys/gnu/dts/arm/armada-370-synology-ds213j.dts projects/zfsd/head/sys/gnu/dts/arm/armada-385-db-ap.dts projects/zfsd/head/sys/gnu/dts/arm/armada-385-linksys.dtsi projects/zfsd/head/sys/gnu/dts/arm/armada-385-synology-ds116.dts projects/zfsd/head/sys/gnu/dts/arm/armada-388-gp.dts projects/zfsd/head/sys/gnu/dts/arm/armada-xp-synology-ds414.dts projects/zfsd/head/sys/gnu/dts/arm/artpec6.dtsi projects/zfsd/head/sys/gnu/dts/arm/aspeed-ast2500-evb.dts projects/zfsd/head/sys/gnu/dts/arm/aspeed-bmc-opp-palmetto.dts projects/zfsd/head/sys/gnu/dts/arm/aspeed-bmc-opp-romulus.dts projects/zfsd/head/sys/gnu/dts/arm/aspeed-g4.dtsi projects/zfsd/head/sys/gnu/dts/arm/aspeed-g5.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91-ariag25.dts projects/zfsd/head/sys/gnu/dts/arm/at91-ariettag25.dts projects/zfsd/head/sys/gnu/dts/arm/at91-cosino_mega2560.dts projects/zfsd/head/sys/gnu/dts/arm/at91-kizbox2.dts projects/zfsd/head/sys/gnu/dts/arm/at91-kizboxmini.dts projects/zfsd/head/sys/gnu/dts/arm/at91-sama5d27_som1_ek.dts (contents, props changed) projects/zfsd/head/sys/gnu/dts/arm/at91-sama5d2_xplained.dts projects/zfsd/head/sys/gnu/dts/arm/at91-sama5d3_xplained.dts projects/zfsd/head/sys/gnu/dts/arm/at91-sama5d4_ma5d4evk.dts projects/zfsd/head/sys/gnu/dts/arm/at91-sama5d4_xplained.dts projects/zfsd/head/sys/gnu/dts/arm/at91-sama5d4ek.dts projects/zfsd/head/sys/gnu/dts/arm/at91-tse850-3.dts projects/zfsd/head/sys/gnu/dts/arm/at91-vinco.dts projects/zfsd/head/sys/gnu/dts/arm/at91rm9200.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91rm9200ek.dts projects/zfsd/head/sys/gnu/dts/arm/at91sam9260.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9261.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9261ek.dts projects/zfsd/head/sys/gnu/dts/arm/at91sam9263.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9263ek.dts projects/zfsd/head/sys/gnu/dts/arm/at91sam9g20.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9g45.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9m10g45ek.dts projects/zfsd/head/sys/gnu/dts/arm/at91sam9n12.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9n12ek.dts projects/zfsd/head/sys/gnu/dts/arm/at91sam9rl.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9rlek.dts projects/zfsd/head/sys/gnu/dts/arm/at91sam9x25ek.dts projects/zfsd/head/sys/gnu/dts/arm/at91sam9x5.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9x5ek.dtsi projects/zfsd/head/sys/gnu/dts/arm/at91sam9xe.dtsi projects/zfsd/head/sys/gnu/dts/arm/axp209.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm-cygnus.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm-nsp.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm2837-rpi-3-b.dts projects/zfsd/head/sys/gnu/dts/arm/bcm283x.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm47081-luxul-xwr-1200.dts projects/zfsd/head/sys/gnu/dts/arm/bcm5301x.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm53573.dtsi projects/zfsd/head/sys/gnu/dts/arm/bcm958623hr.dts projects/zfsd/head/sys/gnu/dts/arm/bcm958625hr.dts projects/zfsd/head/sys/gnu/dts/arm/berlin2.dtsi projects/zfsd/head/sys/gnu/dts/arm/berlin2cd.dtsi projects/zfsd/head/sys/gnu/dts/arm/berlin2q.dtsi projects/zfsd/head/sys/gnu/dts/arm/da850-lcdk.dts projects/zfsd/head/sys/gnu/dts/arm/da850-lego-ev3.dts projects/zfsd/head/sys/gnu/dts/arm/da850.dtsi projects/zfsd/head/sys/gnu/dts/arm/dm814x.dtsi projects/zfsd/head/sys/gnu/dts/arm/dove.dtsi projects/zfsd/head/sys/gnu/dts/arm/dra7-evm-common.dtsi (contents, props changed) projects/zfsd/head/sys/gnu/dts/arm/dra7-evm.dts projects/zfsd/head/sys/gnu/dts/arm/dra7.dtsi projects/zfsd/head/sys/gnu/dts/arm/ep7211-edb7211.dts projects/zfsd/head/sys/gnu/dts/arm/exynos3250-artik5.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos3250-monk.dts projects/zfsd/head/sys/gnu/dts/arm/exynos3250-rinato.dts projects/zfsd/head/sys/gnu/dts/arm/exynos3250.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos4.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos4210-pinctrl.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos4210-universal_c210.dts projects/zfsd/head/sys/gnu/dts/arm/exynos4210.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos4412-itop-scp-core.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos4412-odroid-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos4412-odroidx.dts projects/zfsd/head/sys/gnu/dts/arm/exynos4412-origen.dts projects/zfsd/head/sys/gnu/dts/arm/exynos4412-pinctrl.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos4412-trats2.dts projects/zfsd/head/sys/gnu/dts/arm/exynos4412.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5250-arndale.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5250-smdk5250.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5250-snow-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5250-spring.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5250.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5410-odroidxu.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5410-smdk5410.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5410.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5420-arndale-octa.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5420-cpus.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5420-peach-pit.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5420-smdk5420.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5420.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5422-cpus.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5422-odroidxu3-audio.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5422-odroidxu3-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5440-ssdk5440.dts projects/zfsd/head/sys/gnu/dts/arm/exynos5440.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos54xx.dtsi projects/zfsd/head/sys/gnu/dts/arm/exynos5800-peach-pi.dts projects/zfsd/head/sys/gnu/dts/arm/ge863-pro3.dtsi projects/zfsd/head/sys/gnu/dts/arm/gemini.dtsi projects/zfsd/head/sys/gnu/dts/arm/hip01.dtsi projects/zfsd/head/sys/gnu/dts/arm/hip04-d01.dts projects/zfsd/head/sys/gnu/dts/arm/hisi-x5hd2.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx1.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx25-eukrea-mbimxsd25-baseboard.dts projects/zfsd/head/sys/gnu/dts/arm/imx25-pdk.dts projects/zfsd/head/sys/gnu/dts/arm/imx28-apx4devkit.dts projects/zfsd/head/sys/gnu/dts/arm/imx28-eukrea-mbmx28lc.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx28-evk.dts projects/zfsd/head/sys/gnu/dts/arm/imx28-m28evk.dts projects/zfsd/head/sys/gnu/dts/arm/imx28-tx28.dts projects/zfsd/head/sys/gnu/dts/arm/imx35-eukrea-mbimxsd35-baseboard.dts projects/zfsd/head/sys/gnu/dts/arm/imx50.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx51-apf51dev.dts projects/zfsd/head/sys/gnu/dts/arm/imx51-babbage.dts projects/zfsd/head/sys/gnu/dts/arm/imx51-ts4800.dts projects/zfsd/head/sys/gnu/dts/arm/imx51.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx53-m53evk.dts projects/zfsd/head/sys/gnu/dts/arm/imx53-mba53.dts projects/zfsd/head/sys/gnu/dts/arm/imx53-qsb-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx53-smd.dts projects/zfsd/head/sys/gnu/dts/arm/imx53-tx53-x03x.dts projects/zfsd/head/sys/gnu/dts/arm/imx53-tx53-x13x.dts projects/zfsd/head/sys/gnu/dts/arm/imx53-tx53.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx53-voipac-bsb.dts projects/zfsd/head/sys/gnu/dts/arm/imx53.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6dl-aristainetos2_4.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-aristainetos_4.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-aristainetos_7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-colibri-eval-v3.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-icore.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-riotboard.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6dl-comtft.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6s-8034.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6s-8035.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6u-801x.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6u-8033.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6u-811x.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl-tx6u-81xx-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6dl.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6q-apalis-eval.dts (contents, props changed) projects/zfsd/head/sys/gnu/dts/arm/imx6q-apalis-ixora-v1.1.dts (contents, props changed) projects/zfsd/head/sys/gnu/dts/arm/imx6q-apalis-ixora.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-bx50v3.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6q-cm-fx6.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-dmo-edmqmx6.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-gw5400-a.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-h100.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-icore-rqs.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-mccmon6.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-novena.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tbs2910.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-1010-comtft.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-1010.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-1020-comtft.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-1020.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-1036.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-1110.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-tx6q-11x0-mb7.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q-utilite-pro.dts projects/zfsd/head/sys/gnu/dts/arm/imx6q.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-apalis.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-apf6dev.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-colibri.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-gw51xx.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-gw551x.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-gw552x.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-hummingboard.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-icore-rqs.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-icore.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-nit6xlite.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-nitrogen6_max.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-nitrogen6_som2.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-nitrogen6x.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-rex.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-sabrelite.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-tx6.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl-zii-rdu2.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qdl.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6qp.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6sl-evk.dts projects/zfsd/head/sys/gnu/dts/arm/imx6sl.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6sx-nitrogen6sx.dts projects/zfsd/head/sys/gnu/dts/arm/imx6sx-sdb-reva.dts projects/zfsd/head/sys/gnu/dts/arm/imx6sx-sdb.dts projects/zfsd/head/sys/gnu/dts/arm/imx6sx-udoo-neo.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6sx.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6ul-14x14-evk.dts projects/zfsd/head/sys/gnu/dts/arm/imx6ul-pico-hobbit.dts projects/zfsd/head/sys/gnu/dts/arm/imx6ul-tx6ul-mainboard.dts projects/zfsd/head/sys/gnu/dts/arm/imx6ul-tx6ul.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx6ul.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx7-colibri.dtsi projects/zfsd/head/sys/gnu/dts/arm/imx7d-nitrogen7.dts projects/zfsd/head/sys/gnu/dts/arm/imx7d-pico.dts projects/zfsd/head/sys/gnu/dts/arm/imx7d-sdb.dts projects/zfsd/head/sys/gnu/dts/arm/imx7s-warp.dts projects/zfsd/head/sys/gnu/dts/arm/integrator.dtsi projects/zfsd/head/sys/gnu/dts/arm/integratorap.dts projects/zfsd/head/sys/gnu/dts/arm/keystone-k2e.dtsi projects/zfsd/head/sys/gnu/dts/arm/keystone-k2g-evm.dts projects/zfsd/head/sys/gnu/dts/arm/keystone-k2g.dtsi projects/zfsd/head/sys/gnu/dts/arm/keystone-k2hk.dtsi projects/zfsd/head/sys/gnu/dts/arm/keystone-k2l.dtsi projects/zfsd/head/sys/gnu/dts/arm/keystone.dtsi projects/zfsd/head/sys/gnu/dts/arm/kirkwood-openblocks_a7.dts projects/zfsd/head/sys/gnu/dts/arm/kirkwood-synology.dtsi projects/zfsd/head/sys/gnu/dts/arm/kirkwood-ts219.dtsi projects/zfsd/head/sys/gnu/dts/arm/kirkwood.dtsi projects/zfsd/head/sys/gnu/dts/arm/logicpd-som-lv-37xx-devkit.dts projects/zfsd/head/sys/gnu/dts/arm/logicpd-som-lv.dtsi projects/zfsd/head/sys/gnu/dts/arm/lpc3250-ea3250.dts projects/zfsd/head/sys/gnu/dts/arm/lpc3250-phy3250.dts projects/zfsd/head/sys/gnu/dts/arm/lpc32xx.dtsi projects/zfsd/head/sys/gnu/dts/arm/ls1021a-qds.dts projects/zfsd/head/sys/gnu/dts/arm/ls1021a-twr.dts projects/zfsd/head/sys/gnu/dts/arm/meson.dtsi projects/zfsd/head/sys/gnu/dts/arm/meson6.dtsi projects/zfsd/head/sys/gnu/dts/arm/meson8.dtsi projects/zfsd/head/sys/gnu/dts/arm/meson8b-odroidc1.dts projects/zfsd/head/sys/gnu/dts/arm/meson8b.dtsi projects/zfsd/head/sys/gnu/dts/arm/mpa1600.dts projects/zfsd/head/sys/gnu/dts/arm/mt2701-evb.dts projects/zfsd/head/sys/gnu/dts/arm/mt2701.dtsi projects/zfsd/head/sys/gnu/dts/arm/mt6589.dtsi projects/zfsd/head/sys/gnu/dts/arm/mt7623.dtsi projects/zfsd/head/sys/gnu/dts/arm/nspire.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap2420-n8x0-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-beagle-xm.dts projects/zfsd/head/sys/gnu/dts/arm/omap3-beagle.dts projects/zfsd/head/sys/gnu/dts/arm/omap3-cm-t3x.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-evm-37xx.dts projects/zfsd/head/sys/gnu/dts/arm/omap3-evm-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-evm.dts projects/zfsd/head/sys/gnu/dts/arm/omap3-gta04.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-igep0020-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-igep0030-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-lilly-a83x.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-n9.dts projects/zfsd/head/sys/gnu/dts/arm/omap3-n900.dts projects/zfsd/head/sys/gnu/dts/arm/omap3-n950-n9.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-n950.dts projects/zfsd/head/sys/gnu/dts/arm/omap3-overo-base.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-pandora-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-panel-sharp-ls037v7dw01.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3-tao3530.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap3.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap4-droid4-xt894.dts projects/zfsd/head/sys/gnu/dts/arm/omap4-duovero.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap4-panda-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap4-var-som-om44.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap4.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap5-board-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/omap5-cm-t54.dts projects/zfsd/head/sys/gnu/dts/arm/omap5.dtsi projects/zfsd/head/sys/gnu/dts/arm/owl-s500-guitar-bb-rev-b.dts projects/zfsd/head/sys/gnu/dts/arm/owl-s500.dtsi projects/zfsd/head/sys/gnu/dts/arm/ox810se.dtsi projects/zfsd/head/sys/gnu/dts/arm/ox820.dtsi projects/zfsd/head/sys/gnu/dts/arm/picoxcell-pc3x2.dtsi projects/zfsd/head/sys/gnu/dts/arm/picoxcell-pc3x3.dtsi projects/zfsd/head/sys/gnu/dts/arm/pm9g45.dts projects/zfsd/head/sys/gnu/dts/arm/qcom-apq8060-dragonboard.dts projects/zfsd/head/sys/gnu/dts/arm/qcom-apq8064.dtsi projects/zfsd/head/sys/gnu/dts/arm/qcom-msm8660.dtsi projects/zfsd/head/sys/gnu/dts/arm/qcom-msm8974.dtsi projects/zfsd/head/sys/gnu/dts/arm/r7s72100-gr-peach.dts projects/zfsd/head/sys/gnu/dts/arm/r7s72100.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a73a4.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7743-iwg20d-q7.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7743-iwg20m.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7743.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7745.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7778.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7779.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7790-lager.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7790.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7791-koelsch.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7791-porter.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7791.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7792-blanche.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7792-wheat.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7792.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7793-gose.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7793.dtsi projects/zfsd/head/sys/gnu/dts/arm/r8a7794-alt.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7794-silk.dts projects/zfsd/head/sys/gnu/dts/arm/r8a7794.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk3036-kylin.dts projects/zfsd/head/sys/gnu/dts/arm/rk3036.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk3066a-marsboard.dts projects/zfsd/head/sys/gnu/dts/arm/rk3066a-rayeager.dts projects/zfsd/head/sys/gnu/dts/arm/rk3066a.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk3188-radxarock.dts projects/zfsd/head/sys/gnu/dts/arm/rk3188.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk322x.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk3288-firefly-reload-core.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk3288-firefly-reload.dts projects/zfsd/head/sys/gnu/dts/arm/rk3288-popmetal.dts projects/zfsd/head/sys/gnu/dts/arm/rk3288.dtsi projects/zfsd/head/sys/gnu/dts/arm/rk3xxx.dtsi projects/zfsd/head/sys/gnu/dts/arm/rv1108-evb.dts projects/zfsd/head/sys/gnu/dts/arm/rv1108.dtsi projects/zfsd/head/sys/gnu/dts/arm/sama5d2.dtsi projects/zfsd/head/sys/gnu/dts/arm/sama5d3.dtsi projects/zfsd/head/sys/gnu/dts/arm/sama5d3xmb.dtsi projects/zfsd/head/sys/gnu/dts/arm/sama5d3xmb_cmp.dtsi projects/zfsd/head/sys/gnu/dts/arm/sama5d4.dtsi projects/zfsd/head/sys/gnu/dts/arm/sh73a0.dtsi projects/zfsd/head/sys/gnu/dts/arm/ste-href-stuib.dtsi projects/zfsd/head/sys/gnu/dts/arm/ste-href-tvk1281618.dtsi projects/zfsd/head/sys/gnu/dts/arm/stih407-clock.dtsi projects/zfsd/head/sys/gnu/dts/arm/stih407-family.dtsi projects/zfsd/head/sys/gnu/dts/arm/stih407-pinctrl.dtsi projects/zfsd/head/sys/gnu/dts/arm/stih410-b2120.dts projects/zfsd/head/sys/gnu/dts/arm/stih410-b2260.dts projects/zfsd/head/sys/gnu/dts/arm/stih410-clock.dtsi projects/zfsd/head/sys/gnu/dts/arm/stih410.dtsi projects/zfsd/head/sys/gnu/dts/arm/stih418-b2199.dts projects/zfsd/head/sys/gnu/dts/arm/stih418-clock.dtsi projects/zfsd/head/sys/gnu/dts/arm/stih418.dtsi projects/zfsd/head/sys/gnu/dts/arm/stihxxx-b2120.dtsi projects/zfsd/head/sys/gnu/dts/arm/stm32746g-eval.dts projects/zfsd/head/sys/gnu/dts/arm/stm32f4-pinctrl.dtsi (contents, props changed) projects/zfsd/head/sys/gnu/dts/arm/stm32f429.dtsi projects/zfsd/head/sys/gnu/dts/arm/stm32f746-disco.dts projects/zfsd/head/sys/gnu/dts/arm/stm32f746.dtsi projects/zfsd/head/sys/gnu/dts/arm/stm32h743-pinctrl.dtsi projects/zfsd/head/sys/gnu/dts/arm/stm32h743.dtsi projects/zfsd/head/sys/gnu/dts/arm/stm32h743i-eval.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-a1000.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-ba10-tvbox.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-chuwi-v7-cw0825.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-cubieboard.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-dserve-dsrv9703c.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-gemei-g9.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-hackberry.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-hyundai-a7hd.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-inet1.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-inet97fv2.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-inet9f-rev03.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-itead-iteaduino-plus.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-jesurun-q5.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-marsboard.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-mini-xplus.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-mk802.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-mk802ii.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-olinuxino-lime.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-pcduino.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-pcduino2.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10-pov-protab2-ips9.dts projects/zfsd/head/sys/gnu/dts/arm/sun4i-a10.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun5i-a10s.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun5i-a13.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun5i-gr8.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun5i-reference-design-tablet.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun5i.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun6i-a31-hummingbird.dts projects/zfsd/head/sys/gnu/dts/arm/sun6i-a31.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun6i-a31s-primo81.dts projects/zfsd/head/sys/gnu/dts/arm/sun6i-a31s-sina31s.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-bananapi-m1-plus.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-cubieboard2.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-cubietruck.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-lamobo-r1.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime2.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20-olinuxino-micro.dts projects/zfsd/head/sys/gnu/dts/arm/sun7i-a20.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun8i-a23-a33.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun8i-a23.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun8i-a33.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun8i-a83t-allwinner-h8homlet-v2.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-a83t-bananapi-m3.dts (contents, props changed) projects/zfsd/head/sys/gnu/dts/arm/sun8i-a83t-cubietruck-plus.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-a83t.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun8i-h2-plus-orangepi-zero.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-bananapi-m2-plus.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-nanopi-m1-plus.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-nanopi-m1.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-nanopi-neo.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-nanopi.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-orangepi-2.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-orangepi-lite.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-orangepi-one.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-orangepi-pc-plus.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-orangepi-pc.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-orangepi-plus.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-h3-orangepi-plus2e.dts projects/zfsd/head/sys/gnu/dts/arm/sun8i-v3s.dtsi projects/zfsd/head/sys/gnu/dts/arm/sun9i-a80-cubieboard4.dts projects/zfsd/head/sys/gnu/dts/arm/sun9i-a80-optimus.dts projects/zfsd/head/sys/gnu/dts/arm/sun9i-a80.dtsi projects/zfsd/head/sys/gnu/dts/arm/sunxi-h3-h5.dtsi projects/zfsd/head/sys/gnu/dts/arm/sunxi-itead-core-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/tango4-common.dtsi projects/zfsd/head/sys/gnu/dts/arm/tegra124-jetson-tk1.dts projects/zfsd/head/sys/gnu/dts/arm/tegra124.dtsi projects/zfsd/head/sys/gnu/dts/arm/uniphier-ld4-ref.dts projects/zfsd/head/sys/gnu/dts/arm/uniphier-ld4.dtsi projects/zfsd/head/sys/gnu/dts/arm/uniphier-ld6b-ref.dts projects/zfsd/head/sys/gnu/dts/arm/uniphier-pinctrl.dtsi projects/zfsd/head/sys/gnu/dts/arm/uniphier-pro4-ref.dts projects/zfsd/head/sys/gnu/dts/arm/uniphier-pro4.dtsi projects/zfsd/head/sys/gnu/dts/arm/uniphier-pro5.dtsi projects/zfsd/head/sys/gnu/dts/arm/uniphier-pxs2.dtsi projects/zfsd/head/sys/gnu/dts/arm/uniphier-sld8-ref.dts projects/zfsd/head/sys/gnu/dts/arm/uniphier-sld8.dtsi projects/zfsd/head/sys/gnu/dts/arm/uniphier-support-card.dtsi projects/zfsd/head/sys/gnu/dts/arm/usb_a9263.dts projects/zfsd/head/sys/gnu/dts/arm/usb_a9g20_common.dtsi projects/zfsd/head/sys/gnu/dts/arm/vf610-twr.dts projects/zfsd/head/sys/gnu/dts/arm/vf610-zii-dev-rev-c.dts projects/zfsd/head/sys/gnu/dts/arm/zx296702.dtsi projects/zfsd/head/sys/gnu/dts/arm/zynq-zc702.dts projects/zfsd/head/sys/gnu/dts/arm/zynq-zc706.dts projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos4.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/gxbb-clkc.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx7d-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,rpmcc.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/rk3368-cru.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/sun4i-a10-ccu.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/sun6i-a31-ccu.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/tegra210-car.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/gpio/gpio.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/gpio/meson-gxbb-gpio.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/gpio/meson-gxl-gpio.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/input/linux-event-codes.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/phy/phy.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h projects/zfsd/head/sys/i386/conf/NOTES projects/zfsd/head/sys/i386/i386/locore.s projects/zfsd/head/sys/i386/i386/machdep.c projects/zfsd/head/sys/i386/i386/pmap.c projects/zfsd/head/sys/i386/i386/support.s projects/zfsd/head/sys/i386/ibcs2/Makefile projects/zfsd/head/sys/i386/linux/Makefile projects/zfsd/head/sys/i386/linux/linux.h projects/zfsd/head/sys/i386/linux/linux_dummy.c projects/zfsd/head/sys/i386/linux/linux_locore.s projects/zfsd/head/sys/i386/linux/linux_machdep.c projects/zfsd/head/sys/i386/linux/linux_support.s projects/zfsd/head/sys/i386/linux/linux_sysvec.c projects/zfsd/head/sys/i386/linux/syscalls.master projects/zfsd/head/sys/kern/Makefile projects/zfsd/head/sys/kern/imgact_elf.c projects/zfsd/head/sys/kern/init_main.c projects/zfsd/head/sys/kern/kern_exec.c projects/zfsd/head/sys/kern/kern_malloc.c projects/zfsd/head/sys/kern/kern_mib.c projects/zfsd/head/sys/kern/kern_rwlock.c projects/zfsd/head/sys/kern/kern_sendfile.c projects/zfsd/head/sys/kern/kern_shutdown.c projects/zfsd/head/sys/kern/kern_sig.c projects/zfsd/head/sys/kern/kern_sysctl.c projects/zfsd/head/sys/kern/kern_time.c projects/zfsd/head/sys/kern/link_elf_obj.c projects/zfsd/head/sys/kern/makesyscalls.sh projects/zfsd/head/sys/kern/subr_clock.c projects/zfsd/head/sys/kern/subr_compressor.c projects/zfsd/head/sys/kern/subr_fattime.c projects/zfsd/head/sys/kern/subr_pcpu.c projects/zfsd/head/sys/kern/subr_rtc.c projects/zfsd/head/sys/kern/subr_vmem.c projects/zfsd/head/sys/kern/subr_witness.c projects/zfsd/head/sys/kern/sysv_msg.c projects/zfsd/head/sys/kern/sysv_sem.c projects/zfsd/head/sys/kern/sysv_shm.c projects/zfsd/head/sys/kern/vfs_bio.c projects/zfsd/head/sys/kern/vfs_extattr.c projects/zfsd/head/sys/kern/vfs_subr.c projects/zfsd/head/sys/kgssapi/gss_impl.c projects/zfsd/head/sys/libkern/strcmp.c projects/zfsd/head/sys/libkern/strncat.c projects/zfsd/head/sys/libkern/strncpy.c projects/zfsd/head/sys/libkern/strsep.c projects/zfsd/head/sys/libkern/strstr.c projects/zfsd/head/sys/mips/conf/AP135.hints projects/zfsd/head/sys/mips/conf/AP143.hints projects/zfsd/head/sys/mips/conf/AR933X_BASE.hints projects/zfsd/head/sys/mips/conf/DB120 projects/zfsd/head/sys/mips/conf/DB120.hints projects/zfsd/head/sys/mips/conf/DIR-825C1.hints projects/zfsd/head/sys/mips/conf/QCA953X_BASE projects/zfsd/head/sys/mips/conf/QCA953X_BASE.hints projects/zfsd/head/sys/mips/conf/QCA955X_BASE.hints projects/zfsd/head/sys/mips/conf/TL-WDR4300.hints projects/zfsd/head/sys/mips/conf/std.AR933X projects/zfsd/head/sys/mips/conf/std.AR934X projects/zfsd/head/sys/mips/conf/std.QCA955X projects/zfsd/head/sys/mips/include/_types.h projects/zfsd/head/sys/mips/include/asm.h projects/zfsd/head/sys/mips/include/stdarg.h projects/zfsd/head/sys/mips/mips/busdma_machdep.c projects/zfsd/head/sys/mips/mips/machdep.c projects/zfsd/head/sys/mips/mips/pm_machdep.c projects/zfsd/head/sys/mips/mips/pmap.c projects/zfsd/head/sys/mips/mips/uma_machdep.c projects/zfsd/head/sys/mips/mips/vm_machdep.c projects/zfsd/head/sys/modules/Makefile projects/zfsd/head/sys/modules/bwn/Makefile projects/zfsd/head/sys/modules/dtb/allwinner/Makefile projects/zfsd/head/sys/modules/ipfw/Makefile projects/zfsd/head/sys/modules/linux/Makefile projects/zfsd/head/sys/modules/linux64/Makefile projects/zfsd/head/sys/netgraph/ng_pppoe.c projects/zfsd/head/sys/netgraph/ng_pppoe.h projects/zfsd/head/sys/netinet/ip_fw.h projects/zfsd/head/sys/netinet/tcp_input.c projects/zfsd/head/sys/netinet/tcp_timer.c projects/zfsd/head/sys/netinet/tcp_timer.h projects/zfsd/head/sys/netinet6/frag6.c projects/zfsd/head/sys/netinet6/icmp6.c projects/zfsd/head/sys/netinet6/ip6_input.c projects/zfsd/head/sys/netinet6/ip6_mroute.c projects/zfsd/head/sys/netinet6/ip6_var.h projects/zfsd/head/sys/netinet6/nd6_rtr.c projects/zfsd/head/sys/netinet6/raw_ip6.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw2.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_dynamic.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_private.h projects/zfsd/head/sys/netpfil/ipfw/ip_fw_sockopt.c projects/zfsd/head/sys/netpfil/pf/pf.c projects/zfsd/head/sys/nfs/nfs_nfssvc.c projects/zfsd/head/sys/nlm/nlm_prot_impl.c projects/zfsd/head/sys/powerpc/aim/aim_machdep.c projects/zfsd/head/sys/powerpc/aim/mp_cpudep.c projects/zfsd/head/sys/powerpc/aim/trap_subr64.S projects/zfsd/head/sys/powerpc/booke/booke_machdep.c projects/zfsd/head/sys/powerpc/booke/pmap.c projects/zfsd/head/sys/powerpc/conf/MPC85XX projects/zfsd/head/sys/powerpc/conf/MPC85XXSPE projects/zfsd/head/sys/powerpc/include/_types.h projects/zfsd/head/sys/powerpc/include/psl.h projects/zfsd/head/sys/powerpc/include/stdarg.h projects/zfsd/head/sys/powerpc/mpc85xx/mpc85xx_cache.c projects/zfsd/head/sys/powerpc/powerpc/exec_machdep.c projects/zfsd/head/sys/powerpc/powerpc/genassym.c projects/zfsd/head/sys/powerpc/powerpc/machdep.c projects/zfsd/head/sys/powerpc/powerpc/mp_machdep.c projects/zfsd/head/sys/powerpc/powerpc/uma_machdep.c projects/zfsd/head/sys/powerpc/powerpc/vm_machdep.c projects/zfsd/head/sys/powerpc/pseries/phyp-hvcall.h projects/zfsd/head/sys/powerpc/pseries/platform_chrp.c projects/zfsd/head/sys/riscv/include/_types.h projects/zfsd/head/sys/riscv/include/stdarg.h projects/zfsd/head/sys/riscv/riscv/pmap.c projects/zfsd/head/sys/sparc64/include/_types.h projects/zfsd/head/sys/sparc64/include/stdarg.h projects/zfsd/head/sys/sparc64/sparc64/machdep.c projects/zfsd/head/sys/sparc64/sparc64/pmap.c projects/zfsd/head/sys/sparc64/sparc64/vm_machdep.c projects/zfsd/head/sys/sys/_stdarg.h projects/zfsd/head/sys/sys/_types.h projects/zfsd/head/sys/sys/aio.h projects/zfsd/head/sys/sys/buf.h projects/zfsd/head/sys/sys/bus_dma.h projects/zfsd/head/sys/sys/clock.h projects/zfsd/head/sys/sys/compressor.h projects/zfsd/head/sys/sys/disk/gpt.h projects/zfsd/head/sys/sys/kerneldump.h projects/zfsd/head/sys/sys/mouse.h projects/zfsd/head/sys/sys/msg.h projects/zfsd/head/sys/sys/param.h projects/zfsd/head/sys/sys/sem.h projects/zfsd/head/sys/sys/vmmeter.h projects/zfsd/head/sys/ufs/ffs/ffs_alloc.c projects/zfsd/head/sys/ufs/ffs/ffs_vfsops.c projects/zfsd/head/sys/ufs/ffs/fs.h projects/zfsd/head/sys/ufs/ufs/ufs_vnops.c projects/zfsd/head/sys/vm/swap_pager.c projects/zfsd/head/sys/vm/uma.h projects/zfsd/head/sys/vm/uma_core.c projects/zfsd/head/sys/vm/uma_int.h projects/zfsd/head/sys/vm/vm_extern.h projects/zfsd/head/sys/vm/vm_fault.c projects/zfsd/head/sys/vm/vm_glue.c projects/zfsd/head/sys/vm/vm_init.c projects/zfsd/head/sys/vm/vm_kern.c projects/zfsd/head/sys/vm/vm_map.c projects/zfsd/head/sys/vm/vm_meter.c projects/zfsd/head/sys/vm/vm_mmap.c projects/zfsd/head/sys/vm/vm_object.c projects/zfsd/head/sys/vm/vm_object.h projects/zfsd/head/sys/vm/vm_page.c projects/zfsd/head/sys/vm/vm_page.h projects/zfsd/head/sys/vm/vm_pageout.c projects/zfsd/head/sys/vm/vm_pageout.h projects/zfsd/head/sys/vm/vm_phys.c projects/zfsd/head/sys/vm/vm_phys.h projects/zfsd/head/sys/vm/vm_radix.c projects/zfsd/head/sys/vm/vm_reserv.c projects/zfsd/head/sys/vm/vm_reserv.h projects/zfsd/head/sys/vm/vm_swapout.c projects/zfsd/head/sys/vm/vnode_pager.c projects/zfsd/head/sys/x86/include/_types.h projects/zfsd/head/sys/x86/include/specialreg.h projects/zfsd/head/sys/x86/include/x86_var.h projects/zfsd/head/sys/x86/x86/cpu_machdep.c projects/zfsd/head/sys/x86/x86/identcpu.c projects/zfsd/head/sys/x86/xen/pv.c projects/zfsd/head/targets/pseudo/userland/gnu/Makefile.depend projects/zfsd/head/tests/sys/geom/class/Makefile projects/zfsd/head/tests/sys/geom/class/eli/Makefile projects/zfsd/head/tests/sys/kern/Makefile projects/zfsd/head/tools/boot/install-boot.sh projects/zfsd/head/tools/boot/rootgen.sh projects/zfsd/head/tools/boot/universe.sh projects/zfsd/head/tools/build/mk/OptionalObsoleteFiles.inc projects/zfsd/head/tools/diag/README projects/zfsd/head/tools/tools/nanobsd/embedded/beaglebone.cfg projects/zfsd/head/tools/tools/nanobsd/embedded/common projects/zfsd/head/tools/tools/nanobsd/embedded/pandaboard.cfg projects/zfsd/head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg projects/zfsd/head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg projects/zfsd/head/tools/tools/nanobsd/embedded/qemu-amd64.cfg projects/zfsd/head/tools/tools/nanobsd/embedded/qemu-armv7.cfg projects/zfsd/head/tools/tools/nanobsd/embedded/rpi2.cfg projects/zfsd/head/tools/tools/nanobsd/legacy.sh projects/zfsd/head/usr.bin/clang/Makefile projects/zfsd/head/usr.bin/clang/lld/ld.lld.1 projects/zfsd/head/usr.bin/dtc/Makefile projects/zfsd/head/usr.bin/find/Makefile projects/zfsd/head/usr.bin/find/find.h projects/zfsd/head/usr.bin/find/function.c projects/zfsd/head/usr.bin/find/ls.c projects/zfsd/head/usr.bin/find/operator.c projects/zfsd/head/usr.bin/find/option.c projects/zfsd/head/usr.bin/lex/initparse.c projects/zfsd/head/usr.bin/lock/Makefile projects/zfsd/head/usr.bin/lock/lock.c projects/zfsd/head/usr.bin/nfsstat/Makefile projects/zfsd/head/usr.bin/nfsstat/nfsstat.1 projects/zfsd/head/usr.bin/nfsstat/nfsstat.c projects/zfsd/head/usr.bin/sort/radixsort.c projects/zfsd/head/usr.bin/tftp/main.c projects/zfsd/head/usr.bin/vmstat/vmstat.c projects/zfsd/head/usr.sbin/Makefile projects/zfsd/head/usr.sbin/acpi/iasl/Makefile projects/zfsd/head/usr.sbin/bsdinstall/scripts/auto projects/zfsd/head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh projects/zfsd/head/usr.sbin/mountd/mountd.c projects/zfsd/head/usr.sbin/newsyslog/newsyslog.8 projects/zfsd/head/usr.sbin/ppp/defs.h projects/zfsd/head/usr.sbin/ppp/iface.c projects/zfsd/head/usr.sbin/ppp/ip.c projects/zfsd/head/usr.sbin/ppp/ipv6cp.c projects/zfsd/head/usr.sbin/ppp/ncpaddr.c projects/zfsd/head/usr.sbin/ppp/route.c projects/zfsd/head/usr.sbin/ypserv/yp_svc_udp.c Directory Properties: projects/zfsd/head/ (props changed) projects/zfsd/head/cddl/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/ (props changed) projects/zfsd/head/contrib/blacklist/ (props changed) projects/zfsd/head/contrib/compiler-rt/ (props changed) projects/zfsd/head/contrib/gcc/ (props changed) projects/zfsd/head/contrib/gdb/ (props changed) projects/zfsd/head/contrib/libc++/ (props changed) projects/zfsd/head/contrib/llvm/ (props changed) projects/zfsd/head/contrib/llvm/tools/clang/ (props changed) projects/zfsd/head/contrib/llvm/tools/lld/ (props changed) projects/zfsd/head/contrib/llvm/tools/lldb/ (props changed) projects/zfsd/head/contrib/netbsd-tests/ (props changed) projects/zfsd/head/crypto/openssl/ (props changed) projects/zfsd/head/gnu/lib/ (props changed) projects/zfsd/head/gnu/usr.bin/gdb/ (props changed) projects/zfsd/head/lib/libedit/ (props changed) projects/zfsd/head/sys/cddl/contrib/opensolaris/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/ (props changed) projects/zfsd/head/sys/contrib/zstd/ (props changed) projects/zfsd/head/sys/gnu/dts/arm/ (props changed) projects/zfsd/head/sys/gnu/dts/arm/am335x-moxa-uc-8100-me-t.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/am57xx-beagle-x15-revc.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/at91-sama5d27_som1.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/bcm2835-rpi-zero-w.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/bcm2837.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/bcm947189acdbmr.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/dra72x-mmc-iodelay.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/dra74x-mmc-iodelay.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/dra76-evm.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/dra76x.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/gemini-dlink-dir-685.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/imx53-cx9020.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/imx6ul-geam.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/imx7ulp-pinfunc.h (props changed) projects/zfsd/head/sys/gnu/dts/arm/mt6323.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/mt7623n-bananapi-bpi-r2.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/mt7623n-rfb-nand.dts (props changed) projects/zfsd/head/sys/gnu/dts/arm/mt7623n-rfb.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/rk3229.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/stm32f429-pinctrl.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/stm32f469-pinctrl.dtsi (props changed) projects/zfsd/head/sys/gnu/dts/arm/sun8i-r16-bananapi-m2m.dts (props changed) projects/zfsd/head/sys/gnu/dts/include/ (props changed) Modified: projects/zfsd/head/MAINTAINERS ============================================================================== --- projects/zfsd/head/MAINTAINERS Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/MAINTAINERS Thu Feb 15 17:27:34 2018 (r329324) @@ -65,7 +65,6 @@ lpr gad Pre-commit review requested, particularly for nanobsd imp Pre-commit phabricator review requested. net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. -nis(8), yp(8) araujo Pre-commit review requested. nvd(4) jimharris Pre-commit review requested. nvme(4) jimharris Pre-commit review requested. nvmecontrol(8) jimharris Pre-commit review requested. @@ -93,8 +92,11 @@ sys/dev/ixgbe erj Pre-commit phabricator review reques sys/dev/ixl erj Pre-commit phabricator review requested. sys/dev/sound/usb hselasky If in doubt, ask. sys/dev/usb hselasky If in doubt, ask. +sys/dev/xen royger Pre-commit review recommended. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. +sys/x86/xen royger Pre-commit review recommended. +sys/xen royger Pre-commit review recommended. tests freebsd-testing,ngie Pre-commit review requested. usr.sbin/bsdconfig dteske Pre-commit phabricator review requested. usr.sbin/dpv dteske Pre-commit review requested. Keep in sync with libdpv. Modified: projects/zfsd/head/Makefile ============================================================================== --- projects/zfsd/head/Makefile Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/Makefile Thu Feb 15 17:27:34 2018 (r329324) @@ -106,9 +106,13 @@ # # This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION -# can be cached for sub-makes. +# can be cached for sub-makes. We can't do this while still running on the +# old fmake from FreeBSD 9.x or older, so avoid including it then to avoid +# heartburn upgrading from older systems. The need for CC is done with new +# make later in the build, and caching COMPILER_TYPE/VERSION is only an +# optimization. Also sinclude it to be friendlier to foreign OS hosted builds. .if ${MAKE_VERSION} >= 20140620 && defined(.PARSEDIR) -.include +.sinclude .endif # Note: we use this awkward construct to be compatible with FreeBSD's @@ -352,7 +356,7 @@ _guard: .PHONY @false STARTTIME!= LC_ALL=C date -CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo +CHECK_TIME!= cmp=`mktemp`; find ${.CURDIR}/sys/sys/param.h -newer "$$cmp" && rm "$$cmp"; echo .if !empty(CHECK_TIME) .error check your date/time: ${STARTTIME} .endif Modified: projects/zfsd/head/Makefile.inc1 ============================================================================== --- projects/zfsd/head/Makefile.inc1 Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/Makefile.inc1 Thu Feb 15 17:27:34 2018 (r329324) @@ -85,8 +85,10 @@ MK_GCC_BOOTSTRAP= no .-include "${OBJTOP}/compiler-metadata.mk" .endif -# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. -.include +# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. Pull it from the +# tree to be friendlier to foreign OS builds. It's safe to do so unconditionally +# here since we will always have the right make, unlike in src/Makefile +.include "share/mk/bsd.compiler.mk" .include "share/mk/src.opts.mk" # Check if there is a local compiler that can satisfy as an external compiler. @@ -165,11 +167,11 @@ test-system-compiler: .PHONY .if !defined(X_COMPILER_TYPE) CROSSENV+= COMPILER_VERSION=${COMPILER_VERSION} \ COMPILER_TYPE=${COMPILER_TYPE} \ - COMPILER_FEATURES=${COMPILER_FEATURES} \ + COMPILER_FEATURES="${COMPILER_FEATURES}" \ COMPILER_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION} .else CROSSENV+= COMPILER_VERSION=${X_COMPILER_VERSION} \ - COMPILER_FEATURES=${X_COMPILER_FEATURES} \ + COMPILER_FEATURES="${X_COMPILER_FEATURES}" \ COMPILER_TYPE=${X_COMPILER_TYPE} \ COMPILER_FREEBSD_VERSION=${X_COMPILER_FREEBSD_VERSION} .endif @@ -463,7 +465,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} # when in the middle of installing over this system. # .if make(distributeworld) || make(installworld) || make(stageworld) -INSTALLTMP!= /usr/bin/mktemp -d -u -t install +INSTALLTMP!= mktemp -d -u -t install .endif .if make(stagekernel) || make(distributekernel) @@ -1107,7 +1109,7 @@ _zoneinfo= zic tzsetup ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \ date echo egrep find grep id install ${_install-info} \ ln make mkdir mtree mv pwd_mkdb \ - rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \ + rm sed services_mkdb sh sort strip sysctl test true uname wc ${_zoneinfo} \ ${LOCAL_ITOOLS} # Needed for share/man Modified: projects/zfsd/head/ObsoleteFiles.inc ============================================================================== --- projects/zfsd/head/ObsoleteFiles.inc Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/ObsoleteFiles.inc Thu Feb 15 17:27:34 2018 (r329324) @@ -38,6 +38,17 @@ # xargs -n1 | sort | uniq -d; # done +# 20180212: move devmatch +OLD_FILES+=usr/sbin/devmatch +# 20180211: remove usb.conf +OLD_FILES+=etc/devd/usb.conf +# 20180208: remove c_rehash(1) +OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz +# 20180206: remove gdbtui +OLD_FILES+=usr/bin/gdbtui +# 20180201: Obsolete forth files +OLD_FILES+=boot/efi.4th +OLD_FILES+=boot/pcibios.4th # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0. OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h Modified: projects/zfsd/head/UPDATING ============================================================================== --- projects/zfsd/head/UPDATING Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/UPDATING Thu Feb 15 17:27:34 2018 (r329324) @@ -51,6 +51,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20180212: + FreeBSD boot loader enhanced with Lua scripting. It's purely opt-in for + now by building WITH_LOADER_LUA and WITHOUT_FORTH in /etc/src.conf. + Co-existance for the transition period will come shortly. Booting is a + complex environment and test coverage for Lua-enabled loaders has been + thin, so it would be prudent to assume it might not work and make + provisions for backup boot methods. + +20180211: + devmatch functionality has been turned on in devd. It will automatically + load drivers for unattached devices. This may cause unexpected drivers to + be loaded. Please report any problems to current@ and imp@freebsd.org. + 20180114: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to 6.0.0. Please see the 20141231 entry below for information about Modified: projects/zfsd/head/bin/df/df.c ============================================================================== --- projects/zfsd/head/bin/df/df.c Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/bin/df/df.c Thu Feb 15 17:27:34 2018 (r329324) @@ -254,9 +254,11 @@ main(int argc, char *argv[]) rv = 1; continue; } -#ifdef MOUNT_CHAR_DEVS } else if (S_ISCHR(stbuf.st_mode)) { if ((mntpt = getmntpt(*argv)) == NULL) { +#ifdef MOUNT_CHAR_DEVS + xo_warnx( + "df on unmounted devices is deprecated"); mdev.fspec = *argv; mntpath = strdup("/tmp/df.XXXXXX"); if (mntpath == NULL) { @@ -305,8 +307,12 @@ main(int argc, char *argv[]) (void)rmdir(mntpt); free(mntpath); continue; - } +#else + xo_warnx("%s: not mounted", *argv); + rv = 1; + continue; #endif + } } else mntpt = *argv; Modified: projects/zfsd/head/bin/sh/jobs.c ============================================================================== --- projects/zfsd/head/bin/sh/jobs.c Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/bin/sh/jobs.c Thu Feb 15 17:27:34 2018 (r329324) @@ -362,7 +362,7 @@ showjob(struct job *jp, int mode) const char *statestr, *coredump; struct procstat *ps; struct job *j; - int col, curr, i, jobno, prev, procno; + int col, curr, i, jobno, prev, procno, status; char c; procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; @@ -376,11 +376,12 @@ showjob(struct job *jp, int mode) } #endif coredump = ""; - ps = jp->ps + jp->nprocs - 1; + status = jp->ps[jp->nprocs - 1].status; if (jp->state == 0) { statestr = "Running"; #if JOBS } else if (jp->state == JOBSTOPPED) { + ps = jp->ps + jp->nprocs - 1; while (!WIFSTOPPED(ps->status) && ps > jp->ps) ps--; if (WIFSTOPPED(ps->status)) @@ -391,20 +392,20 @@ showjob(struct job *jp, int mode) if (statestr == NULL) statestr = "Suspended"; #endif - } else if (WIFEXITED(ps->status)) { - if (WEXITSTATUS(ps->status) == 0) + } else if (WIFEXITED(status)) { + if (WEXITSTATUS(status) == 0) statestr = "Done"; else { fmtstr(statebuf, sizeof(statebuf), "Done(%d)", - WEXITSTATUS(ps->status)); + WEXITSTATUS(status)); statestr = statebuf; } } else { - i = WTERMSIG(ps->status); + i = WTERMSIG(status); statestr = strsignal(i); if (statestr == NULL) statestr = "Unknown signal"; - if (WCOREDUMP(ps->status)) + if (WCOREDUMP(status)) coredump = " (core dumped)"; } Modified: projects/zfsd/head/bin/sh/mkbuiltins ============================================================================== --- projects/zfsd/head/bin/sh/mkbuiltins Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/bin/sh/mkbuiltins Thu Feb 15 17:27:34 2018 (r329324) @@ -34,7 +34,7 @@ # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 # $FreeBSD$ -temp=`/usr/bin/mktemp -t ka` +temp=`mktemp -t ka` havehist=1 if [ "X$1" = "X-h" ]; then havehist=0 Modified: projects/zfsd/head/bin/sh/mktokens ============================================================================== --- projects/zfsd/head/bin/sh/mktokens Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/bin/sh/mktokens Thu Feb 15 17:27:34 2018 (r329324) @@ -38,7 +38,7 @@ # token marks the end of a list. The third column is the name to print in # error messages. -temp=`/usr/bin/mktemp -t ka` +temp=`mktemp -t ka` cat > $temp <<\! TEOF 1 end of file TNL 0 newline Modified: projects/zfsd/head/bin/sh/var.c ============================================================================== --- projects/zfsd/head/bin/sh/var.c Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/bin/sh/var.c Thu Feb 15 17:27:34 2018 (r329324) @@ -71,7 +71,9 @@ __FBSDID("$FreeBSD$"); #endif +#ifndef VTABSIZE #define VTABSIZE 39 +#endif struct varinit { Modified: projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c ============================================================================== --- projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Thu Feb 15 17:27:34 2018 (r329324) @@ -688,6 +688,21 @@ get_replication(nvlist_t *nvroot, boolean_t fatal) verify(nvlist_lookup_string(cnv, ZPOOL_CONFIG_TYPE, &childtype) == 0); + if (strcmp(childtype, + VDEV_TYPE_SPARE) == 0) { + /* We have a replacing vdev with + * a spare child. Get the first + * real child of the spare + */ + verify( + nvlist_lookup_nvlist_array( + cnv, + ZPOOL_CONFIG_CHILDREN, + &rchild, + &rchildren) == 0); + assert(rchildren >= 2); + cnv = rchild[0]; + } } verify(nvlist_lookup_string(cnv, Modified: projects/zfsd/head/cddl/lib/libdtrace/io.d ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/io.d Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/io.d Thu Feb 15 17:27:34 2018 (r329324) @@ -29,47 +29,47 @@ #pragma D depends_on provider io typedef struct devinfo { - int dev_major; /* major number */ - int dev_minor; /* minor number */ - int dev_instance; /* instance number */ - string dev_name; /* name of device */ - string dev_statname; /* name of device + instance/minor */ - string dev_pathname; /* pathname of device */ + int dev_major; /* major number */ + int dev_minor; /* minor number */ + int dev_instance; /* instance number */ + string dev_name; /* name of device */ + string dev_statname; /* name of device + instance/minor */ + string dev_pathname; /* pathname of device */ } devinfo_t; #pragma D binding "1.0" translator translator devinfo_t < struct devstat *D > { - dev_major = D->device_number; - dev_minor = D->unit_number; - dev_instance = 0; - dev_name = stringof(D->device_name); - dev_statname = stringof(D->device_name); - dev_pathname = stringof(D->device_name); + dev_major = D->device_number; + dev_minor = D->unit_number; + dev_instance = 0; + dev_name = stringof(D->device_name); + dev_statname = stringof(D->device_name); + dev_pathname = stringof(D->device_name); }; typedef struct bufinfo { - int b_flags; /* flags */ - long b_bcount; /* number of bytes */ - caddr_t b_addr; /* buffer address */ - uint64_t b_blkno; /* expanded block # on device */ - uint64_t b_lblkno; /* block # on device */ - size_t b_resid; /* # of bytes not transferred */ - size_t b_bufsize; /* size of allocated buffer */ -/* caddr_t b_iodone; I/O completion routine */ - int b_error; /* expanded error field */ -/* dev_t b_edev; extended device */ + int b_flags; /* flags */ + long b_bcount; /* number of bytes */ + caddr_t b_addr; /* buffer address */ + uint64_t b_blkno; /* expanded block # on device */ + uint64_t b_lblkno; /* block # on device */ + size_t b_resid; /* # of bytes not transferred */ + size_t b_bufsize; /* size of allocated buffer */ +/* caddr_t b_iodone; I/O completion routine */ + int b_error; /* expanded error field */ +/* dev_t b_edev; extended device */ } bufinfo_t; #pragma D binding "1.0" translator translator bufinfo_t < struct bio *B > { - b_flags = B->bio_flags; - b_bcount = B->bio_bcount; - b_addr = B->bio_data; - b_blkno = 0; - b_lblkno = 0; - b_resid = B->bio_resid; - b_bufsize = 0; /* XXX gnn */ - b_error = B->bio_error; + b_flags = B->bio_flags; + b_bcount = B->bio_bcount; + b_addr = B->bio_data; + b_blkno = 0; + b_lblkno = 0; + b_resid = B->bio_resid; + b_bufsize = 0; /* XXX gnn */ + b_error = B->bio_error; }; /* @@ -105,5 +105,3 @@ inline int O_SYNC = 0x0080; #pragma D binding "1.1" O_SYNC inline int O_TRUNC = 0x0400; #pragma D binding "1.1" O_TRUNC - - Modified: projects/zfsd/head/cddl/lib/libdtrace/ip.d ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/ip.d Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/ip.d Thu Feb 15 17:27:34 2018 (r329324) @@ -215,10 +215,10 @@ translator csinfo_t < void *p > { #pragma D binding "1.6.3" translator translator csinfo_t < struct inpcb *p > { - cs_addr = NULL; - cs_cid = (uint64_t)p; - cs_pid = 0; /* XXX */ - cs_zoneid = 0; + cs_addr = NULL; + cs_cid = (uint64_t)p; + cs_pid = 0; /* XXX */ + cs_zoneid = 0; }; #pragma D binding "1.5" translator Modified: projects/zfsd/head/cddl/lib/libdtrace/libproc_compat.h ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/libproc_compat.h Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/libproc_compat.h Thu Feb 15 17:27:34 2018 (r329324) @@ -4,7 +4,7 @@ * * This software was developed by Rui Paulo under sponsorship from the * FreeBSD Foundation. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: Modified: projects/zfsd/head/cddl/lib/libdtrace/psinfo.d ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/psinfo.d Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/psinfo.d Thu Feb 15 17:27:34 2018 (r329324) @@ -97,4 +97,3 @@ inline psinfo_t *curpsinfo = xlate (curth inline lwpsinfo_t *curlwpsinfo = xlate (curthread); #pragma D attributes Stable/Stable/Common curlwpsinfo #pragma D binding "1.0" curlwpsinfo - Modified: projects/zfsd/head/cddl/lib/libdtrace/regs_x86.d ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/regs_x86.d Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/regs_x86.d Thu Feb 15 17:27:34 2018 (r329324) @@ -1,4 +1,4 @@ -/* +/* * CDDL HEADER START * * The contents of this file are subject to the terms of the @@ -116,4 +116,3 @@ inline int R_R14 = 18 + 1 + 1; #pragma D binding "1.0" R_R14 inline int R_R15 = 18 + 1 + 0; #pragma D binding "1.0" R_R15 - Modified: projects/zfsd/head/cddl/lib/libdtrace/sched.d ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/sched.d Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/sched.d Thu Feb 15 17:27:34 2018 (r329324) @@ -81,4 +81,3 @@ inline chipid_t chip = curcpu->cpu_chip; inline lgrp_id_t lgrp = curcpu->cpu_lgrp; #pragma D attributes Stable/Stable/Common lgrp #pragma D binding "1.0" lgrp - Modified: projects/zfsd/head/cddl/lib/libdtrace/tcp.d ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/tcp.d Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/tcp.d Thu Feb 15 17:27:34 2018 (r329324) @@ -118,18 +118,18 @@ typedef struct tcpsinfo { int32_t tcps_rcv_ws; /* receive window scaling */ u_long tcps_cwnd; /* congestion window */ u_long tcps_cwnd_ssthresh; /* threshold for congestion avoidance */ - uint32_t tcps_srecover; /* for use in NewReno Fast Recovery */ + uint32_t tcps_srecover; /* for use in NewReno Fast Recovery */ uint32_t tcps_sack_fack; /* SACK sequence # we have acked */ uint32_t tcps_sack_snxt; /* next SACK seq # for retransmission */ uint32_t tcps_rto; /* round-trip timeout, msec */ uint32_t tcps_mss; /* max segment size */ int tcps_retransmit; /* retransmit send event, boolean */ int tcps_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */ - int tcps_debug; /* socket has SO_DEBUG set */ - int tcps_cookie; /* expose the socket's SO_USER_COOKIE */ - int32_t tcps_dupacks; /* consecutive dup acks received */ - uint32_t tcps_rtttime; /* RTT measurement start time */ - uint32_t tcps_rtseq; /* sequence # being timed */ + int tcps_debug; /* socket has SO_DEBUG set */ + int tcps_cookie; /* expose the socket's SO_USER_COOKIE */ + int32_t tcps_dupacks; /* consecutive dup acks received */ + uint32_t tcps_rtttime; /* RTT measurement start time */ + uint32_t tcps_rtseq; /* sequence # being timed */ uint32_t tcps_ts_recent; /* timestamp echo data */ } tcpsinfo_t; @@ -206,31 +206,31 @@ translator tcpsinfo_t < struct tcpcb *p > { tcps_snxt = p == NULL ? 0 : p->snd_nxt; tcps_rack = p == NULL ? 0 : p->last_ack_sent; tcps_rnxt = p == NULL ? 0 : p->rcv_nxt; - tcps_swnd = p == NULL ? -1 : p->snd_wnd; - tcps_snd_ws = p == NULL ? -1 : p->snd_scale; - tcps_swl1 = p == NULL ? -1 : p->snd_wl1; - tcps_swl2 = p == NULL ? -1 : p->snd_wl2; - tcps_radv = p == NULL ? -1 : p->rcv_adv; - tcps_rwnd = p == NULL ? -1 : p->rcv_wnd; - tcps_rup = p == NULL ? -1 : p->rcv_up; - tcps_rcv_ws = p == NULL ? -1 : p->rcv_scale; - tcps_cwnd = p == NULL ? -1 : p->snd_cwnd; - tcps_cwnd_ssthresh = p == NULL ? -1 : p->snd_ssthresh; - tcps_srecover = p == NULL ? -1 : p->snd_recover; + tcps_swnd = p == NULL ? -1 : p->snd_wnd; + tcps_snd_ws = p == NULL ? -1 : p->snd_scale; + tcps_swl1 = p == NULL ? -1 : p->snd_wl1; + tcps_swl2 = p == NULL ? -1 : p->snd_wl2; + tcps_radv = p == NULL ? -1 : p->rcv_adv; + tcps_rwnd = p == NULL ? -1 : p->rcv_wnd; + tcps_rup = p == NULL ? -1 : p->rcv_up; + tcps_rcv_ws = p == NULL ? -1 : p->rcv_scale; + tcps_cwnd = p == NULL ? -1 : p->snd_cwnd; + tcps_cwnd_ssthresh = p == NULL ? -1 : p->snd_ssthresh; + tcps_srecover = p == NULL ? -1 : p->snd_recover; tcps_sack_fack = p == NULL ? 0 : p->snd_fack; tcps_sack_snxt = p == NULL ? 0 : p->sack_newdata; tcps_rto = p == NULL ? -1 : (p->t_rxtcur * 1000) / `hz; - tcps_mss = p == NULL ? -1 : p->t_maxseg; + tcps_mss = p == NULL ? -1 : p->t_maxseg; tcps_retransmit = p == NULL ? -1 : p->t_rxtshift > 0 ? 1 : 0; - tcps_srtt = p == NULL ? -1 : p->t_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */ + tcps_srtt = p == NULL ? -1 : p->t_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */ tcps_debug = p == NULL ? 0 : p->t_inpcb->inp_socket->so_options & 1; tcps_cookie = p == NULL ? -1 : p->t_inpcb->inp_socket->so_user_cookie; - tcps_dupacks = p == NULL ? -1 : p->t_dupacks; - tcps_rtttime = p == NULL ? -1 : p->t_rtttime; - tcps_rtseq = p == NULL ? -1 : p->t_rtseq; - tcps_ts_recent = p == NULL ? -1 : p->ts_recent; + tcps_dupacks = p == NULL ? -1 : p->t_dupacks; + tcps_rtttime = p == NULL ? -1 : p->t_rtttime; + tcps_rtseq = p == NULL ? -1 : p->t_rtseq; + tcps_ts_recent = p == NULL ? -1 : p->ts_recent; }; #pragma D binding "1.6.3" translator @@ -319,74 +319,74 @@ inline int PRU_LISTEN = 3; #pragma D binding "1.12.1" PRU_CONNECT inline int PRU_CONNECT = 4; #pragma D binding "1.12.1" PRU_ACCEPT -inline int PRU_ACCEPT = 5 ; +inline int PRU_ACCEPT = 5 ; #pragma D binding "1.12.1" PRU_DISCONNECT -inline int PRU_DISCONNECT= 6; +inline int PRU_DISCONNECT = 6; #pragma D binding "1.12.1" PRU_SHUTDOWN -inline int PRU_SHUTDOWN = 7; +inline int PRU_SHUTDOWN = 7; #pragma D binding "1.12.1" PRU_RCVD -inline int PRU_RCVD = 8; +inline int PRU_RCVD = 8; #pragma D binding "1.12.1" PRU_SEND -inline int PRU_SEND = 9; +inline int PRU_SEND = 9; #pragma D binding "1.12.1" PRU_ABORT -inline int PRU_ABORT = 10; +inline int PRU_ABORT = 10; #pragma D binding "1.12.1" PRU_CONTROL -inline int PRU_CONTROL = 11; +inline int PRU_CONTROL = 11; #pragma D binding "1.12.1" PRU_SENSE -inline int PRU_SENSE = 12; +inline int PRU_SENSE = 12; #pragma D binding "1.12.1" PRU_RCVOOB -inline int PRU_RCVOOB = 13; +inline int PRU_RCVOOB = 13; #pragma D binding "1.12.1" PRU_SENDOOB -inline int PRU_SENDOOB = 14; +inline int PRU_SENDOOB = 14; #pragma D binding "1.12.1" PRU_SOCKADDR -inline int PRU_SOCKADDR = 15; +inline int PRU_SOCKADDR = 15; #pragma D binding "1.12.1" PRU_PEERADDR -inline int PRU_PEERADDR = 16; +inline int PRU_PEERADDR = 16; #pragma D binding "1.12.1" PRU_CONNECT2 -inline int PRU_CONNECT2 = 17; +inline int PRU_CONNECT2 = 17; #pragma D binding "1.12.1" PRU_FASTTIMO -inline int PRU_FASTTIMO = 18; +inline int PRU_FASTTIMO = 18; #pragma D binding "1.12.1" PRU_SLOWTIMO -inline int PRU_SLOWTIMO = 19; +inline int PRU_SLOWTIMO = 19; #pragma D binding "1.12.1" PRU_PROTORCV -inline int PRU_PROTORCV = 20; +inline int PRU_PROTORCV = 20; #pragma D binding "1.12.1" PRU_PROTOSEND -inline int PRU_PROTOSEND = 21; +inline int PRU_PROTOSEND = 21; #pragma D binding "1.12.1" PRU_SEND_EOF -inline int PRU_SEND_EOF = 22; +inline int PRU_SEND_EOF = 22; #pragma D binding "1.12.1" PRU_SOSETLABEL -inline int PRU_SOSETLABEL = 23; +inline int PRU_SOSETLABEL = 23; #pragma D binding "1.12.1" PRU_CLOSE -inline int PRU_CLOSE = 24; +inline int PRU_CLOSE = 24; #pragma D binding "1.12.1" PRU_FLUSH -inline int PRU_FLUSH = 25; +inline int PRU_FLUSH = 25; #pragma D binding "1.12.1" prureq_string inline string prureq_string[uint8_t req] = - req == PRU_ATTACH ? "ATTACH" : - req == PRU_DETACH ? "DETACH" : - req == PRU_BIND ? "BIND" : - req == PRU_LISTEN ? "LISTEN" : - req == PRU_CONNECT ? "CONNECT" : - req == PRU_ACCEPT ? "ACCEPT" : - req == PRU_DISCONNECT ? "DISCONNECT" : - req == PRU_SHUTDOWN ? "SHUTDOWN" : - req == PRU_RCVD ? "RCVD" : - req == PRU_SEND ? "SEND" : - req == PRU_ABORT ? "ABORT" : - req == PRU_CONTROL ? "CONTROL" : - req == PRU_SENSE ? "SENSE" : - req == PRU_RCVOOB ? "RCVOOB" : - req == PRU_SENDOOB ? "SENDOOB" : - req == PRU_SOCKADDR ? "SOCKADDR" : - req == PRU_PEERADDR ? "PEERADDR" : - req == PRU_CONNECT2 ? "CONNECT2" : - req == PRU_FASTTIMO ? "FASTTIMO" : - req == PRU_SLOWTIMO ? "SLOWTIMO" : - req == PRU_PROTORCV ? "PROTORCV" : - req == PRU_PROTOSEND ? "PROTOSEND" : - req == PRU_SEND ? "SEND_EOF" : - req == PRU_SOSETLABEL ? "SOSETLABEL" : - req == PRU_CLOSE ? "CLOSE" : - req == PRU_FLUSH ? "FLUSE" : + req == PRU_ATTACH ? "ATTACH" : + req == PRU_DETACH ? "DETACH" : + req == PRU_BIND ? "BIND" : + req == PRU_LISTEN ? "LISTEN" : + req == PRU_CONNECT ? "CONNECT" : + req == PRU_ACCEPT ? "ACCEPT" : + req == PRU_DISCONNECT ? "DISCONNECT" : + req == PRU_SHUTDOWN ? "SHUTDOWN" : + req == PRU_RCVD ? "RCVD" : + req == PRU_SEND ? "SEND" : + req == PRU_ABORT ? "ABORT" : + req == PRU_CONTROL ? "CONTROL" : + req == PRU_SENSE ? "SENSE" : + req == PRU_RCVOOB ? "RCVOOB" : + req == PRU_SENDOOB ? "SENDOOB" : + req == PRU_SOCKADDR ? "SOCKADDR" : + req == PRU_PEERADDR ? "PEERADDR" : + req == PRU_CONNECT2 ? "CONNECT2" : + req == PRU_FASTTIMO ? "FASTTIMO" : + req == PRU_SLOWTIMO ? "SLOWTIMO" : + req == PRU_PROTORCV ? "PROTORCV" : + req == PRU_PROTOSEND ? "PROTOSEND" : + req == PRU_SEND ? "SEND_EOF" : + req == PRU_SOSETLABEL ? "SOSETLABEL" : + req == PRU_CLOSE ? "CLOSE" : + req == PRU_FLUSH ? "FLUSE" : "unknown" ; Modified: projects/zfsd/head/cddl/lib/libdtrace/udp.d ============================================================================== --- projects/zfsd/head/cddl/lib/libdtrace/udp.d Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/lib/libdtrace/udp.d Thu Feb 15 17:27:34 2018 (r329324) @@ -47,7 +47,7 @@ typedef struct udpinfo { uint16_t udp_sport; /* source port */ uint16_t udp_dport; /* destination port */ uint16_t udp_length; /* total length */ - uint16_t udp_checksum; /* headers + data checksum */ + uint16_t udp_checksum; /* headers + data checksum */ struct udphdr *udp_hdr; /* raw UDP header */ } udpinfo_t; Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc Thu Feb 15 17:27:34 2018 (r329324) @@ -442,10 +442,38 @@ CaseFile::ReEvaluate(const ZfsEvent &event) return (consumed || closed); } +/* Find a Vdev containing the vdev with the given GUID */ +static nvlist_t* +find_parent(nvlist_t *pool_config, nvlist_t *config, DevdCtl::Guid child_guid) +{ + nvlist_t **vdevChildren; + int error; + unsigned ch, numChildren; + error = nvlist_lookup_nvlist_array(config, ZPOOL_CONFIG_CHILDREN, + &vdevChildren, &numChildren); + + if (error != 0 || numChildren == 0) + return (NULL); + + for (ch = 0; ch < numChildren; ch++) { + nvlist *result; + Vdev vdev(pool_config, vdevChildren[ch]); + + if (vdev.GUID() == child_guid) + return (config); + + result = find_parent(pool_config, vdevChildren[ch], child_guid); + if (result != NULL) + return (result); + } + + return (NULL); +} + bool CaseFile::ActivateSpare() { - nvlist_t *config, *nvroot; + nvlist_t *config, *nvroot, *parent_config; nvlist_t **spares; char *devPath, *vdev_type; const char *poolname; @@ -472,6 +500,22 @@ CaseFile::ActivateSpare() { "tree for pool %s", poolname); return (false); } + + parent_config = find_parent(config, nvroot, m_vdevGUID); + if (parent_config != NULL) { + char *parent_type; + + /* + * Don't activate spares for members of a "replacing" vdev. + * They're already dealt with. Sparing them will just drag out + * the resilver process. + */ + error = nvlist_lookup_string(parent_config, + ZPOOL_CONFIG_TYPE, &parent_type); + if (error == 0 && strcmp(parent_type, VDEV_TYPE_REPLACING) == 0) + return (false); + } + nspares = 0; nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_SPARES, &spares, &nspares); Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd.cc Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd.cc Thu Feb 15 17:27:34 2018 (r329324) @@ -98,7 +98,6 @@ int ZfsDaemon::s_signalPipeFD[2]; bool ZfsDaemon::s_systemRescanRequested(false); EventFactory::Record ZfsDaemon::s_registryEntries[] = { - { Event::NOTIFY, "DEVFS", &DevfsEvent::Builder }, { Event::NOTIFY, "GEOM", &GeomEvent::Builder }, { Event::NOTIFY, "ZFS", &ZfsEvent::Builder } }; Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc Thu Feb 15 17:27:19 2018 (r329323) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/zfsd_event.cc Thu Feb 15 17:27:34 2018 (r329324) @@ -76,111 +76,32 @@ using std::stringstream; /*=========================== Class Implementations ==========================*/ -/*-------------------------------- DevfsEvent --------------------------------*/ +/*-------------------------------- GeomEvent --------------------------------*/ -//- DevfsEvent Static Public Methods ------------------------------------------- +//- GeomEvent Static Public Methods ------------------------------------------- Event * -DevfsEvent::Builder(Event::Type type, - NVPairMap &nvPairs, - const string &eventString) +GeomEvent::Builder(Event::Type type, + NVPairMap &nvPairs, + const string &eventString) { - return (new DevfsEvent(type, nvPairs, eventString)); + return (new GeomEvent(type, nvPairs, eventString)); } -//- DevfsEvent Static Protected Methods ---------------------------------------- -nvlist_t * -DevfsEvent::ReadLabel(int devFd, bool &inUse, bool °raded) -{ - pool_state_t poolState; - char *poolName; - boolean_t b_inuse; - int nlabels; - - inUse = false; - degraded = false; - poolName = NULL; - if (zpool_in_use(g_zfsHandle, devFd, &poolState, - &poolName, &b_inuse) == 0) { - nvlist_t *devLabel = NULL; - - inUse = b_inuse == B_TRUE; - if (poolName != NULL) - free(poolName); - - nlabels = zpool_read_all_labels(devFd, &devLabel); - /* - * If we find a disk with fewer than the maximum number of - * labels, it might be the whole disk of a partitioned disk - * where ZFS resides on a partition. In that case, we should do - * nothing and wait for the partition to appear. Or, the disk - * might be damaged. In that case, zfsd should do nothing and - * wait for the sysadmin to decide. - */ - if (nlabels != VDEV_LABELS || devLabel == NULL) { - nvlist_free(devLabel); - return (NULL); - } - - try { - Vdev vdev(devLabel); - degraded = vdev.State() != VDEV_STATE_HEALTHY; - return (devLabel); - } catch (ZfsdException &exp) { - string devName = fdevname(devFd); - string devPath = _PATH_DEV + devName; - string context("DevfsEvent::ReadLabel: " - + devPath + ": "); - - exp.GetString().insert(0, context); - exp.Log(); - nvlist_free(devLabel); - } - } - return (NULL); -} - -bool -DevfsEvent::OnlineByLabel(const string &devPath, const string& physPath, - nvlist_t *devConfig) -{ - try { - /* - * A device with ZFS label information has been - * inserted. If it matches a device for which we - * have a case, see if we can solve that case. - */ - syslog(LOG_INFO, "Interrogating VDEV label for %s\n", - devPath.c_str()); - Vdev vdev(devConfig); - CaseFile *caseFile(CaseFile::Find(vdev.PoolGUID(), - vdev.GUID())); - if (caseFile != NULL) - return (caseFile->ReEvaluate(devPath, physPath, &vdev)); - - } catch (ZfsdException &exp) { - string context("DevfsEvent::OnlineByLabel: " + devPath + ": "); - - exp.GetString().insert(0, context); - exp.Log(); - } - return (false); -} - -//- DevfsEvent Virtual Public Methods ------------------------------------------ +//- GeomEvent Virtual Public Methods ------------------------------------------ Event * -DevfsEvent::DeepCopy() const +GeomEvent::DeepCopy() const { - return (new DevfsEvent(*this)); + return (new GeomEvent(*this)); } - + bool -DevfsEvent::Process() const +GeomEvent::Process() const { /* - * We are only concerned with newly discovered - * devices that can be ZFS vdevs. + * We are only concerned with create arrivals and physical path changes, + * because those can be used to satisfy online and autoreplace operations */ - if (Value("type") != "CREATE" || !IsDiskDev()) + if (Value("type") != "GEOM::physpath" && Value("type") != "CREATE") return (false); /* Log the event since it is of interest. */ @@ -199,7 +120,7 @@ DevfsEvent::Process() const nvlist_t *devLabel(ReadLabel(devFd, inUse, degraded)); string physPath; - bool havePhysPath(PhysicalPath(physPath)); + bool havePhysPath(PhysicalPath(physPath)); string devName; DevName(devName); @@ -211,8 +132,8 @@ DevfsEvent::Process() const syslog(LOG_INFO, "%s is marked degraded. Ignoring " "as a replace by physical path candidate.\n", devName.c_str()); - } else if (havePhysPath && IsWholeDev()) { - /* + } else if (havePhysPath) { + /* * TODO: attempt to resolve events using every casefile * that matches this physpath */ @@ -227,93 +148,97 @@ DevfsEvent::Process() const caseFile->ReEvaluate(devPath, physPath, /*vdev*/NULL); } } - if (devLabel != NULL) - nvlist_free(devLabel); return (false); } -//- DevfsEvent Protected Methods ----------------------------------------------- -DevfsEvent::DevfsEvent(Event::Type type, NVPairMap &nvpairs, +//- GeomEvent Protected Methods ----------------------------------------------- +GeomEvent::GeomEvent(Event::Type type, NVPairMap &nvpairs, const string &eventString) - : DevdCtl::DevfsEvent(type, nvpairs, eventString) + : DevdCtl::GeomEvent(type, nvpairs, eventString) { } -DevfsEvent::DevfsEvent(const DevfsEvent &src) - : DevdCtl::DevfsEvent::DevfsEvent(src) +GeomEvent::GeomEvent(const GeomEvent &src) + : DevdCtl::GeomEvent::GeomEvent(src) { } -/*-------------------------------- GeomEvent --------------------------------*/ - -//- GeomEvent Static Public Methods ------------------------------------------- -Event * -GeomEvent::Builder(Event::Type type, - NVPairMap &nvPairs, - const string &eventString) +nvlist_t * +GeomEvent::ReadLabel(int devFd, bool &inUse, bool °raded) { - return (new GeomEvent(type, nvPairs, eventString)); -} + pool_state_t poolState; + char *poolName; + boolean_t b_inuse; + int nlabels; -//- GeomEvent Virtual Public Methods ------------------------------------------ -Event * -GeomEvent::DeepCopy() const -{ - return (new GeomEvent(*this)); -} - -bool -GeomEvent::Process() const -{ - /* - * We are only concerned with physical path changes, because those can - * be used to satisfy autoreplace operations - */ - if (Value("type") != "GEOM::physpath" || !IsDiskDev()) - return (false); + inUse = false; + degraded = false; + poolName = NULL; + if (zpool_in_use(g_zfsHandle, devFd, &poolState, + &poolName, &b_inuse) == 0) { + nvlist_t *devLabel = NULL; - /* Log the event since it is of interest. */ - Log(LOG_INFO); + inUse = b_inuse == B_TRUE; + if (poolName != NULL) + free(poolName); - string devPath; - if (!DevPath(devPath)) - return (false); + nlabels = zpool_read_all_labels(devFd, &devLabel); + /* + * If we find a disk with fewer than the maximum number of + * labels, it might be the whole disk of a partitioned disk + * where ZFS resides on a partition. In that case, we should do + * nothing and wait for the partition to appear. Or, the disk + * might be damaged. In that case, zfsd should do nothing and + * wait for the sysadmin to decide. + */ + if (nlabels != VDEV_LABELS || devLabel == NULL) { + nvlist_free(devLabel); + return (NULL); + } - string physPath; - bool havePhysPath(PhysicalPath(physPath)); + try { + Vdev vdev(devLabel); + degraded = vdev.State() != VDEV_STATE_HEALTHY; + return (devLabel); + } catch (ZfsdException &exp) { + string devName = fdevname(devFd); + string devPath = _PATH_DEV + devName; + string context("GeomEvent::ReadLabel: " + + devPath + ": "); - string devName; - DevName(devName); - - if (havePhysPath) { - /* - * TODO: attempt to resolve events using every casefile - * that matches this physpath - */ - CaseFile *caseFile(CaseFile::Find(physPath)); - if (caseFile != NULL) { - syslog(LOG_INFO, - "Found CaseFile(%s:%s:%s) - ReEvaluating\n", - caseFile->PoolGUIDString().c_str(), - caseFile->VdevGUIDString().c_str(), - zpool_state_to_name(caseFile->VdevState(), - VDEV_AUX_NONE)); - caseFile->ReEvaluate(devPath, physPath, /*vdev*/NULL); + exp.GetString().insert(0, context); + exp.Log(); + nvlist_free(devLabel); } } - return (false); + return (NULL); } -//- GeomEvent Protected Methods ----------------------------------------------- -GeomEvent::GeomEvent(Event::Type type, NVPairMap &nvpairs, - const string &eventString) - : DevdCtl::GeomEvent(type, nvpairs, eventString) +bool +GeomEvent::OnlineByLabel(const string &devPath, const string& physPath, + nvlist_t *devConfig) { -} + try { + /* + * A device with ZFS label information has been + * inserted. If it matches a device for which we + * have a case, see if we can solve that case. + */ + syslog(LOG_INFO, "Interrogating VDEV label for %s\n", + devPath.c_str()); + Vdev vdev(devConfig); + CaseFile *caseFile(CaseFile::Find(vdev.PoolGUID(), + vdev.GUID())); + if (caseFile != NULL) + return (caseFile->ReEvaluate(devPath, physPath, &vdev)); -GeomEvent::GeomEvent(const GeomEvent &src) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Fri Feb 16 20:40:06 2018 Return-Path: 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 70CB0F10291 for ; Fri, 16 Feb 2018 20:40:06 +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 22E1C70EED; Fri, 16 Feb 2018 20:40:06 +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 19A6C12A4D; Fri, 16 Feb 2018 20:40:06 +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 w1GKe5lr015129; Fri, 16 Feb 2018 20:40:05 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1GKe5H5015128; Fri, 16 Feb 2018 20:40:05 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802162040.w1GKe5H5015128@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 16 Feb 2018 20:40:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329408 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies X-SVN-Commit-Revision: 329408 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Feb 2018 20:40:06 -0000 Author: asomers Date: Fri Feb 16 20:40:05 2018 New Revision: 329408 URL: https://svnweb.freebsd.org/changeset/base/329408 Log: Skip zfs_copies_006_pos It frequently triggers a g_access leak, creating a non-destroyable pool PR: 225960 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh 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 Fri Feb 16 20:26:18 2018 (r329407) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh Fri Feb 16 20:40:05 2018 (r329408) @@ -168,6 +168,7 @@ zfs_copies_006_pos_body() . $(atf_get_srcdir)/zfs_copies.cfg verify_disk_count "$DISKS" 1 + atf_skip "PR 225960 g_access leak when unmounting UFS on a zvol" ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_copies_006_pos.ksh || atf_fail "Testcase failed" } From owner-svn-src-projects@freebsd.org Fri Feb 16 20:44:51 2018 Return-Path: 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 46A3AF10930 for ; Fri, 16 Feb 2018 20:44:51 +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 E857F7144C; Fri, 16 Feb 2018 20:44:50 +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 E359712BE2; Fri, 16 Feb 2018 20:44:50 +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 w1GKioAn020058; Fri, 16 Feb 2018 20:44:50 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1GKioDk020057; Fri, 16 Feb 2018 20:44:50 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802162044.w1GKioDk020057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 16 Feb 2018 20:44:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329409 - 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: 329409 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Feb 2018 20:44:51 -0000 Author: asomers Date: Fri Feb 16 20:44:50 2018 New Revision: 329409 URL: https://svnweb.freebsd.org/changeset/base/329409 Log: Skip the zfs snapshot tests when no disks are defined 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 16 20:40:05 2018 (r329408) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Fri Feb 16 20:44:50 2018 (r329409) @@ -36,6 +36,7 @@ clone_001_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/clone_001_pos.ksh || atf_fail "Testcase failed" } @@ -59,6 +60,7 @@ rollback_001_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rollback_001_pos.ksh || atf_fail "Testcase failed" } @@ -82,6 +84,7 @@ rollback_002_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rollback_002_pos.ksh || atf_fail "Testcase failed" } @@ -105,6 +108,7 @@ rollback_003_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rollback_003_pos.ksh || atf_fail "Testcase failed" } @@ -128,6 +132,7 @@ snapshot_001_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_001_pos.ksh || atf_fail "Testcase failed" } @@ -151,6 +156,7 @@ snapshot_002_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_002_pos.ksh || atf_fail "Testcase failed" } @@ -174,6 +180,7 @@ snapshot_003_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_003_pos.ksh || atf_fail "Testcase failed" } @@ -197,6 +204,7 @@ snapshot_004_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_004_pos.ksh || atf_fail "Testcase failed" } @@ -220,6 +228,7 @@ snapshot_005_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_005_pos.ksh || atf_fail "Testcase failed" } @@ -243,6 +252,7 @@ snapshot_006_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_006_pos.ksh || atf_fail "Testcase failed" } @@ -266,6 +276,7 @@ snapshot_007_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_007_pos.ksh || atf_fail "Testcase failed" } @@ -289,6 +300,7 @@ snapshot_008_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_008_pos.ksh || atf_fail "Testcase failed" } @@ -312,6 +324,7 @@ snapshot_009_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_009_pos.ksh || atf_fail "Testcase failed" } @@ -335,6 +348,7 @@ snapshot_010_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_010_pos.ksh || atf_fail "Testcase failed" } @@ -358,6 +372,7 @@ snapshot_011_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_011_pos.ksh || atf_fail "Testcase failed" } @@ -381,6 +396,7 @@ snapshot_012_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_012_pos.ksh || atf_fail "Testcase failed" } @@ -404,6 +420,7 @@ snapshot_013_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_013_pos.ksh || atf_fail "Testcase failed" } @@ -427,6 +444,7 @@ snapshot_014_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_014_pos.ksh || atf_fail "Testcase failed" } @@ -451,6 +469,7 @@ snapshot_015_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_015_pos.ksh || atf_fail "Testcase failed" } @@ -475,6 +494,7 @@ snapshot_016_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_016_pos.ksh || atf_fail "Testcase failed" } @@ -498,6 +518,7 @@ snapshot_017_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_017_pos.ksh || atf_fail "Testcase failed" } @@ -521,6 +542,7 @@ snapshot_018_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_018_pos.ksh || atf_fail "Testcase failed" } @@ -546,6 +568,7 @@ snapshot_019_pos_body() . $(atf_get_srcdir)/snapshot.cfg atf_skip "PR 225795 panic: found unreferenced mountpoint when accessing and unmounting snapshots in parallel" + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_019_pos.ksh || atf_fail "Testcase failed" } @@ -568,6 +591,7 @@ snapshot_020_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_020_pos.ksh || atf_fail "Testcase failed" }