152 files changed, 804 insertions, 766 deletions

diff --git a/Makefile b/Makefile
index 981e002..9d18ba4 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@
 .else
 
 TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
-	check-old check-old-dirs check-old-files check-old-libs \
+	check check-old check-old-dirs check-old-files check-old-libs \
 	checkdpadd clean cleandepend cleandir cleanworld \
 	delete-old delete-old-dirs delete-old-files delete-old-libs \
 	depend distribute distributekernel distributekernel.debug \
@@ -121,7 +121,7 @@ TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
 	installkernel.debug packagekernel packageworld \
 	reinstallkernel reinstallkernel.debug \
 	installworld kernel-toolchain libraries lint maninstall \
-	obj objlink regress rerelease showconfig tags toolchain update \
+	obj objlink rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
 	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index ae20a55..3bfa30c 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -336,6 +336,42 @@
         ..
         devd
         ..
+        geom
+            class
+                concat
+                ..
+                eli
+                ..
+                gate
+                ..
+                gpt
+                ..
+                mirror
+                ..
+                nop
+                ..
+                raid3
+                ..
+                shsec
+                ..
+                stripe
+                ..
+                uzip
+                    etalon
+                    ..
+                ..
+            ..
+            core
+                ConfCmp
+                ..
+                Data
+                ..
+                MdLoad
+                ..
+                Ref
+                ..
+            ..
+        ..
         growfs
         ..
         ifconfig
diff --git a/sbin/geom/class/tests/Makefile b/sbin/geom/class/tests/Makefile
new file mode 100644
index 0000000..6213996
--- /dev/null
+++ b/sbin/geom/class/tests/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TESTS_SUBDIRS+=	concat
+TESTS_SUBDIRS+=	eli
+TESTS_SUBDIRS+=	gate
+# XXX: might not work due to geom(4) changes; more investigation's needed
+#TESTS_SUBDIRS+=	gpt
+TESTS_SUBDIRS+=	mirror
+TESTS_SUBDIRS+=	nop
+TESTS_SUBDIRS+=	raid3
+TESTS_SUBDIRS+=	shsec
+TESTS_SUBDIRS+=	stripe
+TESTS_SUBDIRS+=	uzip
+
+BINDIR=		${TESTSBASE}/sbin/geom/class
+
+FILES+=		geom_subr.sh
+
+.include <bsd.test.mk>
diff --git a/sbin/geom/class/tests/Makefile.inc b/sbin/geom/class/tests/Makefile.inc
new file mode 100644
index 0000000..522da0b
--- /dev/null
+++ b/sbin/geom/class/tests/Makefile.inc
@@ -0,0 +1,3 @@
+GEOM_CLASS=		${.CURDIR:T}
+
+TESTSDIR=		${TESTSBASE}/sbin/geom/class/${GEOM_CLASS}
diff --git a/tools/regression/geom_concat/test-1.t b/sbin/geom/class/tests/concat/1_test.sh
index 8984f79..8984f79 100644..100755
--- a/tools/regression/geom_concat/test-1.t
+++ b/sbin/geom/class/tests/concat/1_test.sh
diff --git a/tools/regression/geom_concat/test-2.t b/sbin/geom/class/tests/concat/2_test.sh
index 445d9bc..445d9bc 100644..100755
--- a/tools/regression/geom_concat/test-2.t
+++ b/sbin/geom/class/tests/concat/2_test.sh
diff --git a/sbin/geom/class/tests/concat/Makefile b/sbin/geom/class/tests/concat/Makefile
new file mode 100644
index 0000000..81a4e99
--- /dev/null
+++ b/sbin/geom/class/tests/concat/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_concat/conf.sh b/sbin/geom/class/tests/concat/conf.sh
index 0eaf1ba..0eaf1ba 100644..100755
--- a/tools/regression/geom_concat/conf.sh
+++ b/sbin/geom/class/tests/concat/conf.sh
diff --git a/sbin/geom/class/tests/eli/Makefile b/sbin/geom/class/tests/eli/Makefile
new file mode 100644
index 0000000..230cc3b
--- /dev/null
+++ b/sbin/geom/class/tests/eli/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+= attach_d_test
+TAP_TESTS_SH+= configure_b_B_test
+TAP_TESTS_SH+= delkey_test
+TAP_TESTS_SH+= detach_l_test
+TAP_TESTS_SH+= init_B_test
+TAP_TESTS_SH+= init_J_test
+TAP_TESTS_SH+= init_a_test
+TAP_TESTS_SH+= init_i_P_test
+TAP_TESTS_SH+= init_test
+TAP_TESTS_SH+= integrity_copy_test
+TAP_TESTS_SH+= integrity_data_test
+TAP_TESTS_SH+= integrity_hmac_test
+TAP_TESTS_SH+= kill_test
+TAP_TESTS_SH+= nokey_test
+TAP_TESTS_SH+= onetime_a_test
+TAP_TESTS_SH+= onetime_d_test
+TAP_TESTS_SH+= onetime_test
+TAP_TESTS_SH+= readonly_test
+TAP_TESTS_SH+= resize_test
+TAP_TESTS_SH+= setkey_test
+
+TEST_METADATA.init_a_test+=	timeout="1200"
+TEST_METADATA.init_test+=	timeout="300"
+TEST_METADATA.integrity_copy_test+=	timeout="1200"
+TEST_METADATA.integrity_data_test+=	timeout="600"
+TEST_METADATA.integrity_hmac_test+=	timeout="600"
+TEST_METADATA.onetime_test+=	timeout="300"
+TEST_METADATA.onetime_a_test+=	timeout="300"
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_eli/attach-d.t b/sbin/geom/class/tests/eli/attach_d_test.sh
index 4c4789e..d1a57ce 100644..100755
--- a/tools/regression/geom_eli/attach-d.t
+++ b/sbin/geom/class/tests/eli/attach_d_test.sh
@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..3"
diff --git a/tools/regression/geom_eli/configure-b-B.t b/sbin/geom/class/tests/eli/configure_b_B_test.sh
index 23aa412..23aa412 100644..100755
--- a/tools/regression/geom_eli/configure-b-B.t
+++ b/sbin/geom/class/tests/eli/configure_b_B_test.sh
diff --git a/tools/regression/geom_eli/delkey.t b/sbin/geom/class/tests/eli/delkey_test.sh
index a828622..ec839e6 100644..100755
--- a/tools/regression/geom_eli/delkey.t
+++ b/sbin/geom/class/tests/eli/delkey_test.sh
@@ -4,10 +4,10 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+keyfile2=`mktemp $base.XXXXXX` || exit 1
+keyfile3=`mktemp $base.XXXXXX` || exit 1
+keyfile4=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..14"
diff --git a/tools/regression/geom_eli/detach-l.t b/sbin/geom/class/tests/eli/detach_l_test.sh
index dfa3269..6645501 100644..100755
--- a/tools/regression/geom_eli/detach-l.t
+++ b/sbin/geom/class/tests/eli/detach_l_test.sh
@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..4"
diff --git a/tools/regression/geom_eli/init-B.t b/sbin/geom/class/tests/eli/init_B_test.sh
index 36ab873..70036af 100644..100755
--- a/tools/regression/geom_eli/init-B.t
+++ b/sbin/geom/class/tests/eli/init_B_test.sh
@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-backupfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+backupfile=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..13"
 
