commit b6dbcceed2363e82162296e80d4767283f5b28bd
Author: Andriy Gapon <avg@icyb.net.ua>
Date:   Thu Feb 22 20:24:28 2018 +0200

    support intermediate directories in device paths

diff --git a/head/tests/sys/cddl/zfs/include/libtest.kshlib b/head/tests/sys/cddl/zfs/include/libtest.kshlib
index 2f0e98568b7e5..d5a9b1c239d30 100644
--- a/head/tests/sys/cddl/zfs/include/libtest.kshlib
+++ b/head/tests/sys/cddl/zfs/include/libtest.kshlib
@@ -638,7 +638,7 @@ function wipe_partition_table #<whole_disk_name> [<whole_disk_name> ...]
 	while [[ -n $* ]]; do
 		typeset diskname=$1
 		[ ! -e $diskname ] && log_fail "ERROR: $diskname doesn't exist"
-		if gpart list $(basename $diskname) >/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"
diff --git a/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib b/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib
index bcbd67627759b..6d9fcd029772f 100644
--- a/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib
+++ b/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib
@@ -88,9 +88,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