Index: stable/10/tools/regression/geom_nop/conf.sh
===================================================================
--- stable/10/tools/regression/geom_nop/conf.sh	(revision 296782)
+++ stable/10/tools/regression/geom_nop/conf.sh	(revision 296783)
@@ -1,7 +1,14 @@
 #!/bin/sh
 # $FreeBSD$
 
 class="nop"
 base=`basename $0`
 
+gnop_test_cleanup()
+{
+	[ -c /dev/${us}.nop ] && gnop destroy ${us}.nop
+	geom_test_cleanup
+}
+trap gnop_test_cleanup ABRT EXIT INT TERM
+
 . `dirname $0`/../geom_subr.sh
Index: stable/10/tools/regression/geom_nop/test-1.t
===================================================================
--- stable/10/tools/regression/geom_nop/test-1.t	(revision 296782)
+++ stable/10/tools/regression/geom_nop/test-1.t	(revision 296783)
@@ -1,25 +1,20 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
-us=45
+us=$(attach_md -t malloc -s 1M) || exit 1
 
-mdconfig -a -t malloc -s 1M -u $us || exit 1
+gnop create /dev/${us} || exit 1
 
-gnop create /dev/md${us} || exit 1
-
 # Size of created device should be 1MB.
 
-size=`diskinfo /dev/md${us}.nop | awk '{print $3}'`
+size=`diskinfo /dev/${us}.nop | awk '{print $3}'`
 
 if [ $size -eq 1048576 ]; then
 	echo "ok 1"
 else
 	echo "not ok 1"
 fi
-
-gnop destroy md${us}.nop
-mdconfig -d -u $us
Index: stable/10/tools/regression/geom_nop/test-2.t
===================================================================
--- stable/10/tools/regression/geom_nop/test-2.t	(revision 296782)
+++ stable/10/tools/regression/geom_nop/test-2.t	(revision 296783)
@@ -1,29 +1,26 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
-us=45
-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
 
 echo "1..1"
 
 dd if=/dev/random of=${src} bs=1m count=1 >/dev/null 2>&1
 
-mdconfig -a -t malloc -s 1M -u $us || exit 1
+us=$(attach_md -t malloc -s 1M) || exit 1
 
-gnop create /dev/md${us} || exit 1
+gnop create /dev/${us} || exit 1
 
-dd if=${src} of=/dev/md${us}.nop bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/md${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1
+dd if=${src} of=/dev/${us}.nop bs=1m count=1 >/dev/null 2>&1
+dd if=/dev/${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1
 
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-gnop destroy md${us}.nop
-mdconfig -d -u $us
 rm -f ${src} ${dst}
Index: stable/10
===================================================================
--- stable/10	(revision 296782)
+++ stable/10	(revision 296783)

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