Integrate

tools/regression/geom_{concat,eli,gate,mirror,nop,raid3,shsec,stripe,uzip}
in to the FreeBSD test suite as
tests/sys/geom/class/{concat,eli,gate,mirror,nop,raid3,shsec,stripe,uzip}

The tools/regression/geom and tools/regression/geom_part testcases are being
left alone because both test sets are both currently broken.

The majority of this work was done on ^/user/ngie/more-tests2 . The differences
are as follows:
- tests/sys/geom/class/Makefile.inc is not present; it was
  inlined into the class's Makefiles for explicitness.
- The testcases officially require root via kyua
- The geom_gate(4) tests don't use the pidfile changes proposed in
  https://reviews.freebsd.org/D4836 .

MFC after: 1 month
Sponsored by: EMC / Isilon Storage Division

77 files changed, 268 insertions, 24 deletions

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index ff32324..ea10412 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -376,6 +376,32 @@
         ..
         file
         ..
+        geom
+            class
+                concat
+                ..
+                eli
+                ..
+                gate
+                ..
+                gpt
+                ..
+                mirror
+                ..
+                nop
+                ..
+                raid3
+                ..
+                shsec
+                ..
+                stripe
+                ..
+                uzip
+                    etalon
+                    ..
+                ..
+            ..
+        ..
         kern
             acct
             ..
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 4e653be..18a24a4 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -8,6 +8,7 @@ TESTS_SUBDIRS+=		acl
 TESTS_SUBDIRS+=		aio
 TESTS_SUBDIRS+=		fifo
 TESTS_SUBDIRS+=		file
+TESTS_SUBDIRS+=		geom
 TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		mac
