From owner-svn-src-projects@freebsd.org Fri Aug 4 21:41:43 2017 Return-Path: <owner-svn-src-projects@freebsd.org> Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74415DCA83D for <svn-src-projects@mailman.ysv.freebsd.org>; Fri, 4 Aug 2017 21:41: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 mx1.freebsd.org (Postfix) with ESMTPS id 3A71C7D327; Fri, 4 Aug 2017 21:41: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 v74LfgfF049990; Fri, 4 Aug 2017 21:41:42 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v74Lfg6s049989; Fri, 4 Aug 2017 21:41:42 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708042141.v74Lfg6s049989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers <asomers@FreeBSD.org> Date: Fri, 4 Aug 2017 21:41:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322064 - projects/zfsd/head/tests/sys/cddl/zfs/include X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/include X-SVN-Commit-Revision: 322064 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.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 04 Aug 2017 21:41:43 -0000 Author: asomers Date: Fri Aug 4 21:41:42 2017 New Revision: 322064 URL: https://svnweb.freebsd.org/changeset/base/322064 Log: Don't fail a ZFS test if "zpool labelclear" fails tests/sys/cddl/zfs/include/libtest.kshlib Unlike the prototype implementation of labelclear, the final implementation fails if no label is found. So ignore the status during setup and teardown. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Aug 4 21:38:34 2017 (r322063) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Aug 4 21:41:42 2017 (r322064) @@ -1845,7 +1845,7 @@ function cleanup_devices #vdevs for device in $@; do # Labelclear must happen first, otherwise it may interfere # with the teardown/setup of GPT labels. - log_must $ZPOOL labelclear -f $device + $ZPOOL labelclear -f $device # Only wipe partition tables for arguments that are disks, # as opposed to slices (which are valid arguments here). if camcontrol inquiry $device >/dev/null 2>&1; then