Index: stable/10/tools/regression/geom_concat/conf.sh
===================================================================
--- stable/10/tools/regression/geom_concat/conf.sh	(revision 296776)
+++ stable/10/tools/regression/geom_concat/conf.sh	(revision 296777)
@@ -1,8 +1,15 @@
 #!/bin/sh
 # $FreeBSD$
 
 name="$(mktemp -u concat.XXXXXX)"
 class="concat"
 base=`basename $0`
 
+gconcat_test_cleanup()
+{
+	[ -c /dev/$class/$name ] && gconcat destroy $name
+	geom_test_cleanup
+}
+trap gconcat_test_cleanup ABRT EXIT INT TERM
+
 . `dirname $0`/../geom_subr.sh
Index: stable/10/tools/regression/geom_concat/test-1.t
===================================================================
--- stable/10/tools/regression/geom_concat/test-1.t	(revision 296776)
+++ stable/10/tools/regression/geom_concat/test-1.t	(revision 296777)
@@ -1,30 +1,23 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo '1..1'
 
-us=45
+us0=$(attach_md -t malloc -s 1M) || exit 1
+us1=$(attach_md -t malloc -s 2M) || exit 1
+us2=$(attach_md -t malloc -s 3M) || exit 1
 
-mdconfig -a -t malloc -s 1M -u $us || exit 1
-mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1
-mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1
-
-gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1
+gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1
 devwait
 
 # Size of created device should be 1MB + 2MB + 3MB.
 
 size=`diskinfo /dev/concat/${name} | awk '{print $3}'`
 
 if [ $size -eq 6291456 ]; then
 	echo "ok - Size is 6291456"
 else
 	echo "not ok - Size is 6291456"
 fi
-
-gconcat destroy $name
-mdconfig -d -u $us
-mdconfig -d -u `expr $us + 1`
-mdconfig -d -u `expr $us + 2`
Index: stable/10/tools/regression/geom_concat/test-2.t
===================================================================
--- stable/10/tools/regression/geom_concat/test-2.t	(revision 296776)
+++ stable/10/tools/regression/geom_concat/test-2.t	(revision 296777)
@@ -1,35 +1,30 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo '1..1'
 
-us=45
 tsize=6
-src=`mktemp /tmp/$base.XXXXXX` || exit 1
-dst=`mktemp /tmp/$base.XXXXXX` || exit 1
+src=`mktemp $base.XXXXXX` || exit 1
+dst=`mktemp $base.XXXXXX` || exit 1
 
+us0=$(attach_md -t malloc -s 1M) || exit 1
+us1=$(attach_md -t malloc -s 2M) || exit 1
+us2=$(attach_md -t malloc -s 3M) || exit 1
+
 dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1
 
-mdconfig -a -t malloc -s 1M -u $us || exit 1
-mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1
-mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1
-
-gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1
+gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1
 devwait
 
 dd if=${src} of=/dev/concat/${name} bs=1m count=$tsize >/dev/null 2>&1
 dd if=/dev/concat/${name} of=${dst} bs=1m count=$tsize >/dev/null 2>&1
 
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok - md5 checksum comparison"
 else
 	echo "ok - md5 checksum comparison"
 fi
 
-gconcat destroy $name
-mdconfig -d -u $us
-mdconfig -d -u `expr $us + 1`
-mdconfig -d -u `expr $us + 2`
 rm -f ${src} ${dst}
Index: stable/10
===================================================================
--- stable/10	(revision 296776)
+++ stable/10	(revision 296777)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r293434