From owner-svn-src-all@freebsd.org Thu Mar 15 12:47:35 2018 Return-Path: Delivered-To: svn-src-all@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 7CF21F4F239; Thu, 15 Mar 2018 12:47:35 +0000 (UTC) (envelope-from avg@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 27A257F2C4; Thu, 15 Mar 2018 12:47:35 +0000 (UTC) (envelope-from avg@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 087E116410; Thu, 15 Mar 2018 12:47:35 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FClYUt060566; Thu, 15 Mar 2018 12:47:34 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FClYZe060563; Thu, 15 Mar 2018 12:47:34 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151247.w2FClYZe060563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 12:47:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330996 - in head/tests/sys/cddl/zfs: include tests/cache tests/cli_root/zpool_add X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: in head/tests/sys/cddl/zfs: include tests/cache tests/cli_root/zpool_add X-SVN-Commit-Revision: 330996 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 12:47:35 -0000 Author: avg Date: Thu Mar 15 12:47:34 2018 New Revision: 330996 URL: https://svnweb.freebsd.org/changeset/base/330996 Log: zfs test suite: support device paths with intermediate directories The code assumed that disks (devices) used for testing are always named like /dev/foo, but there is no reason for that restriction and we can easily support paths like /dev/stripe/bar. Modified: head/tests/sys/cddl/zfs/include/libtest.kshlib head/tests/sys/cddl/zfs/tests/cache/cache.kshlib head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib Modified: head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Mar 15 12:44:13 2018 (r330995) +++ head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Mar 15 12:47:34 2018 (r330996) @@ -640,7 +640,7 @@ function wipe_partition_table # [/dev/null 2>&1; then + if gpart list ${diskname#/dev/} >/dev/null 2>&1; then wait_for 5 1 $GPART destroy -F $diskname else log_note "No GPT partitions detected on $diskname" Modified: head/tests/sys/cddl/zfs/tests/cache/cache.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Mar 15 12:44:13 2018 (r330995) +++ head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Mar 15 12:47:34 2018 (r330996) @@ -90,9 +90,7 @@ function verify_cache_device # Zpool status returns on the device name sans the /dev, so # if the device contains /dev/ remove it. - if [[ $device =~ "^/dev/" ]]; then - device=`basename ${device}` - fi + device=${device#"/dev/"} if [[ $WRAPPER == *"smi"* ]]; then $ECHO $device | $EGREP "^c[0-F]+([td][0-F]+)+$" > /dev/null 2>&1 Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib Thu Mar 15 12:44:13 2018 (r330995) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib Thu Mar 15 12:47:34 2018 (r330996) @@ -55,9 +55,7 @@ function iscontained for vdev in $@; do # remove /dev/dsk in vdev if there is - $ECHO $vdev | $GREP "^/dev/" >/dev/null 2>&1 - (( $? == 0 )) && \ - vdev=${vdev##*/} + vdev=${vdev#/dev/} $ZPOOL status "$pool" | $AWK '$1 == vdevname {exit 1}' \ vdevname=$vdev >/dev/null 2>&1