diff --git a/tools/regression/geom_eli/init-J.t b/sbin/geom/class/tests/eli/init_J_test.sh
index 6f2862f..3408637 100644..100755
--- a/tools/regression/geom_eli/init-J.t
+++ b/sbin/geom/class/tests/eli/init_J_test.sh
@@ -4,10 +4,10 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile0=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-passfile0=`mktemp /tmp/$base.XXXXXX` || exit 1
-passfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile0=`mktemp $base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+passfile0=`mktemp $base.XXXXXX` || exit 1
+passfile1=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..150"
diff --git a/tools/regression/geom_eli/init-a.t b/sbin/geom/class/tests/eli/init_a_test.sh
index 87612a2..e1f1b3f 100644..100755
--- a/tools/regression/geom_eli/init-a.t
+++ b/sbin/geom/class/tests/eli/init_a_test.sh
@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..1380"
 
@@ -26,7 +26,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
 		for secsize in 512 1024 2048 4096 8192; do
-			rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+			rnd=`mktemp $base.XXXXXX` || exit 1
 			mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
 
 			dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
diff --git a/tools/regression/geom_eli/init-i-P.t b/sbin/geom/class/tests/eli/init_i_P_test.sh
index a06f9f8..df0d138 100644..100755
--- a/tools/regression/geom_eli/init-i-P.t
+++ b/sbin/geom/class/tests/eli/init_i_P_test.sh
@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..1"
diff --git a/tools/regression/geom_eli/init.t b/sbin/geom/class/tests/eli/init_test.sh
index 6934443..c5765d0 100644..100755
--- a/tools/regression/geom_eli/init.t
+++ b/sbin/geom/class/tests/eli/init_test.sh
@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..460"
 
@@ -25,7 +25,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for secsize in 512 1024 2048 4096 8192; do
-		rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+		rnd=`mktemp $base.XXXXXX` || exit 1
 		mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
 
 		dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1
diff --git a/tools/regression/geom_eli/integrity-copy.t b/sbin/geom/class/tests/eli/integrity_copy_test.sh
index b52730a..742fb21 100644..100755
--- a/tools/regression/geom_eli/integrity-copy.t
+++ b/sbin/geom/class/tests/eli/integrity_copy_test.sh
@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sector=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+sector=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..5520"
 
diff --git a/tools/regression/geom_eli/integrity-data.t b/sbin/geom/class/tests/eli/integrity_data_test.sh
index 6975466..e02950b 100644..100755
--- a/tools/regression/geom_eli/integrity-data.t
+++ b/sbin/geom/class/tests/eli/integrity_data_test.sh
@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sector=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+sector=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..2760"
 
diff --git a/tools/regression/geom_eli/integrity-hmac.t b/sbin/geom/class/tests/eli/integrity_hmac_test.sh
index 33f6029..3cb4f8a 100644..100755
--- a/tools/regression/geom_eli/integrity-hmac.t
+++ b/sbin/geom/class/tests/eli/integrity_hmac_test.sh
@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sector=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+sector=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..2760"
 
diff --git a/tools/regression/geom_eli/kill.t b/sbin/geom/class/tests/eli/kill_test.sh
index 5c315f3..513e853 100644..100755
--- a/tools/regression/geom_eli/kill.t
+++ b/sbin/geom/class/tests/eli/kill_test.sh
@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+keyfile2=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..9"
diff --git a/tools/regression/geom_eli/nokey.t b/sbin/geom/class/tests/eli/nokey_test.sh
index 19ef680..f29150b 100644..100755
--- a/tools/regression/geom_eli/nokey.t
+++ b/sbin/geom/class/tests/eli/nokey_test.sh
@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..8"
diff --git a/tools/regression/geom_eli/onetime-a.t b/sbin/geom/class/tests/eli/onetime_a_test.sh
index ab19301..0fb3e5e 100644..100755
--- a/tools/regression/geom_eli/onetime-a.t
+++ b/sbin/geom/class/tests/eli/onetime_a_test.sh
@@ -25,7 +25,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
 		for secsize in 512 1024 2048 4096 8192; do
-			rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+			rnd=`mktemp $base.XXXXXX` || exit 1
 			mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
 
 			geli onetime -a $aalgo -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null
diff --git a/tools/regression/geom_eli/onetime-d.t b/sbin/geom/class/tests/eli/onetime_d_test.sh
index d49cb64..d49cb64 100644..100755
--- a/tools/regression/geom_eli/onetime-d.t
+++ b/sbin/geom/class/tests/eli/onetime_d_test.sh
diff --git a/tools/regression/geom_eli/onetime.t b/sbin/geom/class/tests/eli/onetime_test.sh
index 3a7d67e..267fc27 100644..100755
--- a/tools/regression/geom_eli/onetime.t
+++ b/sbin/geom/class/tests/eli/onetime_test.sh
@@ -24,7 +24,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for secsize in 512 1024 2048 4096 8192; do
-		rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+		rnd=`mktemp $base.XXXXXX` || exit 1
 		mdconfig -a -t malloc -s `expr $secsize \* $sectors`b -u $no || exit 1
 
 		geli onetime -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null
diff --git a/tools/regression/geom_eli/readonly.t b/sbin/geom/class/tests/eli/readonly_test.sh
index 210a364..74396b5 100644..100755
--- a/tools/regression/geom_eli/readonly.t
+++ b/sbin/geom/class/tests/eli/readonly_test.sh
@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..11"
diff --git a/tools/regression/geom_eli/resize.t b/sbin/geom/class/tests/eli/resize_test.sh
index 86ee364..86ee364 100644..100755
--- a/tools/regression/geom_eli/resize.t
+++ b/sbin/geom/class/tests/eli/resize_test.sh
diff --git a/tools/regression/geom_eli/setkey.t b/sbin/geom/class/tests/eli/setkey_test.sh
index 611471a..f2ebe77 100644..100755
--- a/tools/regression/geom_eli/setkey.t
+++ b/sbin/geom/class/tests/eli/setkey_test.sh
@@ -4,12 +4,12 @@
 base=`basename $0`
 no=45
 sectors=100
-rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile5=`mktemp /tmp/$base.XXXXXX` || exit 1
+rnd=`mktemp $base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+keyfile2=`mktemp $base.XXXXXX` || exit 1
+keyfile3=`mktemp $base.XXXXXX` || exit 1
+keyfile4=`mktemp $base.XXXXXX` || exit 1
+keyfile5=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..16"
diff --git a/sbin/geom/class/tests/gate/1_test.sh b/sbin/geom/class/tests/gate/1_test.sh
new file mode 100755
index 0000000..5689044
--- /dev/null
+++ b/sbin/geom/class/tests/gate/1_test.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+# $FreeBSD$
+
+. `dirname $0`/conf.sh
+
+base=`basename $0`
+us=45
+conf=`mktemp $base.XXXXXX` || exit 1
+pidfile=ggated.pid
+port=33080
+
+work=$(attach_md -t malloc -s 1M)
+src=$(attach_md -t malloc -s 1M)
+
+test_cleanup()
+{
+	ggatec destroy -f -u $us
+	pkill -F $pidfile
+	geom_test_cleanup
+}
+trap test_cleanup ABRT EXIT INT TERM
+
+dd if=/dev/random of=/dev/$work bs=1m count=1 conv=sync
+dd if=/dev/random of=/dev/$src bs=1m count=1 conv=sync
+src_checksum=$(md5 -q /dev/$src)
+
+echo "127.0.0.1 RW /dev/$work" > $conf
+
+if ! ggated -F $pidfile -p $port $conf; then
+	echo 'ggated failed to start'
+	echo 'Bail out!'
+	exit 1
+fi
+if ! ggatec create -p $port -u $us 127.0.0.1 /dev/$work; then
+	echo 'ggatec create failed'
+	echo 'Bail out!'
+	exit 1
+fi
+
+dd if=/dev/${src} of=/dev/ggate${us} bs=1m count=1
+sleep 1
+
+echo '1..2'
+
+work_checksum=$(md5 -q /dev/$work)
+if [ "$work_checksum" != "$src_checksum" ]; then
+	echo "not ok 1 - md5 checksums didn't match ($work_checksum != $src_checksum)"
+	echo "not ok 2 # SKIP"
+else
+	echo 'ok 1 - md5 checksum'
+
+	ggate_checksum=$(md5 -q /dev/ggate${us})
+	if [ "$ggate_checksum" != "$src_checksum" ]; then
+		echo "not ok 2 - md5 checksums didn't match ($ggate_checksum != $src_checksum)"
+	else
+		echo 'ok 2 - md5 checksum'
+	fi
+fi
diff --git a/sbin/geom/class/tests/gate/2_test.sh b/sbin/geom/class/tests/gate/2_test.sh
new file mode 100755
index 0000000..be89acc
--- /dev/null
+++ b/sbin/geom/class/tests/gate/2_test.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# $FreeBSD$
+
+. `dirname $0`/conf.sh
+
+base=`basename $0`
+us=46
+work=`mktemp -u $base.XXXXXX` || exit 1
+src=`mktemp -u $base.XXXXXX` || exit 1
+
+test_cleanup()
+{
+	ggatel destroy -f -u $us
+	rm -f $work $src
+
+	geom_test_cleanup
+}
+trap test_cleanup ABRT EXIT INT TERM
+
+dd if=/dev/random of=$work bs=1m count=1 conv=sync
+dd if=/dev/random of=$src bs=1m count=1 conv=sync
+
+if ! ggatel create -u $us $work; then
+	echo 'ggatel create failed'
+	echo 'Bail out!'
+	exit 1
+fi
+
+dd if=${src} of=/dev/ggate${us} bs=1m count=1
+sleep 1
+
+echo '1..2'
+
+src_checksum=$(md5 -q $src)
+work_checksum=$(md5 -q $work)
+if [ "$work_checksum" != "$src_checksum" ]; then
+	echo "not ok 1 - md5 checksums didn't match ($work_checksum != $src_checksum) # TODO: bug 204616"
+	echo 'not ok 2 # SKIP'
+else
+	echo 'ok 1 - md5 checksum'
+
+	ggate_checksum=$(md5 -q /dev/ggate${us})
+	if [ "$ggate_checksum" != "$src_checksum" ]; then
+		echo "not ok 2 - md5 checksums didn't match ($ggate_checksum != $src_checksum)"
+	else
+		echo 'ok 2 - md5 checksum'
+	fi
+fi
diff --git a/sbin/geom/class/tests/gate/3_test.sh b/sbin/geom/class/tests/gate/3_test.sh
new file mode 100755
index 0000000..8901aca
--- /dev/null
+++ b/sbin/geom/class/tests/gate/3_test.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# $FreeBSD$
+
+. `dirname $0`/conf.sh
+
+base=`basename $0`
+us=47
+
+test_cleanup()
+{
+	ggatel destroy -f -u $us
+
+	geom_test_cleanup
+}
+trap test_cleanup ABRT EXIT INT TERM
+
+work=$(attach_md -t malloc -s 1M)
+src=$(attach_md -t malloc -s 1M)
+
+dd if=/dev/random of=/dev/$work bs=1m count=1 conv=sync
+dd if=/dev/random of=/dev/$src bs=1m count=1 conv=sync
+src_checksum=$(md5 -q /dev/$src)
+
+if ! ggatel create -u $us /dev/$work; then
+	echo 'ggatel create failed'
+	echo 'Bail out!'
+	exit 1
+fi
+
+dd if=/dev/${src} of=/dev/ggate${us} bs=1m count=1 conv=sync
+sleep 1
+
+echo '1..2'
+
+work_checksum=$(md5 -q /dev/$work)
+if [ "$work_checksum" != "$src_checksum" ]; then
+	echo "not ok 1 - md5 checksums didn't match ($work_checksum != $src_checksum)"
+	echo 'not ok 2 # SKIP'
+else
+	echo 'ok 1 - md5 checksum'
+
+	ggate_checksum=$(md5 -q /dev/ggate${us})
+	if [ "$ggate_checksum" != "$src_checksum" ]; then
+		echo "not ok 2 - md5 checksums didn't match ($ggate_checksum != $src_checksum)"
+	else
+		echo 'ok 2 - md5 checksum'
+	fi
+fi
diff --git a/sbin/geom/class/tests/gate/Makefile b/sbin/geom/class/tests/gate/Makefile
new file mode 100644
index 0000000..985d98f
--- /dev/null
+++ b/sbin/geom/class/tests/gate/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+TAP_TESTS_SH+=	3_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_mirror/conf.sh b/sbin/geom/class/tests/gate/conf.sh
index 8a60a16..7e22ce4 100644..100755
--- a/tools/regression/geom_mirror/conf.sh
+++ b/sbin/geom/class/tests/gate/conf.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-class="mirror"
+name="$(mktemp -u gate.XXXXXX)"
+class="gate"
 base=`basename $0`
 
 . `dirname $0`/../geom_subr.sh
