From owner-svn-src-projects@freebsd.org Wed Dec 16 19:35:00 2015 Return-Path: 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 2239EA49880 for ; Wed, 16 Dec 2015 19:35: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 mx1.freebsd.org (Postfix) with ESMTPS id EFAA713BF; Wed, 16 Dec 2015 19:34:59 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBGJYxtM048339; Wed, 16 Dec 2015 19:34:59 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGJYwuG048333; Wed, 16 Dec 2015 19:34:58 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512161934.tBGJYwuG048333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 19:34:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292354 - in projects/zfsd/head/tests/sys/cddl/zfs: bin include tests/cli_root/zpool_clear tests/hotspare X-SVN-Group: projects 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.20 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, 16 Dec 2015 19:35:00 -0000 Author: asomers Date: Wed Dec 16 19:34:58 2015 New Revision: 292354 URL: https://svnweb.freebsd.org/changeset/base/292354 Log: Misc improvements to the ZFS test suite zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh Make the outlines of some parts of this test more obvious. zfs/include/libtest.kshlib zfs/tests/hotspare/hotspare_detach_001_pos.ksh Simplify test for "did the pool resilver happen?" zfs/include/Makefile Specify variables with variables, and not immediately after targets. zfs/bin/Makefile Style: expand variable assignments across multiple lines Submitted by: Will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_detach_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Wed Dec 16 19:30:44 2015 (r292353) +++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Wed Dec 16 19:34:58 2015 (r292354) @@ -6,19 +6,49 @@ MAN= BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin SCRIPTSDIR= ${TESTSBASE}/sys/cddl/zfs/bin -SCRIPTS+= bsddisks.ksh df.ksh dircmp.ksh dumpadm.ksh ff.ksh fmadm.ksh -SCRIPTS+= fmdump.ksh format.ksh fstyp.ksh groupadd.ksh groupdel.ksh -SCRIPTS+= groupmod.ksh groupshow.ksh svcs.ksh swap.ksh useradd.ksh -SCRIPTS+= userdel.ksh usermod.ksh zfs.ksh zfs_crypto.ksh -SCRIPTS+= zfs_version.ksh zlogin.ksh zoneadm.ksh zonecfg.ksh zpool.ksh -SCRIPTS+= zpool_bsd.ksh zpool_smi.ksh zpool_version.ksh +SCRIPTS+= bsddisks.ksh +SCRIPTS+= df.ksh +SCRIPTS+= dircmp.ksh +SCRIPTS+= dumpadm.ksh +SCRIPTS+= ff.ksh +SCRIPTS+= fmadm.ksh +SCRIPTS+= fmdump.ksh +SCRIPTS+= format.ksh +SCRIPTS+= fstyp.ksh +SCRIPTS+= groupadd.ksh +SCRIPTS+= groupdel.ksh +SCRIPTS+= groupmod.ksh +SCRIPTS+= groupshow.ksh +SCRIPTS+= svcs.ksh +SCRIPTS+= swap.ksh +SCRIPTS+= useradd.ksh +SCRIPTS+= userdel.ksh +SCRIPTS+= usermod.ksh +SCRIPTS+= zfs.ksh +SCRIPTS+= zfs_crypto.ksh +SCRIPTS+= zfs_version.ksh +SCRIPTS+= zlogin.ksh +SCRIPTS+= zoneadm.ksh +SCRIPTS+= zonecfg.ksh +SCRIPTS+= zpool.ksh +SCRIPTS+= zpool_bsd.ksh +SCRIPTS+= zpool_smi.ksh +SCRIPTS+= zpool_version.ksh -PROGS+= chg_usr_exec +PROGS+= chg_usr_exec # Not ported to FreeBSD -# PROGRS+= devname2devid -PROGS += dir_rd_update file_check file_trunc -PROGS+= file_write largest_file mktree mmapwrite randfree_file readmmap -PROGS+= rename_dir rm_lnkcnt_zero_file +# PROGRS+= devname2devid +PROGS+= dir_rd_update +PROGS+= file_check +PROGS+= file_trunc +PROGS+= file_write +PROGS+= largest_file +PROGS+= mktree +PROGS+= mmapwrite +PROGS+= randfree_file +PROGS+= readmmap +PROGS+= rename_dir +PROGS+= rm_lnkcnt_zero_file .for p in ${PROGS} SRCS.$p= $p.c Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Wed Dec 16 19:30:44 2015 (r292353) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Wed Dec 16 19:34:58 2015 (r292354) @@ -13,13 +13,13 @@ FILES+= libtest.kshlib FILES+= stf.shlib FILES+= commands.cfg +CLEANFILES+= commands.cfg commands.cfg: translatecommands.awk commands.txt awk -v stfsuitedir=${STFSUITEDIR} -f ${.ALLSRC} > ${.TARGET} -CLEANFILES+= commands.cfg FILES+= default.cfg +CLEANFILES+= default.cfg default.cfg: default.cfg.in sed "s:%%STFSUITEDIR%%:${STFSUITEDIR}:" ${.ALLSRC} > ${.TARGET} -CLEANFILES+= default.cfg .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Dec 16 19:30:44 2015 (r292353) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Dec 16 19:34:58 2015 (r292354) @@ -1652,6 +1652,12 @@ function is_pool_resilvered #pool return $? } +function resilver_happened # pool +{ + typeset pool=$1 + is_pool_resilvering "$pool" || is_pool_resilvered "$pool" +} + function is_pool_scrubbing #pool { check_pool_status "$1" "scan" "scrub in progress" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh Wed Dec 16 19:30:44 2015 (r292353) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh Wed Dec 16 19:34:58 2015 (r292354) @@ -147,6 +147,8 @@ function do_testing #