diff --git a/tests/sys/geom/Makefile b/tests/sys/geom/Makefile
new file mode 100644
index 0000000..bf8604d
--- /dev/null
+++ b/tests/sys/geom/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom
+
+TESTS_SUBDIRS+=	class
+
+.include <bsd.test.mk>
diff --git a/tests/sys/geom/class/Makefile b/tests/sys/geom/class/Makefile
new file mode 100644
index 0000000..c705616
--- /dev/null
+++ b/tests/sys/geom/class/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class
+
+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=		${TESTSDIR}
+
+FILES+=		geom_subr.sh
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_concat/test-1.t b/tests/sys/geom/class/concat/1_test.sh
index ef80a61..ef80a61 100644
--- a/tools/regression/geom_concat/test-1.t
+++ b/tests/sys/geom/class/concat/1_test.sh
diff --git a/tools/regression/geom_concat/test-2.t b/tests/sys/geom/class/concat/2_test.sh
index 95636be..95636be 100644
--- a/tools/regression/geom_concat/test-2.t
+++ b/tests/sys/geom/class/concat/2_test.sh
diff --git a/tests/sys/geom/class/concat/Makefile b/tests/sys/geom/class/concat/Makefile
new file mode 100644
index 0000000..5659b5d
--- /dev/null
+++ b/tests/sys/geom/class/concat/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_concat/conf.sh b/tests/sys/geom/class/concat/conf.sh
index 374ed12..374ed12 100644
--- a/tools/regression/geom_concat/conf.sh
+++ b/tests/sys/geom/class/concat/conf.sh
diff --git a/tests/sys/geom/class/eli/Makefile b/tests/sys/geom/class/eli/Makefile
new file mode 100644
index 0000000..8f4ca60
--- /dev/null
+++ b/tests/sys/geom/class/eli/Makefile
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+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_a_test+=	timeout="600"
+TEST_METADATA.onetime_test+=	timeout="600"
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_eli/attach-d.t b/tests/sys/geom/class/eli/attach_d_test.sh
index 5d700b3..5d700b3 100644
--- a/tools/regression/geom_eli/attach-d.t
+++ b/tests/sys/geom/class/eli/attach_d_test.sh
diff --git a/tools/regression/geom_eli/conf.sh b/tests/sys/geom/class/eli/conf.sh
index 0646e83..0646e83 100755
--- a/tools/regression/geom_eli/conf.sh
+++ b/tests/sys/geom/class/eli/conf.sh
diff --git a/tools/regression/geom_eli/configure-b-B.t b/tests/sys/geom/class/eli/configure_b_B_test.sh
index b6cdf4f..b6cdf4f 100644
--- a/tools/regression/geom_eli/configure-b-B.t
+++ b/tests/sys/geom/class/eli/configure_b_B_test.sh
diff --git a/tools/regression/geom_eli/delkey.t b/tests/sys/geom/class/eli/delkey_test.sh
index 67b253e..67b253e 100644
--- a/tools/regression/geom_eli/delkey.t
+++ b/tests/sys/geom/class/eli/delkey_test.sh
diff --git a/tools/regression/geom_eli/detach-l.t b/tests/sys/geom/class/eli/detach_l_test.sh
index 605ae94..605ae94 100644
--- a/tools/regression/geom_eli/detach-l.t
+++ b/tests/sys/geom/class/eli/detach_l_test.sh
diff --git a/tools/regression/geom_eli/init-B.t b/tests/sys/geom/class/eli/init_B_test.sh
index 3ba743c..3ba743c 100644
--- a/tools/regression/geom_eli/init-B.t
+++ b/tests/sys/geom/class/eli/init_B_test.sh
diff --git a/tools/regression/geom_eli/init-J.t b/tests/sys/geom/class/eli/init_J_test.sh
index 266a3d5..266a3d5 100644
--- a/tools/regression/geom_eli/init-J.t
+++ b/tests/sys/geom/class/eli/init_J_test.sh
diff --git a/tools/regression/geom_eli/init-a.t b/tests/sys/geom/class/eli/init_a_test.sh
index dbb24fe..dbb24fe 100644
--- a/tools/regression/geom_eli/init-a.t
+++ b/tests/sys/geom/class/eli/init_a_test.sh
diff --git a/tools/regression/geom_eli/init-i-P.t b/tests/sys/geom/class/eli/init_i_P_test.sh
index 1c59a97..1c59a97 100644
--- a/tools/regression/geom_eli/init-i-P.t
+++ b/tests/sys/geom/class/eli/init_i_P_test.sh
diff --git a/tools/regression/geom_eli/init.t b/tests/sys/geom/class/eli/init_test.sh
index 71dd6e2..71dd6e2 100644
--- a/tools/regression/geom_eli/init.t
+++ b/tests/sys/geom/class/eli/init_test.sh
diff --git a/tools/regression/geom_eli/integrity-copy.t b/tests/sys/geom/class/eli/integrity_copy_test.sh
index 4c8efd3..4c8efd3 100644
--- a/tools/regression/geom_eli/integrity-copy.t
+++ b/tests/sys/geom/class/eli/integrity_copy_test.sh
diff --git a/tools/regression/geom_eli/integrity-data.t b/tests/sys/geom/class/eli/integrity_data_test.sh
index 7ea7c96b..7ea7c96b 100644
--- a/tools/regression/geom_eli/integrity-data.t
+++ b/tests/sys/geom/class/eli/integrity_data_test.sh
diff --git a/tools/regression/geom_eli/integrity-hmac.t b/tests/sys/geom/class/eli/integrity_hmac_test.sh
index 243eac9..243eac9 100644
--- a/tools/regression/geom_eli/integrity-hmac.t
+++ b/tests/sys/geom/class/eli/integrity_hmac_test.sh
diff --git a/tools/regression/geom_eli/kill.t b/tests/sys/geom/class/eli/kill_test.sh
index ccced9f..ccced9f 100644
--- a/tools/regression/geom_eli/kill.t
+++ b/tests/sys/geom/class/eli/kill_test.sh
diff --git a/tools/regression/geom_eli/nokey.t b/tests/sys/geom/class/eli/nokey_test.sh
index f32e1a4..f32e1a4 100644
--- a/tools/regression/geom_eli/nokey.t
+++ b/tests/sys/geom/class/eli/nokey_test.sh
diff --git a/tools/regression/geom_eli/onetime-a.t b/tests/sys/geom/class/eli/onetime_a_test.sh
index 4e26dfb..4e26dfb 100644
--- a/tools/regression/geom_eli/onetime-a.t
+++ b/tests/sys/geom/class/eli/onetime_a_test.sh
diff --git a/tools/regression/geom_eli/onetime-d.t b/tests/sys/geom/class/eli/onetime_d_test.sh
index 51a6abb..51a6abb 100644
--- a/tools/regression/geom_eli/onetime-d.t
+++ b/tests/sys/geom/class/eli/onetime_d_test.sh
diff --git a/tools/regression/geom_eli/onetime.t b/tests/sys/geom/class/eli/onetime_test.sh
index 17061d0..17061d0 100644
--- a/tools/regression/geom_eli/onetime.t
+++ b/tests/sys/geom/class/eli/onetime_test.sh
diff --git a/tools/regression/geom_eli/readonly.t b/tests/sys/geom/class/eli/readonly_test.sh
index 721ad62..721ad62 100644
--- a/tools/regression/geom_eli/readonly.t
+++ b/tests/sys/geom/class/eli/readonly_test.sh
diff --git a/tools/regression/geom_eli/resize.t b/tests/sys/geom/class/eli/resize_test.sh
index 67d6291..67d6291 100644
--- a/tools/regression/geom_eli/resize.t
+++ b/tests/sys/geom/class/eli/resize_test.sh
diff --git a/tools/regression/geom_eli/setkey.t b/tests/sys/geom/class/eli/setkey_test.sh
index 458100c..458100c 100644
--- a/tools/regression/geom_eli/setkey.t
+++ b/tests/sys/geom/class/eli/setkey_test.sh
diff --git a/tools/regression/geom_gate/test-1.t b/tests/sys/geom/class/gate/1_test.sh
index 83f6096..83f6096 100644
--- a/tools/regression/geom_gate/test-1.t
+++ b/tests/sys/geom/class/gate/1_test.sh
diff --git a/tools/regression/geom_gate/test-2.t b/tests/sys/geom/class/gate/2_test.sh
index be89acc..be89acc 100644
--- a/tools/regression/geom_gate/test-2.t
+++ b/tests/sys/geom/class/gate/2_test.sh
diff --git a/tools/regression/geom_gate/test-3.t b/tests/sys/geom/class/gate/3_test.sh
index 8901aca..8901aca 100644
--- a/tools/regression/geom_gate/test-3.t
+++ b/tests/sys/geom/class/gate/3_test.sh
diff --git a/tests/sys/geom/class/gate/Makefile b/tests/sys/geom/class/gate/Makefile
new file mode 100644
index 0000000..11ceb94
--- /dev/null
+++ b/tests/sys/geom/class/gate/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+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}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_gate/conf.sh b/tests/sys/geom/class/gate/conf.sh
index 4eede08..4eede08 100755
--- a/tools/regression/geom_gate/conf.sh
+++ b/tests/sys/geom/class/gate/conf.sh
diff --git a/tools/regression/geom_subr.sh b/tests/sys/geom/class/geom_subr.sh
index b437183..b437183 100644
--- a/tools/regression/geom_subr.sh
+++ b/tests/sys/geom/class/geom_subr.sh
diff --git a/tools/regression/geom_mirror/test-1.t b/tests/sys/geom/class/mirror/1_test.sh
index af82a14..af82a14 100644
--- a/tools/regression/geom_mirror/test-1.t
+++ b/tests/sys/geom/class/mirror/1_test.sh
diff --git a/tools/regression/geom_mirror/test-2.t b/tests/sys/geom/class/mirror/2_test.sh
index 5605c44..5605c44 100644
--- a/tools/regression/geom_mirror/test-2.t
+++ b/tests/sys/geom/class/mirror/2_test.sh
diff --git a/tools/regression/geom_mirror/test-3.t b/tests/sys/geom/class/mirror/3_test.sh
index b7f8525..b7f8525 100644
--- a/tools/regression/geom_mirror/test-3.t
+++ b/tests/sys/geom/class/mirror/3_test.sh
diff --git a/tools/regression/geom_mirror/test-4.t b/tests/sys/geom/class/mirror/4_test.sh
index 6efcc02..6efcc02 100644
--- a/tools/regression/geom_mirror/test-4.t
+++ b/tests/sys/geom/class/mirror/4_test.sh
diff --git a/tools/regression/geom_mirror/test-5.t b/tests/sys/geom/class/mirror/5_test.sh
index 3a176b5..3a176b5 100644
--- a/tools/regression/geom_mirror/test-5.t
+++ b/tests/sys/geom/class/mirror/5_test.sh
diff --git a/tools/regression/geom_mirror/test-6.t b/tests/sys/geom/class/mirror/6_test.sh
index 68036e9..68036e9 100644
--- a/tools/regression/geom_mirror/test-6.t
+++ b/tests/sys/geom/class/mirror/6_test.sh
diff --git a/tools/regression/geom_mirror/test-7.t b/tests/sys/geom/class/mirror/7_test.sh
index f5bf71a..f5bf71a 100644
--- a/tools/regression/geom_mirror/test-7.t
+++ b/tests/sys/geom/class/mirror/7_test.sh
diff --git a/tests/sys/geom/class/mirror/Makefile b/tests/sys/geom/class/mirror/Makefile
new file mode 100644
index 0000000..931f7d0
--- /dev/null
+++ b/tests/sys/geom/class/mirror/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+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}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_mirror/conf.sh b/tests/sys/geom/class/mirror/conf.sh
index d8595f1..d8595f1 100644
--- a/tools/regression/geom_mirror/conf.sh
+++ b/tests/sys/geom/class/mirror/conf.sh
diff --git a/tools/regression/geom_nop/test-1.t b/tests/sys/geom/class/nop/1_test.sh
index 4d6b65d..4d6b65d 100644
--- a/tools/regression/geom_nop/test-1.t
+++ b/tests/sys/geom/class/nop/1_test.sh
diff --git a/tools/regression/geom_nop/test-2.t b/tests/sys/geom/class/nop/2_test.sh
index 7422345..7422345 100644
--- a/tools/regression/geom_nop/test-2.t
+++ b/tests/sys/geom/class/nop/2_test.sh
diff --git a/tests/sys/geom/class/nop/Makefile b/tests/sys/geom/class/nop/Makefile
new file mode 100644
index 0000000..5659b5d
--- /dev/null
+++ b/tests/sys/geom/class/nop/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_nop/conf.sh b/tests/sys/geom/class/nop/conf.sh
index e38e10c..e38e10c 100644
--- a/tools/regression/geom_nop/conf.sh
+++ b/tests/sys/geom/class/nop/conf.sh
diff --git a/tools/regression/geom_raid3/test-10.t b/tests/sys/geom/class/raid3/10_test.sh
index edd827d..edd827d 100644
--- a/tools/regression/geom_raid3/test-10.t
+++ b/tests/sys/geom/class/raid3/10_test.sh
diff --git a/tools/regression/geom_raid3/test-11.t b/tests/sys/geom/class/raid3/11_test.sh
index 0407261..0407261 100644
--- a/tools/regression/geom_raid3/test-11.t
+++ b/tests/sys/geom/class/raid3/11_test.sh
diff --git a/tools/regression/geom_raid3/test-12.t b/tests/sys/geom/class/raid3/12_test.sh
index 10533c6..10533c6 100644
--- a/tools/regression/geom_raid3/test-12.t
+++ b/tests/sys/geom/class/raid3/12_test.sh
diff --git a/tools/regression/geom_raid3/test-1.t b/tests/sys/geom/class/raid3/1_test.sh
index 4c0b4a2..4c0b4a2 100644
--- a/tools/regression/geom_raid3/test-1.t
+++ b/tests/sys/geom/class/raid3/1_test.sh
diff --git a/tools/regression/geom_raid3/test-2.t b/tests/sys/geom/class/raid3/2_test.sh
index 22ebd38..22ebd38 100644
--- a/tools/regression/geom_raid3/test-2.t
+++ b/tests/sys/geom/class/raid3/2_test.sh
diff --git a/tools/regression/geom_raid3/test-3.t b/tests/sys/geom/class/raid3/3_test.sh
index f068b06..f068b06 100644
--- a/tools/regression/geom_raid3/test-3.t
+++ b/tests/sys/geom/class/raid3/3_test.sh
diff --git a/tools/regression/geom_raid3/test-4.t b/tests/sys/geom/class/raid3/4_test.sh
index 810f13d..810f13d 100644
--- a/tools/regression/geom_raid3/test-4.t
+++ b/tests/sys/geom/class/raid3/4_test.sh
diff --git a/tools/regression/geom_raid3/test-5.t b/tests/sys/geom/class/raid3/5_test.sh
index 7bc8d42..7bc8d42 100644
--- a/tools/regression/geom_raid3/test-5.t
+++ b/tests/sys/geom/class/raid3/5_test.sh
diff --git a/tools/regression/geom_raid3/test-6.t b/tests/sys/geom/class/raid3/6_test.sh
index 20bf192..20bf192 100644
--- a/tools/regression/geom_raid3/test-6.t
+++ b/tests/sys/geom/class/raid3/6_test.sh
diff --git a/tools/regression/geom_raid3/test-7.t b/tests/sys/geom/class/raid3/7_test.sh
index 23666f8..23666f8 100644
--- a/tools/regression/geom_raid3/test-7.t
+++ b/tests/sys/geom/class/raid3/7_test.sh
diff --git a/tools/regression/geom_raid3/test-8.t b/tests/sys/geom/class/raid3/8_test.sh
index 2eb9b1a..2eb9b1a 100644
--- a/tools/regression/geom_raid3/test-8.t
+++ b/tests/sys/geom/class/raid3/8_test.sh
diff --git a/tools/regression/geom_raid3/test-9.t b/tests/sys/geom/class/raid3/9_test.sh
index 0ef010a..0ef010a 100644
--- a/tools/regression/geom_raid3/test-9.t
+++ b/tests/sys/geom/class/raid3/9_test.sh
diff --git a/tests/sys/geom/class/raid3/Makefile b/tests/sys/geom/class/raid3/Makefile
new file mode 100644
index 0000000..526c175
--- /dev/null
+++ b/tests/sys/geom/class/raid3/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+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}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_raid3/conf.sh b/tests/sys/geom/class/raid3/conf.sh
index f1b270a..f1b270a 100644
--- a/tools/regression/geom_raid3/conf.sh
+++ b/tests/sys/geom/class/raid3/conf.sh
diff --git a/tools/regression/geom_shsec/test-1.t b/tests/sys/geom/class/shsec/1_test.sh
index ab0bb37..ab0bb37 100644
--- a/tools/regression/geom_shsec/test-1.t
+++ b/tests/sys/geom/class/shsec/1_test.sh
diff --git a/tools/regression/geom_shsec/test-2.t b/tests/sys/geom/class/shsec/2_test.sh
index 9dfe36a..9dfe36a 100644
--- a/tools/regression/geom_shsec/test-2.t
+++ b/tests/sys/geom/class/shsec/2_test.sh
diff --git a/tests/sys/geom/class/shsec/Makefile b/tests/sys/geom/class/shsec/Makefile
new file mode 100644
index 0000000..5659b5d
--- /dev/null
+++ b/tests/sys/geom/class/shsec/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_shsec/conf.sh b/tests/sys/geom/class/shsec/conf.sh
index 7800eb7..7800eb7 100644
--- a/tools/regression/geom_shsec/conf.sh
+++ b/tests/sys/geom/class/shsec/conf.sh
diff --git a/tools/regression/geom_stripe/test-1.t b/tests/sys/geom/class/stripe/1_test.sh
index 7923763..7923763 100644
--- a/tools/regression/geom_stripe/test-1.t
+++ b/tests/sys/geom/class/stripe/1_test.sh
diff --git a/tools/regression/geom_stripe/test-2.t b/tests/sys/geom/class/stripe/2_test.sh
index f6e11f5..f6e11f5 100644
--- a/tools/regression/geom_stripe/test-2.t
+++ b/tests/sys/geom/class/stripe/2_test.sh
diff --git a/tests/sys/geom/class/stripe/Makefile b/tests/sys/geom/class/stripe/Makefile
new file mode 100644
index 0000000..5659b5d
--- /dev/null
+++ b/tests/sys/geom/class/stripe/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+
+FILES+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+FILESDIR=	${TESTSDIR}
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_stripe/conf.sh b/tests/sys/geom/class/stripe/conf.sh
index fd0f41c..fd0f41c 100644
--- a/tools/regression/geom_stripe/conf.sh
+++ b/tests/sys/geom/class/stripe/conf.sh
diff --git a/tools/regression/geom_uzip/test-1.t b/tests/sys/geom/class/uzip/1_test.sh
index b156c06..222b6c9 100644
--- a/tools/regression/geom_uzip/test-1.t
+++ b/tests/sys/geom/class/uzip/1_test.sh
@@ -6,7 +6,7 @@ testsdir=$(dirname $0)
 
 echo "1..1"
 