diff --git a/sbin/geom/class/tests/geom_subr.sh b/sbin/geom/class/tests/geom_subr.sh
new file mode 100644
index 0000000..a26dd15
--- /dev/null
+++ b/sbin/geom/class/tests/geom_subr.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ $(id -u) -ne 0 ]; then
+	echo 'Tests must be run as root'
+	echo 'Bail out!'
+	exit 1
+fi
+kldstat -q -m g_${class} || g${class} load || exit 1
+
+devwait()
+{
+	while :; do
+		if [ -c /dev/${class}/${name} ]; then
+			return
+		fi
+		sleep 0.2
+	done
+}
+
+# Need to keep track of the test md devices to avoid the scenario where a test
+# failing will cause the other tests to bomb out, or a test failing will leave
+# a large number of md(4) devices lingering around
+: ${TMPDIR=/tmp}
+TEST_MDS_FILE=${TMPDIR}/test_mds
+
+attach_md()
+{
+	local test_md
+
+	test_md=$(mdconfig -a "$@") || exit
+	echo $test_md >> $TEST_MDS_FILE || exit
+	echo $test_md
+}
+
+geom_test_cleanup()
+{
+	local test_md
+
+	if [ -f $TEST_MDS_FILE ]; then
+		while read test_md; do
+			# The "#" tells the TAP parser this is a comment
+			echo "# Removing test memory disk: $test_md"
+			mdconfig -d -u $test_md
+		done < $TEST_MDS_FILE
+	fi
+}
diff --git a/sbin/geom/class/tests/gpt/Makefile b/sbin/geom/class/tests/gpt/Makefile
new file mode 100644
index 0000000..be11f0a
--- /dev/null
+++ b/sbin/geom/class/tests/gpt/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+BINDIR=			${TESTSDIR}
+
+TAP_TESTS_PERL+=	gctl_test
+
+PROGS+=			gctl
+MAN=
+
+DPADD.gctl+=		${LIBGEOM}
+LDADD.gctl+=		-lgeom
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_gpt/test.c b/sbin/geom/class/tests/gpt/gctl.c
index d750d30..136a616 100644
--- a/tools/regression/geom_gpt/test.c
+++ b/sbin/geom/class/tests/gpt/gctl.c
@@ -29,13 +29,14 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <errno.h>
-#include <libgeom.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <libgeom.h>
+
 struct retval {
 	struct retval *retval;
 	const char *param;
diff --git a/tools/regression/geom_gpt/gctl.t b/sbin/geom/class/tests/gpt/gctl_test.pl
index f99e6d8..0f30805 100644..100755
--- a/tools/regression/geom_gpt/gctl.t
+++ b/sbin/geom/class/tests/gpt/gctl_test.pl
@@ -29,10 +29,12 @@
 my $srcdir = `dirname $0`;
 chomp $srcdir;
 
-my $cmd = "/tmp/gctl-$$";
+my $tmpdir = $ENV{TMPDIR} || "/tmp";
+
+my $cmd = "$srcdir/gctl";
 my $out = "$cmd.out";
-my $disk = "/tmp/disk-$$";
-my $mntpt = "/tmp/mount-$$";
+my $disk = "$tmpdir/disk-$$";
+my $mntpt = "$tmpdir/mount-$$";
 
 my %steps = (
     "000" => "gctl",
@@ -131,13 +133,6 @@ if (exists $ENV{'TEST_VERBOSE'}) {
     $verbose = "-v";
 }
 
-# Compile the driver...
-my $st = system("cc -o $cmd -g $srcdir/test.c -lgeom");
-if ($st != 0) {
-    print "1..0 # SKIP error compiling test.c\n";
-    exit 0;
-}
-
 # Make sure we have permission to use gctl...
 if (`$cmd` =~ "^FAIL Permission denied") {
     print "1..0 # SKIP not enough permission\n";
diff --git a/sbin/geom/class/tests/mirror/1_test.sh b/sbin/geom/class/tests/mirror/1_test.sh
new file mode 100755
index 0000000..e115b29
--- /dev/null
+++ b/sbin/geom/class/tests/mirror/1_test.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# $FreeBSD$
+
+. `dirname $0`/conf.sh
+
+echo "1..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
+
+gmirror label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
+devwait
+
+# Size of created device should be 1MB - 512b.
+
+size=`diskinfo /dev/mirror/${name} | awk '{print $3}'`
+
+if [ $size -eq 1048064 ]; then
+	echo "ok 1"
+else
+	echo "not ok 1"
+fi
diff --git a/tools/regression/geom_mirror/test-2.t b/sbin/geom/class/tests/mirror/2_test.sh
index 3fb0822..5605c44 100644..100755
--- a/tools/regression/geom_mirror/test-2.t
+++ b/sbin/geom/class/tests/mirror/2_test.sh
@@ -6,22 +6,19 @@
 echo "1..4"
 
 balance="round-robin"
-us0=45
-us1=`expr $us0 + 1`
-us2=`expr $us0 + 2`
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
-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
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
+us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
 
-gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
+gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
@@ -32,28 +29,24 @@ if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 else
 	echo "ok 1"
 fi
-dd if=/dev/md${us0} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+dd if=/dev/${us0} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 2"
 else
 	echo "ok 2"
 fi
-dd if=/dev/md${us1} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+dd if=/dev/${us1} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 3"
 else
 	echo "ok 3"
 fi
 
-dd if=/dev/md${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+dd if=/dev/${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 4"
 else
 	echo "ok 4"
 fi
 
-gmirror remove $name md${us0} md${us1} md${us2}
-mdconfig -d -u $us0
-mdconfig -d -u $us1
-mdconfig -d -u $us2
 rm -f ${src} ${dst}
diff --git a/tools/regression/geom_mirror/test-3.t b/sbin/geom/class/tests/mirror/3_test.sh
index 5bdd2ab..b7f8525 100644..100755
--- a/tools/regression/geom_mirror/test-3.t
+++ b/sbin/geom/class/tests/mirror/3_test.sh
@@ -6,22 +6,19 @@
 echo "1..5"
 
 balance="round-robin"
-us0=45
-us1=`expr $us0 + 1`
-us2=`expr $us0 + 2`
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
-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
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
+us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
 
-gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
+gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
@@ -33,7 +30,7 @@ else
 	echo "ok 1"
 fi
 
-gmirror remove $name md${us0}
+gmirror remove $name ${us0}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 2"
@@ -41,7 +38,7 @@ else
 	echo "ok 2"
 fi
 
-gmirror remove $name md${us1}
+gmirror remove $name ${us1}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 3"
@@ -49,7 +46,7 @@ else
 	echo "ok 3"
 fi
 
-gmirror remove $name md${us2}
+gmirror remove $name ${us2}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 4"
@@ -64,7 +61,4 @@ else
 	echo "ok 5"
 fi
 
-mdconfig -d -u $us0
-mdconfig -d -u $us1
-mdconfig -d -u $us2
 rm -f ${src} ${dst}
diff --git a/tools/regression/geom_mirror/test-4.t b/sbin/geom/class/tests/mirror/4_test.sh
index 0786bdb..6efcc02 100644..100755
--- a/tools/regression/geom_mirror/test-4.t
+++ b/sbin/geom/class/tests/mirror/4_test.sh
@@ -6,22 +6,19 @@
 echo "1..5"
 
 balance="load"
-us0=45
-us1=`expr $us0 + 1`
-us2=`expr $us0 + 2`
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
-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
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
+us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
 
-gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
+gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
@@ -33,7 +30,7 @@ else
 	echo "ok 1"
 fi
 
-gmirror remove $name md${us0}
+gmirror remove $name ${us0}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 2"
@@ -41,7 +38,7 @@ else
 	echo "ok 2"
 fi
 
-gmirror remove $name md${us1}
+gmirror remove $name ${us1}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 3"
@@ -49,7 +46,7 @@ else
 	echo "ok 3"
 fi
 
-gmirror remove $name md${us2}
+gmirror remove $name ${us2}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 4"
@@ -57,6 +54,8 @@ else
 	echo "ok 4"
 fi
 
+gmirror destroy $name
+
 # mirror/${name} should be removed.
 if [ -c /dev/${name} ]; then
 	echo "not ok 5"
@@ -64,7 +63,4 @@ else
 	echo "ok 5"
 fi
 
-mdconfig -d -u $us0
-mdconfig -d -u $us1
-mdconfig -d -u $us2
 rm -f ${src} ${dst}
diff --git a/tools/regression/geom_mirror/test-5.t b/sbin/geom/class/tests/mirror/5_test.sh
index 5b0a5ed..3a176b5 100644..100755
--- a/tools/regression/geom_mirror/test-5.t
+++ b/sbin/geom/class/tests/mirror/5_test.sh
@@ -6,22 +6,19 @@
 echo "1..5"
 
 balance="split"
-us0=45
-us1=`expr $us0 + 1`
-us2=`expr $us0 + 2`
 ddbs=8192
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
-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
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
+us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
 
-gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
+gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
@@ -33,7 +30,7 @@ else
 	echo "ok 1"
 fi
 
-gmirror remove $name md${us0}
+gmirror remove $name ${us0}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 2"
@@ -41,7 +38,7 @@ else
 	echo "ok 2"
 fi
 
-gmirror remove $name md${us1}
+gmirror remove $name ${us1}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 3"
@@ -49,7 +46,7 @@ else
 	echo "ok 3"
 fi
 
-gmirror remove $name md${us2}
+gmirror remove $name ${us2}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 4"
@@ -64,7 +61,4 @@ else
 	echo "ok 5"
 fi
 
-mdconfig -d -u $us0
-mdconfig -d -u $us1
-mdconfig -d -u $us2
 rm -f ${src} ${dst}
diff --git a/sbin/geom/class/tests/mirror/6_test.sh b/sbin/geom/class/tests/mirror/6_test.sh
new file mode 100755
index 0000000..68036e9
--- /dev/null
+++ b/sbin/geom/class/tests/mirror/6_test.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# $FreeBSD$
+
+. `dirname $0`/conf.sh
+
+echo "1..2"
+
+balance="split"
+ddbs=8192
+nblocks1=1024
+nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
+src=`mktemp $base.XXXXXX` || exit 1
+dst=`mktemp $base.XXXXXX` || exit 1
+
+dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+
+us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+
+gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/${us0} /dev/${us1} || exit 1
+devwait
+
+dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+dd if=/dev/zero of=/dev/${us2} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+
+dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
+	echo "not ok 1"
+else
+	echo "ok 1"
+fi
+
+# Connect disk to the mirror.
+gmirror insert ${name} ${us2}
+# Wait for synchronization.
+sleep 1
+dd if=/dev/${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
+if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
+	echo "not ok 2"
+else
+	echo "ok 2"
+fi
+
+rm -f ${src} ${dst}
diff --git a/tools/regression/geom_mirror/test-7.t b/sbin/geom/class/tests/mirror/7_test.sh
index c911c03..f5bf71a 100644..100755
--- a/tools/regression/geom_mirror/test-7.t
+++ b/sbin/geom/class/tests/mirror/7_test.sh
@@ -6,22 +6,19 @@
 echo "1..5"
 
 balance="prefer"
-us0=45
-us1=`expr $us0 + 1`
-us2=`expr $us0 + 2`
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
-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
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
+us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
+us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1
 
-gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
+gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
@@ -33,7 +30,7 @@ else
 	echo "ok 1"
 fi
 
-gmirror remove $name md${us0}
+gmirror remove $name ${us0}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 2"
@@ -41,7 +38,7 @@ else
 	echo "ok 2"
 fi
 
-gmirror remove $name md${us1}
+gmirror remove $name ${us1}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 3"
@@ -49,7 +46,7 @@ else
 	echo "ok 3"
 fi
 
-gmirror remove $name md${us2}
+gmirror remove $name ${us2}
 dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 4"
@@ -64,7 +61,4 @@ else
 	echo "ok 5"
 fi
 
-mdconfig -d -u $us0
-mdconfig -d -u $us1
-mdconfig -d -u $us2
 rm -f ${src} ${dst}
diff --git a/sbin/geom/class/tests/mirror/Makefile b/sbin/geom/class/tests/mirror/Makefile
new file mode 100644
index 0000000..cf3784f
--- /dev/null
+++ b/sbin/geom/class/tests/mirror/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+TAP_TESTS_SH+=	3_test
+TAP_TESTS_SH+=	4_test
+TAP_TESTS_SH+=	5_test
+TAP_TESTS_SH+=	6_test
+TAP_TESTS_SH+=	7_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/sbin/geom/class/tests/mirror/conf.sh b/sbin/geom/class/tests/mirror/conf.sh
new file mode 100755
index 0000000..d8595f1
--- /dev/null
+++ b/sbin/geom/class/tests/mirror/conf.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# $FreeBSD$
+
+name="$(mktemp -u mirror.XXXXXX)"
+class="mirror"
+base=`basename $0`
+
+gmirror_test_cleanup()
+{
+	[ -c /dev/$class/$name ] && gmirror destroy $name
+	geom_test_cleanup
+}
+trap gmirror_test_cleanup ABRT EXIT INT TERM
+
+. `dirname $0`/../geom_subr.sh
diff --git a/tools/regression/geom_nop/test-1.t b/sbin/geom/class/tests/nop/1_test.sh
index f08f71d..f08f71d 100644..100755
--- a/tools/regression/geom_nop/test-1.t
+++ b/sbin/geom/class/tests/nop/1_test.sh
diff --git a/tools/regression/geom_nop/test-2.t b/sbin/geom/class/tests/nop/2_test.sh
index e0ddb17..e0ddb17 100644..100755
--- a/tools/regression/geom_nop/test-2.t
+++ b/sbin/geom/class/tests/nop/2_test.sh
diff --git a/sbin/geom/class/tests/nop/Makefile b/sbin/geom/class/tests/nop/Makefile
new file mode 100644
index 0000000..81a4e99
--- /dev/null
+++ b/sbin/geom/class/tests/nop/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_nop/conf.sh b/sbin/geom/class/tests/nop/conf.sh
index 0dc9797..0dc9797 100644..100755
--- a/tools/regression/geom_nop/conf.sh
+++ b/sbin/geom/class/tests/nop/conf.sh
diff --git a/tools/regression/geom_raid3/test-10.t b/sbin/geom/class/tests/raid3/10_test.sh
index 1320120..1320120 100644..100755
--- a/tools/regression/geom_raid3/test-10.t
+++ b/sbin/geom/class/tests/raid3/10_test.sh
diff --git a/tools/regression/geom_raid3/test-11.t b/sbin/geom/class/tests/raid3/11_test.sh
index 3382214..3382214 100644..100755
--- a/tools/regression/geom_raid3/test-11.t
+++ b/sbin/geom/class/tests/raid3/11_test.sh
diff --git a/tools/regression/geom_raid3/test-12.t b/sbin/geom/class/tests/raid3/12_test.sh
index 3dec406..3dec406 100644..100755
--- a/tools/regression/geom_raid3/test-12.t
+++ b/sbin/geom/class/tests/raid3/12_test.sh
diff --git a/tools/regression/geom_raid3/test-1.t b/sbin/geom/class/tests/raid3/1_test.sh
index 9202967..9202967 100644..100755
--- a/tools/regression/geom_raid3/test-1.t
+++ b/sbin/geom/class/tests/raid3/1_test.sh
diff --git a/tools/regression/geom_raid3/test-2.t b/sbin/geom/class/tests/raid3/2_test.sh
index 88daf78..88daf78 100644..100755
--- a/tools/regression/geom_raid3/test-2.t
+++ b/sbin/geom/class/tests/raid3/2_test.sh
diff --git a/tools/regression/geom_raid3/test-3.t b/sbin/geom/class/tests/raid3/3_test.sh
index d2c1a5f..d2c1a5f 100644..100755
--- a/tools/regression/geom_raid3/test-3.t
+++ b/sbin/geom/class/tests/raid3/3_test.sh
diff --git a/tools/regression/geom_raid3/test-4.t b/sbin/geom/class/tests/raid3/4_test.sh
index d437ec0..d437ec0 100644..100755
--- a/tools/regression/geom_raid3/test-4.t
+++ b/sbin/geom/class/tests/raid3/4_test.sh
diff --git a/tools/regression/geom_raid3/test-5.t b/sbin/geom/class/tests/raid3/5_test.sh
index ffd85f6..ffd85f6 100644..100755
--- a/tools/regression/geom_raid3/test-5.t
+++ b/sbin/geom/class/tests/raid3/5_test.sh
diff --git a/tools/regression/geom_raid3/test-6.t b/sbin/geom/class/tests/raid3/6_test.sh
index 97b5503..97b5503 100644..100755
--- a/tools/regression/geom_raid3/test-6.t
+++ b/sbin/geom/class/tests/raid3/6_test.sh
diff --git a/tools/regression/geom_raid3/test-7.t b/sbin/geom/class/tests/raid3/7_test.sh
index 3d89873..3d89873 100644..100755
--- a/tools/regression/geom_raid3/test-7.t
+++ b/sbin/geom/class/tests/raid3/7_test.sh
diff --git a/tools/regression/geom_raid3/test-8.t b/sbin/geom/class/tests/raid3/8_test.sh
index b9621f4..b9621f4 100644..100755
--- a/tools/regression/geom_raid3/test-8.t
+++ b/sbin/geom/class/tests/raid3/8_test.sh
diff --git a/tools/regression/geom_raid3/test-9.t b/sbin/geom/class/tests/raid3/9_test.sh
index 0695011..0695011 100644..100755
--- a/tools/regression/geom_raid3/test-9.t
+++ b/sbin/geom/class/tests/raid3/9_test.sh
diff --git a/sbin/geom/class/tests/raid3/Makefile b/sbin/geom/class/tests/raid3/Makefile
new file mode 100644
index 0000000..c1c95f1
--- /dev/null
+++ b/sbin/geom/class/tests/raid3/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+TAP_TESTS_SH+=	3_test
+TAP_TESTS_SH+=	4_test
+TAP_TESTS_SH+=	5_test
+TAP_TESTS_SH+=	6_test
+TAP_TESTS_SH+=	7_test
+TAP_TESTS_SH+=	8_test
+TAP_TESTS_SH+=	9_test
+TAP_TESTS_SH+=	10_test
+TAP_TESTS_SH+=	11_test
+TAP_TESTS_SH+=	12_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_raid3/conf.sh b/sbin/geom/class/tests/raid3/conf.sh
index 93e7dea..93e7dea 100644..100755
--- a/tools/regression/geom_raid3/conf.sh
+++ b/sbin/geom/class/tests/raid3/conf.sh
diff --git a/tools/regression/geom_shsec/test-1.t b/sbin/geom/class/tests/shsec/1_test.sh
index 5cb5b4f..5cb5b4f 100644..100755
--- a/tools/regression/geom_shsec/test-1.t
+++ b/sbin/geom/class/tests/shsec/1_test.sh
diff --git a/tools/regression/geom_shsec/test-2.t b/sbin/geom/class/tests/shsec/2_test.sh
index 19a4e0a..19a4e0a 100644..100755
--- a/tools/regression/geom_shsec/test-2.t
+++ b/sbin/geom/class/tests/shsec/2_test.sh
diff --git a/sbin/geom/class/tests/shsec/Makefile b/sbin/geom/class/tests/shsec/Makefile
new file mode 100644
index 0000000..81a4e99
--- /dev/null
+++ b/sbin/geom/class/tests/shsec/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_shsec/conf.sh b/sbin/geom/class/tests/shsec/conf.sh
index 7648862..7648862 100644..100755
--- a/tools/regression/geom_shsec/conf.sh
+++ b/sbin/geom/class/tests/shsec/conf.sh
diff --git a/tools/regression/geom_stripe/test-1.t b/sbin/geom/class/tests/stripe/1_test.sh
index 9b398f0..9b398f0 100644..100755
--- a/tools/regression/geom_stripe/test-1.t
+++ b/sbin/geom/class/tests/stripe/1_test.sh
diff --git a/tools/regression/geom_stripe/test-2.t b/sbin/geom/class/tests/stripe/2_test.sh
index 73937f4..73937f4 100644..100755
--- a/tools/regression/geom_stripe/test-2.t
+++ b/sbin/geom/class/tests/stripe/2_test.sh
diff --git a/sbin/geom/class/tests/stripe/Makefile b/sbin/geom/class/tests/stripe/Makefile
new file mode 100644
index 0000000..81a4e99
--- /dev/null
+++ b/sbin/geom/class/tests/stripe/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_stripe/conf.sh b/sbin/geom/class/tests/stripe/conf.sh
index 22e5864..22e5864 100644..100755
--- a/tools/regression/geom_stripe/conf.sh
+++ b/sbin/geom/class/tests/stripe/conf.sh
diff --git a/tools/regression/geom_uzip/test-1.sh b/sbin/geom/class/tests/uzip/1.sh
index 7e8f168..af3e889 100644..100755
--- a/tools/regression/geom_uzip/test-1.sh
+++ b/sbin/geom/class/tests/uzip/1.sh
@@ -8,8 +8,9 @@ mntpoint="/mnt/test-1"
 #
 # prepare
 kldload geom_uzip
-uudecode test-1.img.uzip.uue
-num=`mdconfig -an -f test-1.img.uzip` || exit 1
+UUE=$(dirname $0)/1.img.uzip.uue
+uudecode $UUE
+num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1
 sleep 1
 
 #
diff --git a/sbin/geom/class/tests/uzip/2.sh b/sbin/geom/class/tests/uzip/2.sh
new file mode 100755
index 0000000..bf66169
--- /dev/null
+++ b/sbin/geom/class/tests/uzip/2.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+#
+# prepare
+
+UUE=$(dirname $0)/1.img.uzip.uue
+
+kldload geom_uzip
+uudecode $UUE
+num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1
+sleep 1
+
+#
+# destroy
+kldunload geom_uzip
diff --git a/sbin/geom/class/tests/uzip/Makefile b/sbin/geom/class/tests/uzip/Makefile
new file mode 100644
index 0000000..a9a7341
--- /dev/null
+++ b/sbin/geom/class/tests/uzip/Makefile
@@ -0,0 +1,34 @@
+#
+# $FreeBSD$
+#
+# Regression test for geom_uzip.
+#
+
+IMAGE=		1.img
+ZIMAGE=		${IMAGE}.uzip
+UZIMAGE=	${ZIMAGE}.uue
+
+CLEANFILES+=	${IMAGE} ${UZIMAGE} ${ZIMAGE}
+
+${IMAGE}:
+	makefs -s 1048576 ${.TARGET} ${.CURDIR}/etalon
+
+${ZIMAGE}: ${IMAGE}
+	mkuzip -o ${.TARGET} ${.ALLSRC}
+
+${UZIMAGE}: ${IMAGE} ${ZIMAGE}
+	printf "#\n# $$" >${.TARGET}
+	printf "FreeBSD$$\n#\n\n" >> ${.TARGET}
+	uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET}
+
+FILES+=		${UZIMAGE}
+FILESDIR=	${TESTSDIR}
+
+FILESGROUPS=	FILES etalon
+etalon+=	etalon/etalon.txt
+etalonDIR=	${TESTSDIR}/etalon
+
+PLAIN_TESTS_SH+=	1
+PLAIN_TESTS_SH+=	2
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_uzip/etalon/etalon.txt b/sbin/geom/class/tests/uzip/etalon/etalon.txt
index cb8acf3..cb8acf3 100644
--- a/tools/regression/geom_uzip/etalon/etalon.txt
+++ b/sbin/geom/class/tests/uzip/etalon/etalon.txt
diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/sbin/geom/core/tests/ConfCmp/ConfCmp.c
index 599a953b..161b5cc 100644
--- a/tools/regression/geom/ConfCmp/ConfCmp.c
+++ b/sbin/geom/core/tests/ConfCmp/ConfCmp.c
@@ -190,7 +190,7 @@ dofile(char *filename)
 	XML_SetCharacterDataHandler(parser, CharData);
 	fd = open(filename, O_RDONLY);
 	if (fd < 0)
-		err(1, filename);
+		err(1, "%s", filename);
 	fstat(fd, &st);
 	p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0);
 	i = XML_Parse(parser, p, st.st_size, 1);
@@ -217,6 +217,7 @@ print_node(struct node *np)
 	printf("\n");
 }
 
+#if 0
 static void
 print_tree(struct node *np, int n)
 {
@@ -226,6 +227,7 @@ print_tree(struct node *np, int n)
 	LIST_FOREACH(np1, &np->children, siblings)
 		print_tree(np1, n + 2);
 }
+#endif
 
 static void
 sort_node(struct node *np)
diff --git a/sbin/geom/core/tests/ConfCmp/Makefile b/sbin/geom/core/tests/ConfCmp/Makefile
new file mode 100644
index 0000000..ffd814e
--- /dev/null
+++ b/sbin/geom/core/tests/ConfCmp/Makefile
@@ -0,0 +1,43 @@
+# $FreeBSD$
+
+BINDIR=	${TESTSBASE}/sbin/geom/core/ConfCmp
+
+PROG=	ConfCmp
+SRCS+=	ConfCmp.c
+SRCS+=	subr_sbuf.c
+
+.PATH: ${SRCTOP}/sys/kern
+
+# Uncomment for ElectricFence
+#LDADD+= -lefence -L/usr/local/lib
+
+DPADD+=		${LIBBSDXML}
+LDADD+=		-lbsdxml
+
+LDFLAGS+=	-static
+
+MAN=
+CLEANFILES+=	 _*
+
+# XXX: this should be in a test script
+check: .PHONY
+check: ${PROG}
+	cd ${.CURDIR} && env PATH="$$PATH:${.OBJDIR}" ${MAKE} _check
+
+_check: .PHONY
+_check: ${PROG}
+	rm -f _* *.core
+	cd ${.CURDIR}; ${PROG} a1.conf a1.conf
+	cd ${.CURDIR}; ${PROG} a1.conf a1a.conf
+	cd ${.CURDIR}; if ${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; ${PROG} a2.conf a2.conf
+	cd ${.CURDIR}; ${PROG} a2.conf a2a.conf
+	cd ${.CURDIR}; if ${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi
+
+WARNS?=	5
+
+.include <bsd.prog.mk>
diff --git a/tools/regression/geom/ConfCmp/a1.conf b/sbin/geom/core/tests/ConfCmp/a1.conf
index 94171cd..94171cd 100644
--- a/tools/regression/geom/ConfCmp/a1.conf
+++ b/sbin/geom/core/tests/ConfCmp/a1.conf
diff --git a/tools/regression/geom/ConfCmp/a1a.conf b/sbin/geom/core/tests/ConfCmp/a1a.conf
index 01110f3..01110f3 100644
--- a/tools/regression/geom/ConfCmp/a1a.conf
+++ b/sbin/geom/core/tests/ConfCmp/a1a.conf
diff --git a/tools/regression/geom/ConfCmp/a1b.conf b/sbin/geom/core/tests/ConfCmp/a1b.conf
index 46f423b..46f423b 100644
--- a/tools/regression/geom/ConfCmp/a1b.conf
+++ b/sbin/geom/core/tests/ConfCmp/a1b.conf
diff --git a/tools/regression/geom/ConfCmp/a1c.conf b/sbin/geom/core/tests/ConfCmp/a1c.conf
index 1b5a2b9..1b5a2b9 100644
--- a/tools/regression/geom/ConfCmp/a1c.conf
+++ b/sbin/geom/core/tests/ConfCmp/a1c.conf
diff --git a/tools/regression/geom/ConfCmp/a1d.conf b/sbin/geom/core/tests/ConfCmp/a1d.conf
index a9063c5..a9063c5 100644
--- a/tools/regression/geom/ConfCmp/a1d.conf
+++ b/sbin/geom/core/tests/ConfCmp/a1d.conf
diff --git a/tools/regression/geom/ConfCmp/a2.conf b/sbin/geom/core/tests/ConfCmp/a2.conf
index 6688fd1..6688fd1 100644
--- a/tools/regression/geom/ConfCmp/a2.conf
+++ b/sbin/geom/core/tests/ConfCmp/a2.conf
diff --git a/tools/regression/geom/ConfCmp/a2a.conf b/sbin/geom/core/tests/ConfCmp/a2a.conf
index 3d35fe9..3d35fe9 100644
--- a/tools/regression/geom/ConfCmp/a2a.conf
+++ b/sbin/geom/core/tests/ConfCmp/a2a.conf
diff --git a/tools/regression/geom/ConfCmp/a2b.conf b/sbin/geom/core/tests/ConfCmp/a2b.conf
index 58c0e15..58c0e15 100644
--- a/tools/regression/geom/ConfCmp/a2b.conf
+++ b/sbin/geom/core/tests/ConfCmp/a2b.conf
diff --git a/tools/regression/geom/ConfCmp/a2c.conf b/sbin/geom/core/tests/ConfCmp/a2c.conf
index 381c410..381c410 100644
--- a/tools/regression/geom/ConfCmp/a2c.conf
+++ b/sbin/geom/core/tests/ConfCmp/a2c.conf
diff --git a/tools/regression/geom/ConfCmp/a2d.conf b/sbin/geom/core/tests/ConfCmp/a2d.conf
index bccaed5..bccaed5 100644
--- a/tools/regression/geom/ConfCmp/a2d.conf
+++ b/sbin/geom/core/tests/ConfCmp/a2d.conf
diff --git a/sbin/geom/core/tests/Data/Makefile b/sbin/geom/core/tests/Data/Makefile
new file mode 100644
index 0000000..33d7aa6
--- /dev/null
+++ b/sbin/geom/core/tests/Data/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+FILES+=		disk.alpha.da0.xml
+FILES+=		disk.alpha2.da0.xml
+FILES+=		disk.apple.xml
+FILES+=		disk.beast.da0.xml
+FILES+=		disk.critter.ad0.xml
+FILES+=		disk.empty.flp.xml
+FILES+=		disk.far.ad0.xml
+FILES+=		disk.flat.da1.xml
+FILES+=		disk.kern.flp.xml
+FILES+=		disk.msdos.ext.xml
+FILES+=		disk.msdos.flp.xml
+FILES+=		disk.pc98.wdc0.xml
+FILES+=		disk.sun.da0.xml
+FILES+=		disk.sun.da1.xml
+FILES+=		disk.typo.ad0.xml
+
+FILESDIR=	${TESTSBASE}/sbin/geom/core/Data
+
+.include <bsd.prog.mk>
diff --git a/tools/regression/geom/Data/disk.alpha.da0.xml b/sbin/geom/core/tests/Data/disk.alpha.da0.xml
index 670fcc3..670fcc3 100644
--- a/tools/regression/geom/Data/disk.alpha.da0.xml
+++ b/sbin/geom/core/tests/Data/disk.alpha.da0.xml
diff --git a/tools/regression/geom/Data/disk.alpha2.da0.xml b/sbin/geom/core/tests/Data/disk.alpha2.da0.xml
index 5b341b1..5b341b1 100644
--- a/tools/regression/geom/Data/disk.alpha2.da0.xml
+++ b/sbin/geom/core/tests/Data/disk.alpha2.da0.xml
diff --git a/tools/regression/geom/Data/disk.apple.xml b/sbin/geom/core/tests/Data/disk.apple.xml
index ecdd523..ecdd523 100644
--- a/tools/regression/geom/Data/disk.apple.xml
+++ b/sbin/geom/core/tests/Data/disk.apple.xml
diff --git a/tools/regression/geom/Data/disk.beast.da0.xml b/sbin/geom/core/tests/Data/disk.beast.da0.xml
index 96ad5f7..96ad5f7 100644
--- a/tools/regression/geom/Data/disk.beast.da0.xml
+++ b/sbin/geom/core/tests/Data/disk.beast.da0.xml
diff --git a/tools/regression/geom/Data/disk.critter.ad0.xml b/sbin/geom/core/tests/Data/disk.critter.ad0.xml
index 9e93b24..9e93b24 100644
--- a/tools/regression/geom/Data/disk.critter.ad0.xml
+++ b/sbin/geom/core/tests/Data/disk.critter.ad0.xml
diff --git a/tools/regression/geom/Data/disk.empty.flp.xml b/sbin/geom/core/tests/Data/disk.empty.flp.xml
index 88c603a..88c603a 100644
--- a/tools/regression/geom/Data/disk.empty.flp.xml
+++ b/sbin/geom/core/tests/Data/disk.empty.flp.xml
diff --git a/tools/regression/geom/Data/disk.far.ad0.xml b/sbin/geom/core/tests/Data/disk.far.ad0.xml
index 0a8d3ca..0a8d3ca 100644
--- a/tools/regression/geom/Data/disk.far.ad0.xml
+++ b/sbin/geom/core/tests/Data/disk.far.ad0.xml
diff --git a/tools/regression/geom/Data/disk.flat.da1.xml b/sbin/geom/core/tests/Data/disk.flat.da1.xml
index 2302a7c..2302a7c 100644
--- a/tools/regression/geom/Data/disk.flat.da1.xml
+++ b/sbin/geom/core/tests/Data/disk.flat.da1.xml
diff --git a/tools/regression/geom/Data/disk.kern.flp.xml b/sbin/geom/core/tests/Data/disk.kern.flp.xml
index 6640c48..6640c48 100644
--- a/tools/regression/geom/Data/disk.kern.flp.xml
+++ b/sbin/geom/core/tests/Data/disk.kern.flp.xml
diff --git a/tools/regression/geom/Data/disk.msdos.ext.xml b/sbin/geom/core/tests/Data/disk.msdos.ext.xml
index 868a88f7..868a88f7 100644
--- a/tools/regression/geom/Data/disk.msdos.ext.xml
+++ b/sbin/geom/core/tests/Data/disk.msdos.ext.xml
diff --git a/tools/regression/geom/Data/disk.msdos.flp.xml b/sbin/geom/core/tests/Data/disk.msdos.flp.xml
index d057d1a..d057d1a 100644
--- a/tools/regression/geom/Data/disk.msdos.flp.xml
+++ b/sbin/geom/core/tests/Data/disk.msdos.flp.xml
diff --git a/tools/regression/geom/Data/disk.pc98.wdc0.xml b/sbin/geom/core/tests/Data/disk.pc98.wdc0.xml
index 6bae97f..6bae97f 100644
--- a/tools/regression/geom/Data/disk.pc98.wdc0.xml
+++ b/sbin/geom/core/tests/Data/disk.pc98.wdc0.xml
diff --git a/tools/regression/geom/Data/disk.sun.da0.xml b/sbin/geom/core/tests/Data/disk.sun.da0.xml
index 826581f..826581f 100644
--- a/tools/regression/geom/Data/disk.sun.da0.xml
+++ b/sbin/geom/core/tests/Data/disk.sun.da0.xml
diff --git a/tools/regression/geom/Data/disk.sun.da1.xml b/sbin/geom/core/tests/Data/disk.sun.da1.xml
index 0aac8e5..0aac8e5 100644
--- a/tools/regression/geom/Data/disk.sun.da1.xml
+++ b/sbin/geom/core/tests/Data/disk.sun.da1.xml
diff --git a/tools/regression/geom/Data/disk.typo.ad0.xml b/sbin/geom/core/tests/Data/disk.typo.ad0.xml
index 56383ab..56383ab 100644
--- a/tools/regression/geom/Data/disk.typo.ad0.xml
+++ b/sbin/geom/core/tests/Data/disk.typo.ad0.xml
diff --git a/sbin/geom/core/tests/Makefile b/sbin/geom/core/tests/Makefile
new file mode 100644
index 0000000..eaaa997
--- /dev/null
+++ b/sbin/geom/core/tests/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sbin/geom/core
+
+TAP_TESTS_SH+=	run_test
+
+SUBDIR+=	ConfCmp
+SUBDIR+=	Data
+SUBDIR+=	MdLoad
+SUBDIR+=	Ref
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom/MdLoad/Makefile b/sbin/geom/core/tests/MdLoad/Makefile
index eab3f89..27cf94b 100644
--- a/tools/regression/geom/MdLoad/Makefile
+++ b/sbin/geom/core/tests/MdLoad/Makefile
@@ -1,14 +1,18 @@
 # $FreeBSD$
 
+BINDIR=	${TESTSBASE}/sbin/geom/core/MdLoad
+
 PROG=	MdLoad
+
 DPADD=	${LIBSBUF} ${LIBBSDXML}
 LDADD=	-lsbuf -lbsdxml
 
 MAN=
 
-
 WARNS?=	4
-.include "bsd.prog.mk"
 
-test:	${PROG}
+check: .PHONY
+check: ${PROG}
 	./${PROG} md34 ../Data/disk.critter.ad0.xml
+
+.include <bsd.prog.mk>
diff --git a/tools/regression/geom/MdLoad/MdLoad.c b/sbin/geom/core/tests/MdLoad/MdLoad.c
index 33ee4de..c2e5a8a 100644
--- a/tools/regression/geom/MdLoad/MdLoad.c
+++ b/sbin/geom/core/tests/MdLoad/MdLoad.c
@@ -216,7 +216,7 @@ g_simdisk_xml_load(const char *file)
 
 	fd = open(file, O_RDONLY);
 	if (fd < 0)
-		err(1, file);
+		err(1, "%s", file);
 	fstat(fd, &st);
 	p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0);
 	i = XML_Parse(parser, p, st.st_size, 1);
diff --git a/sbin/geom/core/tests/Ref/Makefile b/sbin/geom/core/tests/Ref/Makefile
new file mode 100644
index 0000000..582ea33
--- /dev/null
+++ b/sbin/geom/core/tests/Ref/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+FILES+=		disk.alpha.da0.xml
+FILES+=		disk.alpha2.da0.xml
+FILES+=		disk.apple.xml
+FILES+=		disk.beast.da0.xml
+FILES+=		disk.critter.ad0.xml
+FILES+=		disk.empty.flp.xml
+FILES+=		disk.far.ad0.xml
+FILES+=		disk.flat.da1.xml
+FILES+=		disk.kern.flp.xml
+FILES+=		disk.msdos.ext.xml
+FILES+=		disk.msdos.flp.xml
+FILES+=		disk.pc98.wdc0.xml
+FILES+=		disk.sun.da0.xml
+FILES+=		disk.sun.da1.xml
+FILES+=		disk.typo.ad0.xml
+
+FILESDIR=	${TESTSBASE}/sbin/geom/core/Ref
+
+.include <bsd.prog.mk>
diff --git a/tools/regression/geom/Ref/disk.alpha.da0.xml b/sbin/geom/core/tests/Ref/disk.alpha.da0.xml
index a300f0d..a300f0d 100644
--- a/tools/regression/geom/Ref/disk.alpha.da0.xml
+++ b/sbin/geom/core/tests/Ref/disk.alpha.da0.xml
diff --git a/tools/regression/geom/Ref/disk.alpha2.da0.xml b/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml
index 7ef7573..7ef7573 100644
--- a/tools/regression/geom/Ref/disk.alpha2.da0.xml
+++ b/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml
diff --git a/tools/regression/geom/Ref/disk.apple.xml b/sbin/geom/core/tests/Ref/disk.apple.xml
index a2a0f98..a2a0f98 100644
--- a/tools/regression/geom/Ref/disk.apple.xml
+++ b/sbin/geom/core/tests/Ref/disk.apple.xml
diff --git a/tools/regression/geom/Ref/disk.beast.da0.xml b/sbin/geom/core/tests/Ref/disk.beast.da0.xml
index b6aa32e..b6aa32e 100644
--- a/tools/regression/geom/Ref/disk.beast.da0.xml
+++ b/sbin/geom/core/tests/Ref/disk.beast.da0.xml
diff --git a/tools/regression/geom/Ref/disk.critter.ad0.xml b/sbin/geom/core/tests/Ref/disk.critter.ad0.xml
index 0620bfe..0620bfe 100644
--- a/tools/regression/geom/Ref/disk.critter.ad0.xml
+++ b/sbin/geom/core/tests/Ref/disk.critter.ad0.xml
diff --git a/tools/regression/geom/Ref/disk.empty.flp.xml b/sbin/geom/core/tests/Ref/disk.empty.flp.xml
index 659b416..659b416 100644
--- a/tools/regression/geom/Ref/disk.empty.flp.xml
+++ b/sbin/geom/core/tests/Ref/disk.empty.flp.xml
diff --git a/tools/regression/geom/Ref/disk.far.ad0.xml b/sbin/geom/core/tests/Ref/disk.far.ad0.xml
index 629816a..629816a 100644
--- a/tools/regression/geom/Ref/disk.far.ad0.xml
+++ b/sbin/geom/core/tests/Ref/disk.far.ad0.xml
diff --git a/tools/regression/geom/Ref/disk.flat.da1.xml b/sbin/geom/core/tests/Ref/disk.flat.da1.xml
index 89e2df4..89e2df4 100644
--- a/tools/regression/geom/Ref/disk.flat.da1.xml
+++ b/sbin/geom/core/tests/Ref/disk.flat.da1.xml
diff --git a/tools/regression/geom/Ref/disk.kern.flp.xml b/sbin/geom/core/tests/Ref/disk.kern.flp.xml
index 6ff67a0..6ff67a0 100644
--- a/tools/regression/geom/Ref/disk.kern.flp.xml
+++ b/sbin/geom/core/tests/Ref/disk.kern.flp.xml
diff --git a/tools/regression/geom/Ref/disk.msdos.ext.xml b/sbin/geom/core/tests/Ref/disk.msdos.ext.xml
index dc2aced..dc2aced 100644
--- a/tools/regression/geom/Ref/disk.msdos.ext.xml
+++ b/sbin/geom/core/tests/Ref/disk.msdos.ext.xml
diff --git a/tools/regression/geom/Ref/disk.msdos.flp.xml b/sbin/geom/core/tests/Ref/disk.msdos.flp.xml
index c176c58..c176c58 100644
--- a/tools/regression/geom/Ref/disk.msdos.flp.xml
+++ b/sbin/geom/core/tests/Ref/disk.msdos.flp.xml
diff --git a/tools/regression/geom/Ref/disk.pc98.wdc0.xml b/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml
index 5ffb0c9..5ffb0c9 100644
--- a/tools/regression/geom/Ref/disk.pc98.wdc0.xml
+++ b/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml
diff --git a/tools/regression/geom/Ref/disk.sun.da0.xml b/sbin/geom/core/tests/Ref/disk.sun.da0.xml
index 15b97c8..15b97c8 100644
--- a/tools/regression/geom/Ref/disk.sun.da0.xml
+++ b/sbin/geom/core/tests/Ref/disk.sun.da0.xml
diff --git a/tools/regression/geom/Ref/disk.sun.da1.xml b/sbin/geom/core/tests/Ref/disk.sun.da1.xml
index 004771b..004771b 100644
--- a/tools/regression/geom/Ref/disk.sun.da1.xml
+++ b/sbin/geom/core/tests/Ref/disk.sun.da1.xml
diff --git a/tools/regression/geom/Ref/disk.typo.ad0.xml b/sbin/geom/core/tests/Ref/disk.typo.ad0.xml
index 6d537dd..6d537dd 100644
--- a/tools/regression/geom/Ref/disk.typo.ad0.xml
+++ b/sbin/geom/core/tests/Ref/disk.typo.ad0.xml
diff --git a/tools/regression/geom/RunTest.t b/sbin/geom/core/tests/run_test.sh
index 96a3530..96a3530 100644
--- a/tools/regression/geom/RunTest.t
+++ b/sbin/geom/core/tests/run_test.sh
diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile
index af5c9bd..83516c6 100644
--- a/sbin/ggate/ggated/Makefile
+++ b/sbin/ggate/ggated/Makefile
@@ -6,7 +6,7 @@ PROG=	ggated
 MAN=	ggated.8
 SRCS=	ggated.c ggate.c
 
-LIBADD=	pthread
+LIBADD=	pthread util
 
 CFLAGS+= -I${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index dd6109a..15b1792 100644
--- a/sbin/ggate/ggated/ggated.8
+++ b/sbin/ggate/ggated/ggated.8
@@ -37,6 +37,7 @@
 .Op Fl v
 .Op Fl a Ar address
 .Op Fl p Ar port
+.Op Fl F Ar pidfile
 .Op Fl R Ar rcvbuf
 .Op Fl S Ar sndbuf
 .Op Ar "exports file"
@@ -67,6 +68,10 @@ Port on which
 .Nm
 listens for connections.
 Default is 3080.
+.It Fl F Ar pidfile
+PID file that
+.Nm
+uses.
 .It Fl R Ar rcvbuf
 Size of receive buffer to use.
 Default is 131072 (128kB).
@@ -86,6 +91,14 @@ The format of an exports file is as follows:
 1.2.3.0/24	RW	/tmp/test.img
 hostname	WO	/tmp/image
 .Ed
+.El
+.Sh FILES
+.Bl -tag -width ".Pa /var/run/ggated.pid" -compact
+.It Pa /var/run/ggated.pid
+The default location of the
+.Nm
+PID file.
+.El
 .Sh EXIT STATUS
 Exit status is 0 on success, or 1 if the command fails.
 To get details about the failure,
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index a340f01..d6a2e47 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -26,32 +26,34 @@
  * $FreeBSD$
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pthread.h>
 #include <sys/param.h>
-#include <sys/queue.h>
+#include <sys/bio.h>
+#include <sys/disk.h>
 #include <sys/endian.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/disk.h>
-#include <sys/bio.h>
+#include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <signal.h>
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
-#include <string.h>
+#include <fcntl.h>
 #include <libgen.h>
-#include <syslog.h>
+#include <libutil.h>
+#include <paths.h>
+#include <pthread.h>
+#include <signal.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
 
 #include "ggate.h"
 
@@ -946,20 +948,18 @@ huphandler(int sig __unused)
 int
 main(int argc, char *argv[])
 {
+	const char *ggated_pidfile = _PATH_VARRUN "/ggated.pid";
+	struct pidfh *pfh;
 	struct sockaddr_in serv;
 	struct sockaddr from;
 	socklen_t fromlen;
-	int sfd, tmpsfd;
+	pid_t otherpid;
+	int ch, sfd, tmpsfd;
 	unsigned port;
 
 	bindaddr = htonl(INADDR_ANY);
 	port = G_GATE_PORT;
-	for (;;) {
-		int ch;
-
-		ch = getopt(argc, argv, "a:hnp:R:S:v");
-		if (ch == -1)
-			break;
+	while ((ch = getopt(argc, argv, "a:hnp:F:R:S:v")) != -1) {
 		switch (ch) {
 		case 'a':
 			bindaddr = g_gate_str2ip(optarg);
@@ -968,6 +968,9 @@ main(int argc, char *argv[])
 				    "Invalid IP/host name to bind to.");
 			}
 			break;
+		case 'F':
+			ggated_pidfile = optarg;
+			break;
 		case 'n':
 			nagle = 0;
 			break;
@@ -1004,12 +1007,23 @@ main(int argc, char *argv[])
 		exports_file = argv[0];
 	exports_get();
 
+	pfh = pidfile_open(ggated_pidfile, 0600, &otherpid);
+	if (pfh == NULL) {
+		if (errno == EEXIST) {
+			errx(EXIT_FAILURE, "Daemon already running, pid: %jd.",
+			    (intmax_t)otherpid);
+		}
+		err(EXIT_FAILURE, "Cannot open/create pidfile");
+	}
+
 	if (!g_gate_verbose) {
 		/* Run in daemon mode. */
 		if (daemon(0, 0) == -1)
 			g_gate_xlog("Cannot daemonize: %s", strerror(errno));
 	}
 
+	pidfile_write(pfh);
+
 	signal(SIGCHLD, SIG_IGN);
 
 	sfd = socket(AF_INET, SOCK_STREAM, 0);
@@ -1046,5 +1060,6 @@ main(int argc, char *argv[])
 			close(tmpsfd);
 	}
 	close(sfd);
+	pidfile_remove(pfh);
 	exit(EXIT_SUCCESS);
 }
diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk
index 6f99d88..b9c94a7 100644
--- a/share/mk/atf.test.mk
+++ b/share/mk/atf.test.mk
@@ -25,7 +25,7 @@ ATF_TESTS_SH?=
 # Path to the prefix of the installed ATF tools, if any.
 #
 # If atf-run and atf-report are installed from ports, we automatically define a
-# realregress target below to run the tests using these tools.  The tools are
+# realcheck target below to run the tests using these tools.  The tools are
 # searched for in the hierarchy specified by this variable.
 ATF_PREFIX?= /usr/local
 
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 5aa1949..527de95 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -448,6 +448,12 @@ It has seven targets:
 
 	all:
 		build the test programs.
+	check:
+		runs the test programs from the object directory; if the
+		Makefile does not itself define the target test, the
+		targets beforecheck and aftercheck may also be used to
+		cause actions immediately before and after the test
+		target is executed.
 	clean:
 		remove the test programs and any object files.
 	cleandir:
@@ -466,12 +472,6 @@ It has seven targets:
 		run lint on the source files.
 	tags:
 		create a tags file for the source files.
-	test:
-		runs the test programs from the object directory; if the
-		Makefile does not itself define the target test, the
-		targets beforetest and aftertest may also be used to
-		cause actions immediately before and after the test
-		target is executed.
 
 It sets/uses the following variables, among many others:
 
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index ec2585f..9fefdc2 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -36,10 +36,10 @@
 .if !target(__<bsd.subdir.mk>__)
 __<bsd.subdir.mk>__:
 
-ALL_SUBDIR_TARGETS= all all-man buildconfig checkdpadd clean cleandepend \
+ALL_SUBDIR_TARGETS= all all-man buildconfig check checkdpadd clean cleandepend \
 		    cleandir cleanilinks cleanobj depend distribute \
 		    installconfig lint maninstall manlint obj objlink \
-		    realinstall regress tags \
+		    realinstall tags \
 		    ${SUBDIR_TARGETS}
 
 # Described above.
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 6eae174..1b0ee8f 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -172,11 +172,11 @@ CXXFLAGS+=	 ${CXXFLAGS.${COMPILER_TYPE}}
 # or expect to ever be up-to-date.
 PHONY_NOTMAIN = afterdepend afterinstall all beforedepend beforeinstall \
 		beforelinking build build-tools buildconfig buildfiles \
-		buildincludes checkdpadd clean cleandepend cleandir cleanobj \
-		configure depend dependall distclean distribute exe \
+		buildincludes check checkdpadd clean cleandepend cleandir \
+		cleanobj configure depend dependall distclean distribute exe \
 		files html includes install installconfig installfiles \
 		installincludes lint obj objlink objs objwarn realall \
-		realdepend realinstall regress subdir-all subdir-depend \
+		realdepend realinstall subdir-all subdir-depend \
 		subdir-install tags whereobj
 
 # we don't want ${PROG} to be PHONY
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
index 86351cf..8102e8a 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -76,19 +76,14 @@ PROGS_TARGETS+= install
 .include <suite.test.mk>
 .endif
 
-.if !target(realtest)
-realtest: .PHONY
+.if !target(realcheck)
+realcheck: .PHONY
 	@echo "$@ not defined; skipping"
 .endif
 
-test: .PHONY
-.ORDER: beforetest realtest
-test: beforetest realtest
-
-.if target(aftertest)
-.ORDER: realtest aftertest
-test: aftertest
-.endif
+beforecheck realcheck aftercheck check: .PHONY
+.ORDER: beforecheck realcheck aftercheck
+check: beforecheck realcheck aftercheck
 
 .ifdef PROG
 # we came here via bsd.progs.mk below
diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk
index c447a17..9afce75 100644
--- a/share/mk/suite.test.mk
+++ b/share/mk/suite.test.mk
@@ -51,7 +51,7 @@ KYUAFILE?= auto
 
 # Path to the prefix of the installed Kyua CLI, if any.
 #
-# If kyua is installed from ports, we automatically define a realtest target
+# If kyua is installed from ports, we automatically define a realcheck target
 # below to run the tests using this tool.  The tools are searched for in the
 # hierarchy specified by this variable.
 KYUA_PREFIX?= /usr/local
@@ -92,9 +92,13 @@ Kyuafile.auto: Makefile
 	@mv Kyuafile.auto.tmp Kyuafile.auto
 .endif
 
+_kyuafile=	${DESTDIR}${TESTSDIR}/Kyuafile
+
 KYUA?= ${KYUA_PREFIX}/bin/kyua
+
+realcheck: .PHONY
 .if exists(${KYUA})
-# Definition of the "make test" target and supporting variables.
+# Definition of the "make check" target and supporting variables.
 #
 # This target, by necessity, can only work for native builds (i.e. a FreeBSD
 # host building a release for the same system).  The target runs Kyua, which is
@@ -103,35 +107,5 @@ KYUA?= ${KYUA_PREFIX}/bin/kyua
 # Due to the dependencies of the binaries built by the source tree and how they
 # are used by tests, it is highly possible for a execution of "make test" to
 # report bogus results unless the new binaries are put in place.
-realtest: .PHONY
-	@echo "*** WARNING: make test is experimental"
-	@echo "***"
-	@echo "*** Using this test does not preclude you from running the tests"
-	@echo "*** installed in ${TESTSBASE}.  This test run may raise false"
-	@echo "*** positives and/or false negatives."
-	@echo
-	@${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \
-	result=0; \
-	echo; \
-	echo "*** Once again, note that "make test" is unsupported."; \
-	test $${result} -eq 0
-.endif
-
-beforetest: .PHONY
-.if defined(TESTSDIR)
-.if ${TESTSDIR} == ${TESTSBASE}
-# Forbid running from ${TESTSBASE}.  It can cause false positives/negatives and
-# it does not cover all the tests (e.g. it misses testing software in external).
-	@echo "*** Sorry, you cannot use make test from src/tests.  Install the"
-	@echo "*** tests into their final location and run them from ${TESTSBASE}"
-	@false
-.else
-	@echo "*** Using this test does not preclude you from running the tests"
-	@echo "*** installed in ${TESTSBASE}.  This test run may raise false"
-	@echo "*** positives and/or false negatives."
-.endif
-.else
-	@echo "*** No TESTSDIR defined; nothing to do."
-	@false
+	@${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile
 .endif
-	@echo
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 015040d..3adf81e 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -13,13 +13,11 @@ TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		mqueue
 TESTS_SUBDIRS+=		netinet
 TESTS_SUBDIRS+=		opencrypto
+TESTS_SUBDIRS+=		pjdfstest
 TESTS_SUBDIRS+=		posixshm
 TESTS_SUBDIRS+=		vfs
 TESTS_SUBDIRS+=		vm
 
-# Items not integrated into kyua runs by default
-SUBDIR+=		pjdfstest
-
 SUBDIR_PARALLEL=
 
 .include <bsd.test.mk>
diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile
deleted file mode 100644
index f550db3..0000000
--- a/tools/regression/geom/ConfCmp/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-PROG=	ConfCmp
-SRCS+=	ConfCmp.c
-SRCS+=	subr_sbuf.c
-
-.PATH:	../../../../sys/kern
-
-NO_OBJ=
-WARNS?=	5
-CFLAGS+=	 -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static
-# Uncomment for ElectricFence
-#LDADD += -lefence -L/usr/local/lib
-
-DPADD += ${LIBBSDXML}
-LDADD += -lbsdxml
-
-MAN=
-CLEANFILES	+= _*
-
-.include <bsd.prog.mk>
-
-test:	${PROG}
-	rm -f _* *.core
-	./${PROG} a1.conf a1.conf
-	./${PROG} a1.conf a1a.conf 
-	if ./${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi
-	if ./${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi
-	if ./${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi
-	./${PROG} a2.conf a2.conf
-	./${PROG} a2.conf a2a.conf
-	if ./${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi
-	if ./${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi
-	if ./${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi
-
diff --git a/tools/regression/geom/RunTest.sh b/tools/regression/geom/RunTest.sh
deleted file mode 100644
index 46a14b4..0000000
--- a/tools/regression/geom/RunTest.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-MD=34
-TMP=/tmp/$$
-
-set -e
-
-r=0
-
-(cd MdLoad && make) > /dev/null 2>&1
-
-for f in Data/disk.*.xml
-do
-	b=`basename $f`
-	mdconfig -d -u $MD > /dev/null 2>&1 || true
-	if [ -c /dev/md$MD ] ; then
-		sleep 1
-	fi
-	if [ -c /dev/md$MD ] ; then
-		sleep 1
-	fi
-	if [ -c /dev/md$MD ] ; then
-		echo "/dev/md$MD is busy" 1>&2
-		exit 1
-	fi
-	MdLoad/MdLoad md${MD} $f
-	if [ -f Ref/$b ] ; then
-		if diskinfo /dev/md${MD}* | 
-		   diff -I '$FreeBSD' -u Ref/$b - > $TMP; then
-			echo "PASSED: $b"
-		else
-			echo "FAILED: $b" 
-			sed 's/^/	/' $TMP
-			r=2;
-		fi
-	else
-		diskinfo /dev/md${MD}* > Ref/`basename $f`
-	fi
-done
-
-mdconfig -d -u $MD > /dev/null 2>&1 || true
-rm -f $TMP
-exit $r
diff --git a/tools/regression/geom_gate/Makefile b/tools/regression/geom_gate/Makefile
deleted file mode 100644
index c5c24ad..0000000
--- a/tools/regression/geom_gate/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# $FreeBSD$
-#
-# Regression tests for geom_gate.
-#
-
-test:
-	@sh runtests.sh
diff --git a/tools/regression/geom_gate/runtests.sh b/tools/regression/geom_gate/runtests.sh
deleted file mode 100644
index 38089c5..0000000
--- a/tools/regression/geom_gate/runtests.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-dir=`dirname $0`
-
-for ts in `dirname $0`/test-*.sh; do
-	sh $ts
-done
diff --git a/tools/regression/geom_gate/test-1.sh b/tools/regression/geom_gate/test-1.sh
deleted file mode 100644
index 44a4960..0000000
--- a/tools/regression/geom_gate/test-1.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-base=`basename $0`
-us=45
-work="/dev/md${us}"
-src="/dev/md`expr $us + 1`"
-conf=`mktemp /tmp/$base.XXXXXX` || exit 1
-
-mdconfig -a -t malloc -s 1M -u $us || exit 1
-mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1
-dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1
-sum=`cat $src | md5 -q`
-
-echo "127.0.0.1 RW $work" > $conf
-ggated $conf
-ggatec create -u $us 127.0.0.1 $work
-
-dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1
-
-if [ `cat $work | md5 -q` != $sum ]; then
-	echo "FAIL"
-else
-	if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then
-		echo "FAIL"
-	else
-		echo "PASS"
-	fi
-fi
-
-ggatec destroy -u $us
-mdconfig -d -u $us
-mdconfig -d -u `expr $us + 1`
-pkill ggated $conf
-rm -f $conf
diff --git a/tools/regression/geom_gate/test-1.t b/tools/regression/geom_gate/test-1.t
deleted file mode 100644
index 279e316..0000000
--- a/tools/regression/geom_gate/test-1.t
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-base=`basename $0`
-us=45
-work="/dev/md${us}"
-src="/dev/md`expr $us + 1`"
-conf=`mktemp /tmp/$base.XXXXXX` || exit 1
-
-mdconfig -a -t malloc -s 1M -u $us || exit 1
-mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1
-dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1
-sum=`cat $src | md5 -q`
-
-echo "127.0.0.1 RW $work" > $conf
-ggated $conf
-ggatec create -u $us 127.0.0.1 $work
-
-dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1
-
-echo '1..2'
-
-if [ `cat $work | md5 -q` != $sum ]; then
-	echo 'not ok 1 - md5 checksum'
-else
-	echo 'ok 1 - md5 checksum'
-
-	if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then
-		echo 'not ok 2 - md5 checksum'
-	else
-		echo 'ok 2 - md5 checksum'
-	fi
-fi
-
-ggatec destroy -u $us
-mdconfig -d -u $us
-mdconfig -d -u `expr $us + 1`
-pkill ggated $conf
-rm -f $conf
diff --git a/tools/regression/geom_gate/test-2.sh b/tools/regression/geom_gate/test-2.sh
deleted file mode 100644
index 498ac45..0000000
--- a/tools/regression/geom_gate/test-2.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-base=`basename $0`
-us=45
-work=`mktemp /tmp/$base.XXXXXX` || exit 1
-src=`mktemp /tmp/$base.XXXXXX` || exit 1
-
-dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1
-sum=`md5 -q $src`
-
-ggatel create -u $us $work
-
-dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1
-
-if [ `md5 -q $work` != $sum ]; then
-	echo "FAIL"
-else
-	if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then
-		echo "FAIL"
-	else
-		echo "PASS"
-	fi
-fi
-
-ggatel destroy -u $us
-rm -f $work $src
diff --git a/tools/regression/geom_gate/test-2.t b/tools/regression/geom_gate/test-2.t
deleted file mode 100644
index 2e5e254..0000000
--- a/tools/regression/geom_gate/test-2.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-base=`basename $0`
-us=45
-work=`mktemp /tmp/$base.XXXXXX` || exit 1
-src=`mktemp /tmp/$base.XXXXXX` || exit 1
-
-dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1
-sum=`md5 -q $src`
-
-ggatel create -u $us $work
-
-dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1
-
-echo '1..2'
-
-if [ `md5 -q $work` != $sum ]; then
-	echo 'not ok 1 - md5 checksum'
-else
-	echo 'ok 1 - md5 checksum'
-	if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then
-		echo 'not ok 2 - md5 checksum'
-	else
-		echo 'ok 2 - md5 checksum'
-	fi
-fi
-
-ggatel destroy -u $us
-rm -f $work $src
diff --git a/tools/regression/geom_gate/test-3.sh b/tools/regression/geom_gate/test-3.sh
deleted file mode 100644
index ca73a5a..0000000
--- a/tools/regression/geom_gate/test-3.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-base=`basename $0`
-us=45
-work="/dev/md${us}"
-src="/dev/md`expr $us + 1`"
-
-mdconfig -a -t malloc -s 1M -u $us || exit 1
-mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1
-dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1
-sum=`cat $src | md5 -q`
-
-ggatel create -u $us $work
-
-dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1
-
-if [ `cat $work | md5 -q` != $sum ]; then
-	echo "FAIL"
-else
-	if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then
-		echo "FAIL"
-	else
-		echo "PASS"
-	fi
-fi
-
-ggatel destroy -u $us
-mdconfig -d -u $us
-mdconfig -d -u `expr $us + 1`
diff --git a/tools/regression/geom_gate/test-3.t b/tools/regression/geom_gate/test-3.t
deleted file mode 100644
index ba2b3c7..0000000
--- a/tools/regression/geom_gate/test-3.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-base=`basename $0`
-us=45
-work="/dev/md${us}"
-src="/dev/md`expr $us + 1`"
-
-mdconfig -a -t malloc -s 1M -u $us || exit 1
-mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1
-dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1
-dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1
-sum=`cat $src | md5 -q`
-
-ggatel create -u $us $work
-
-dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1
-
-echo '1..2'
-
-if [ `cat $work | md5 -q` != $sum ]; then
-	echo 'not ok 1 - md5 checksum'
-else
-	echo 'ok 1 - md5 checksum'
-	if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then
-		echo 'not ok 2 - md5 checksum'
-	else
-		echo 'ok 2 - md5 checksum'
-	fi
-fi
-
-ggatel destroy -u $us
-mdconfig -d -u $us
-mdconfig -d -u `expr $us + 1`
diff --git a/tools/regression/geom_mirror/test-1.t b/tools/regression/geom_mirror/test-1.t
deleted file mode 100644
index b07a8d1..0000000
--- a/tools/regression/geom_mirror/test-1.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. `dirname $0`/conf.sh
-
-echo "1..1"
-
-us0=45
-us1=`expr $us0 + 1`
-us2=`expr $us0 + 2`
-
-mdconfig -a -t malloc -s 1M -u $us0 || exit 1
-mdconfig -a -t malloc -s 2M -u $us1 || exit 1
-mdconfig -a -t malloc -s 3M -u $us2 || exit 1
-
-gmirror label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
-devwait
-
-# Size of created device should be 1MB - 512b.
-
-size=`diskinfo /dev/mirror/${name} | awk '{print $3}'`
-
-if [ $size -eq 1048064 ]; then
-	echo "ok 1"
-else
-	echo "not ok 1"
-fi
-
-gmirror remove $name md${us0}
-gmirror remove $name md${us1}
-gmirror remove $name md${us2}
-mdconfig -d -u $us0
-mdconfig -d -u $us1
-mdconfig -d -u $us2
diff --git a/tools/regression/geom_mirror/test-6.t b/tools/regression/geom_mirror/test-6.t
deleted file mode 100644
index ec86d06..0000000
--- a/tools/regression/geom_mirror/test-6.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. `dirname $0`/conf.sh
-
-echo "1..2"
-
-balance="split"
-us0=45
-us1=`expr $us0 + 1`
-us2=`expr $us0 + 2`
-ddbs=8192
-nblocks1=1024
-nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
-src=`mktemp /tmp/$base.XXXXXX` || exit 1
-dst=`mktemp /tmp/$base.XXXXXX` || exit 1
-
-dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
-
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
-mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
-
-gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} || exit 1
-devwait
-
-dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
-dd if=/dev/zero of=/dev/md${us2} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
-
-dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
-if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
-	echo "not ok 1"
-else
-	echo "ok 1"
-fi
-
-# Connect disk to the mirror.
-gmirror insert ${name} md${us2}
-# Wait for synchronization.
-sleep 1
-dd if=/dev/md${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
-if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
-	echo "not ok 2"
-else
-	echo "ok 2"
-fi
-
-gmirror remove $name md${us0} md${us1} md${us2}
-mdconfig -d -u $us0
-mdconfig -d -u $us1
-mdconfig -d -u $us2
-rm -f ${src} ${dst}
diff --git a/tools/regression/geom_subr.sh b/tools/regression/geom_subr.sh
deleted file mode 100644
index 6047829..0000000
--- a/tools/regression/geom_subr.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-kldstat -q -m g_${class} || g${class} load || exit 1
-
-devwait()
-{
-	while :; do
-		if [ -c /dev/${class}/${name} ]; then
-			return
-		fi
-		sleep 0.2
-	done
-}
diff --git a/tools/regression/geom_uzip/Makefile b/tools/regression/geom_uzip/Makefile
deleted file mode 100644
index 6927ff1..0000000
--- a/tools/regression/geom_uzip/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $FreeBSD$
-#
-# Regression test for geom_ugz.
-#
-
-IMAGE=		test-1.img
-ZIMAGE=		${IMAGE}.uzip
-UZIMAGE=	${ZIMAGE}.uue
-
-test:
-	@sh runtests.sh
-
-image:
-	makefs -s 1048576 ${IMAGE} etalon
-	printf "#\n# $$" >${UZIMAGE}
-	printf "FreeBSD$$\n#\n\n" >> ${UZIMAGE}
-	mkuzip -o ${ZIMAGE} ${IMAGE}
-	uuencode ${ZIMAGE} ${ZIMAGE} >>${UZIMAGE}
-	rm ${ZIMAGE}
-
-clean:
-	rm -f ${IMAGE} ${ZIMAGE}
diff --git a/tools/regression/geom_uzip/runtests.sh b/tools/regression/geom_uzip/runtests.sh
deleted file mode 100644
index 60e78b5..0000000
--- a/tools/regression/geom_uzip/runtests.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-dir=`dirname $0`
-
-for ts in `dirname $0`/test-*.sh; do
-	sh $ts
-done
diff --git a/tools/regression/geom_uzip/test-1.img.uzip.uue b/tools/regression/geom_uzip/test-1.img.uzip.uue
deleted file mode 100644
index ca16f47..0000000
--- a/tools/regression/geom_uzip/test-1.img.uzip.uue
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# $FreeBSD$
-#
-
-begin 755 test-1.img.uzip
-M(R$O8FEN+W-H"B-6,BXP($9O<FUA=`IM/6=E;VU?=7II<`HH:VQD<W1A="`M
-M;2`D;2`R/B8M?'QK;&1L;V%D("1M*3XF+28F;6]U;G1?8V0Y-C8P("]D978O
-M8&UD8V]N9FEG("UA9B`D,&`N=7II<"`D,0IE>&ET("0_"@```````$``````
-M0`````````*0`````````W<````````$F@````````AQ````````")@`````
-M```(OP````````CF````````"0T````````)-`````````E;````````"8(`
-M```````)J0````````G0````````"?<````````*'@````````I%````````
-M"FP````````*DP````````JZ````````"N$````````+"`````````LO````
-M````"U8````````+?0````````ND````````"\L````````+\@````````P9
-M````````#$`````````,9P````````R.````````#+4````````,W```````
-M``T#````````#2H````````-40````````UX````````#9\````````-Q@``
-M``````WM````````#A0````````..P````````YB````````#HD````````.
-ML`````````[7````````#OX````````/)0````````],````````#W,`````
-M```/F@````````_!````````#^@````````0#P```````!`V````````$%T`
-M```````0A````````!"K````````$-(````````0^0```````!$@````````
-M$4<````````1;@```````!&5````````$<%XVNW4/0K",!3`\1>M$`3!42<[
-M>@1!AX)X`^_@X`VZZ.[%''1V]0+>0(@O[0OMZF`5^?_@-6GS2=L\$0``````
-M````````\"_&&A.-7&-NSX)Z7)=KR41N?1$GUD'OO18#Z[>*EWL(\@QAI-6A
-MU.WQHL/J<;ZUF-8++7JM>V?5N-YN<]I7>\@LTGCK%Z.P]CA'J;%(<SDY\C7Q
-M%6?OY>*;/SW_H;W97M*9*ZU<O#E-E0^D.9<Q+T@K9WQ48>>^8]YR7'QWX>"<
-MUTV$F>7(?M,OY:9D.W6<"0```````````'3J!63?'NAXVNW9,4I#01#&\6^3
-M"*L@6&IE2@]@$=#B@7@#!6^@X`W2F-Z+6(BEM:6%UK9>P!L(ZTS>K"^"B"&8
-M6/Q_,&]W\W8W0\A.LU)KRV+;8FBQ%Y\5\_9\<*2!]-*7DF*"C;,U:S'OT!^O
-MI>B]E$WK;JA][P];UJ[+ZEB_L:8W,T[1]>\[/[Z^G.8PB*CK8YY'$^]]C['%
-MJ.Z5-!&P"H\YZREW__3A/\HM<JEG;ASM:,YMIO5`W;GTNJ"9FO&GFCCW2Y:C
-MQOEO5ZY2RI9$V8T:V>_FU=I4G>PDS@0```````````"6[K2W_GFOE_R&[;M[
-M=?W^CN_&XM;BSN+>XB))^Q9G%I.%,BU?1ROS<Y9^Z_<PUPH`````````````
-M`!;S`6\CL0=XVNV:SVXC-1S'TS^PE<6!`T>0?MFN%A8EF:;+BI(]H"1M04NE
-M2FW%BA-X,IX9MYYQ9'LZS=[V`1`OP0-PV$=`W+ARX@&X\`A(_.Q)2:A8@50J
-M0??WD:9V//[Y:W]_GLETVE;KU>:WX5I366V*7W]\//;E#]^\/5PN'UQ39SY\
-MZY>UYECHK_ZE_HNY[F79N2'];Y^OA+)<;S[_--?_[HK^^]?47W^)_HNY_CNM
-M/^L??MWH7I;=&UK_I?[]O]'OW;!^]XK^U?Q'-Z1/$`1!$`1!$`1!$`1!$`1!
-M$`1!$,3MP?]=\!D>.V0%0;R2U_\;K?65WJ*^VL,/:TU];?SY<?C?C9]7-IAP
-M7.FRYRX<^480MX%-M@GW]HT0H^/=`5@SB9S6RD9&9$98*W4994(77U;/Y#1J
-M;@#1XC[0.8=^KP_;6UL?1%L[4?\A;'TT>/1P\&@;TE,M8.]B"O?8)F-/AJ/1
-MWM'3P_%G7S!V(&II8<R-T4JQ]U*C"SC)C:ZR'%PNX$#K,UEFW4\4MQ9XF<#3
-MG#L8*CD1L*\K;#C)A1$=Z.]\N/V`L:].:FXA-E(IF75"A!_'*NGR&3A]+BS;
-ME0ED,R/"V4P6L1(@R]"OYK$8L*%24,C"SJ#&L<.)6!N=^>@.&\['+'0AP'"7
-M6]"5RPR&]AB[.Q(UGP<]X7$L3*TG9QTH9F!UV68X73CEM<4.N)!8.IR[[SM1
-M?S1.N)OD;;8\4!6?5C'V-DFS)IM791@J-54A=65AA,W"V#+$WF7L4XQ$\R!'
-M?\^UF7(%MM8F\2O-L>^`'>@R`R>+1J+@Y85?4(JY\H;Y%#CH=MFQ!DR_$XEO
-MCF>A\TE5N*H`AYNE\<.B5@*\SN6EER$>_<"S.&7K&ZLTE3:_/!=4?%@G+&39
-MJQJ3!6(FT-@44L4+5!GC3\#QTU1)/^^E3>(JE0G,51C+SR:N#.8T";+>SD*T
-M&3LLO=.U;L.BUJ2R&8DOZF%"<]-BQ1,4%J4#6\K)F3!=-'ERUO8.*Y$Z+Y$(
-M/D],F+IT%E?'$]\E1&9<5<4T]Q./,=9OD^!+SFVP`_<GG^_`A0\?L[%/B--^
-M[W!3V+")8L$+[V*L9VUVB/GG\:G/?\)G;;R0E-(Z;RK8\*Z?P237QGD[?.9Q
-M-YSJ6>]?N5`>7^="H?LM0?R76'O)\_]K6'^SM;%^I'5XVG\=C[=:&^Q(3+65
-M3IM9JW4'V[Y?V;BS5SHCA24S">)_QD!<N$$Y.;?=%)_K8IL,HAR_N2/?1%_7
-M!'&[^4>_\=.-@"!N)4LO\Z)^KQ_M&PG#*H/E5WGA]5[$=NDV0!"WB]\!34_J
-M#GC:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
-M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
-M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
-M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
-M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
-M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
-M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
-M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
-M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
-M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
-M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
-M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
-M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
-M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
-M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
-M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
-M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
-M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
-M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
-M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
-M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
-M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
-M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
-M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
-M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
-M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
-M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
-M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
-M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
-M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
-M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
-M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
-M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
-M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
-M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
-M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
-M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
-M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
-M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
-M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q
-M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@
-M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@
-M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````
-M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````
-M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!
-M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:
-M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0``
-M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M
-M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````
-M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````
-M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````
-M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0```
-M`7C:[=`Q`0``#`(@HQO="GOV0002````````````````````>%$%=P/6@`"!
-M````````````````````````````````````````````````````````````
-2````````````````````````
-`
-end
diff --git a/tools/regression/geom_uzip/test-2.sh b/tools/regression/geom_uzip/test-2.sh
deleted file mode 100644
index 8662827..0000000
--- a/tools/regression/geom_uzip/test-2.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-#
-# prepare
-kldload geom_uzip
-uudecode test-1.img.uzip.uue
-num=`mdconfig -an -f test-1.img.uzip` || exit 1
-sleep 1
-
-#
-# destroy
-kldunload geom_uzip