-UUE=$testsdir/test-1.img.uzip.uue
+UUE=$testsdir/1.img.uzip.uue
 uudecode $UUE
 us0=$(attach_md -f $(basename $UUE .uue)) || exit 1
 sleep 1
diff --git a/tests/sys/geom/class/uzip/Makefile b/tests/sys/geom/class/uzip/Makefile
new file mode 100644
index 0000000..b962406
--- /dev/null
+++ b/tests/sys/geom/class/uzip/Makefile
@@ -0,0 +1,42 @@
+#
+# $FreeBSD$
+#
+# Regression test for geom_uzip.
+#
+
+TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+
+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+=		conf.sh
+FILESNAME_conf.sh=	conf.sh
+
+FILES+=		${UZIMAGE}
+FILESDIR=	${TESTSDIR}
+
+FILESGROUPS=	FILES etalon
+etalon+=	etalon/etalon.txt
+etalonDIR=	${TESTSDIR}/etalon
+
+TAP_TESTS_SH+=	1_test
+
+.for t in ${TAP_TESTS_SH}
+TEST_METADATA.$t+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/geom_uzip/conf.sh b/tests/sys/geom/class/uzip/conf.sh
index 9a22841..9a22841 100755
--- a/tools/regression/geom_uzip/conf.sh
+++ b/tests/sys/geom/class/uzip/conf.sh
diff --git a/tools/regression/geom_uzip/etalon/etalon.txt b/tests/sys/geom/class/uzip/etalon/etalon.txt
index cb8acf3..cb8acf3 100644
--- a/tools/regression/geom_uzip/etalon/etalon.txt
+++ b/tests/sys/geom/class/uzip/etalon/etalon.txt
diff --git a/tools/regression/geom_uzip/test-1.img.uzip.uue b/tests/sys/geom/class/uzip/test-1.img.uzip.uue
index ca16f47..ca16f47 100644
--- a/tools/regression/geom_uzip/test-1.img.uzip.uue
+++ b/tests/sys/geom/class/uzip/test-1.img.uzip.uue
diff --git a/tools/regression/geom_uzip/Makefile b/tools/regression/geom_uzip/Makefile
deleted file mode 100644
index 3186ef6..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:
-	prove -rv ./test-1.t
-
-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}