Move sbin/geom/class/tests to tests/sys/geom/class and remove sbin/geom/tests

This is inspired by parallel efforts being done on projects/zfsd (and makes
more sense because these are functional tests of the subsystems, not the
geom(8) commands

80 files changed, 35 insertions, 36 deletions

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 089a419..be83bc4 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -341,30 +341,6 @@
         devd
         ..
         geom
-            class
-                concat
-                ..
-                eli
-                ..
-                gate
-                ..
-                gpt
-                ..
-                mirror
-                ..
-                nop
-                ..
-                raid3
-                ..
-                shsec
-                ..
-                stripe
-                ..
-                uzip
-                    etalon
-                    ..
-                ..
-            ..
             core
                 ConfCmp
                 ..
@@ -412,6 +388,32 @@
         ..
         file
         ..
+        geom
+            class
+                concat
+                ..
+                eli
+                ..
+                gate
+                ..
+                gpt
+                ..
+                mirror
+                ..
+                nop
+                ..
+                raid3
+                ..
+                shsec
+                ..
+                stripe
+                ..
+                uzip
+                    etalon
+                    ..
+                ..
+            ..
+        ..
         kern
             acct
             ..
diff --git a/sbin/geom/class/tests/Makefile.inc b/sbin/geom/class/tests/Makefile.inc
deleted file mode 100644
index 522da0b..0000000
--- a/sbin/geom/class/tests/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-GEOM_CLASS=		${.CURDIR:T}
-
-TESTSDIR=		${TESTSBASE}/sbin/geom/class/${GEOM_CLASS}
diff --git a/sbin/geom/tests/Makefile b/sbin/geom/tests/Makefile
deleted file mode 100644
index f0d4d12..0000000
--- a/sbin/geom/tests/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${SRCTOP}/tests
-
-TESTSDIR=	${TESTSBASE}/sbin/geom
-KYUAFILE=	yes
-
-.include <bsd.test.mk>
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 702f664..a1f1ad6 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/sbin/geom/class/tests/Makefile b/tests/sys/geom/class/Makefile
index 6213996..c705616 100644
--- a/sbin/geom/class/tests/Makefile
+++ b/tests/sys/geom/class/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+TESTSDIR=	${TESTSBASE}/sys/geom/class
+
 TESTS_SUBDIRS+=	concat
 TESTS_SUBDIRS+=	eli
 TESTS_SUBDIRS+=	gate
@@ -12,7 +14,7 @@ TESTS_SUBDIRS+=	shsec
 TESTS_SUBDIRS+=	stripe
 TESTS_SUBDIRS+=	uzip
 
-BINDIR=		${TESTSBASE}/sbin/geom/class
+BINDIR=		${TESTSDIR}
 
 FILES+=		geom_subr.sh
 
diff --git a/tests/sys/geom/class/Makefile.inc b/tests/sys/geom/class/Makefile.inc
new file mode 100644
index 0000000..17e59b0
--- /dev/null
+++ b/tests/sys/geom/class/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+GEOM_CLASS=		${.CURDIR:T}
+
+TESTSDIR=		${TESTSBASE}/sys/geom/class/${GEOM_CLASS}
diff --git a/sbin/geom/class/tests/concat/1_test.sh b/tests/sys/geom/class/concat/1_test.sh
index ef80a61..ef80a61 100755
--- a/sbin/geom/class/tests/concat/1_test.sh
+++ b/tests/sys/geom/class/concat/1_test.sh
diff --git a/sbin/geom/class/tests/concat/2_test.sh b/tests/sys/geom/class/concat/2_test.sh
index 95636be..95636be 100755
--- a/sbin/geom/class/tests/concat/2_test.sh
+++ b/tests/sys/geom/class/concat/2_test.sh
diff --git a/sbin/geom/class/tests/concat/Makefile b/tests/sys/geom/class/concat/Makefile
index 81a4e99..81a4e99 100644
--- a/sbin/geom/class/tests/concat/Makefile
+++ b/tests/sys/geom/class/concat/Makefile
diff --git a/sbin/geom/class/tests/concat/conf.sh b/tests/sys/geom/class/concat/conf.sh
index 374ed12..374ed12 100755
--- a/sbin/geom/class/tests/concat/conf.sh
+++ b/tests/sys/geom/class/concat/conf.sh
diff --git a/sbin/geom/class/tests/eli/Makefile b/tests/sys/geom/class/eli/Makefile
index 1846ed6..1846ed6 100644
--- a/sbin/geom/class/tests/eli/Makefile
+++ b/tests/sys/geom/class/eli/Makefile
diff --git a/sbin/geom/class/tests/eli/attach_d_test.sh b/tests/sys/geom/class/eli/attach_d_test.sh
index 5d700b3..5d700b3 100755
--- a/sbin/geom/class/tests/eli/attach_d_test.sh
+++ b/tests/sys/geom/class/eli/attach_d_test.sh
diff --git a/sbin/geom/class/tests/eli/conf.sh b/tests/sys/geom/class/eli/conf.sh
index 080fa61..080fa61 100755
--- a/sbin/geom/class/tests/eli/conf.sh
+++ b/tests/sys/geom/class/eli/conf.sh
diff --git a/sbin/geom/class/tests/eli/configure_b_B_test.sh b/tests/sys/geom/class/eli/configure_b_B_test.sh
index b6cdf4f..b6cdf4f 100755
--- a/sbin/geom/class/tests/eli/configure_b_B_test.sh
+++ b/tests/sys/geom/class/eli/configure_b_B_test.sh
diff --git a/sbin/geom/class/tests/eli/delkey_test.sh b/tests/sys/geom/class/eli/delkey_test.sh
index 67b253e..67b253e 100755
--- a/sbin/geom/class/tests/eli/delkey_test.sh
+++ b/tests/sys/geom/class/eli/delkey_test.sh
diff --git a/sbin/geom/class/tests/eli/detach_l_test.sh b/tests/sys/geom/class/eli/detach_l_test.sh
index 605ae94..605ae94 100755
--- a/sbin/geom/class/tests/eli/detach_l_test.sh
+++ b/tests/sys/geom/class/eli/detach_l_test.sh
diff --git a/sbin/geom/class/tests/eli/init_B_test.sh b/tests/sys/geom/class/eli/init_B_test.sh
index 3ba743c..3ba743c 100755
--- a/sbin/geom/class/tests/eli/init_B_test.sh
+++ b/tests/sys/geom/class/eli/init_B_test.sh
diff --git a/sbin/geom/class/tests/eli/init_J_test.sh b/tests/sys/geom/class/eli/init_J_test.sh
index 266a3d5..266a3d5 100755
--- a/sbin/geom/class/tests/eli/init_J_test.sh
+++ b/tests/sys/geom/class/eli/init_J_test.sh
diff --git a/sbin/geom/class/tests/eli/init_a_test.sh b/tests/sys/geom/class/eli/init_a_test.sh
index dbb24fe..dbb24fe 100755
--- a/sbin/geom/class/tests/eli/init_a_test.sh
+++ b/tests/sys/geom/class/eli/init_a_test.sh
diff --git a/sbin/geom/class/tests/eli/init_i_P_test.sh b/tests/sys/geom/class/eli/init_i_P_test.sh
index 1c59a97..1c59a97 100755
--- a/sbin/geom/class/tests/eli/init_i_P_test.sh
+++ b/tests/sys/geom/class/eli/init_i_P_test.sh
diff --git a/sbin/geom/class/tests/eli/init_test.sh b/tests/sys/geom/class/eli/init_test.sh
index 71dd6e2..71dd6e2 100755
--- a/sbin/geom/class/tests/eli/init_test.sh
+++ b/tests/sys/geom/class/eli/init_test.sh
diff --git a/sbin/geom/class/tests/eli/integrity_copy_test.sh b/tests/sys/geom/class/eli/integrity_copy_test.sh
index 4c8efd3..4c8efd3 100755
--- a/sbin/geom/class/tests/eli/integrity_copy_test.sh
+++ b/tests/sys/geom/class/eli/integrity_copy_test.sh
diff --git a/sbin/geom/class/tests/eli/integrity_data_test.sh b/tests/sys/geom/class/eli/integrity_data_test.sh
index 7ea7c96b..7ea7c96b 100755
--- a/sbin/geom/class/tests/eli/integrity_data_test.sh
+++ b/tests/sys/geom/class/eli/integrity_data_test.sh
diff --git a/sbin/geom/class/tests/eli/integrity_hmac_test.sh b/tests/sys/geom/class/eli/integrity_hmac_test.sh
index 243eac9..243eac9 100755
--- a/sbin/geom/class/tests/eli/integrity_hmac_test.sh
+++ b/tests/sys/geom/class/eli/integrity_hmac_test.sh
diff --git a/sbin/geom/class/tests/eli/kill_test.sh b/tests/sys/geom/class/eli/kill_test.sh
index ccced9f..ccced9f 100755
--- a/sbin/geom/class/tests/eli/kill_test.sh
+++ b/tests/sys/geom/class/eli/kill_test.sh
diff --git a/sbin/geom/class/tests/eli/nokey_test.sh b/tests/sys/geom/class/eli/nokey_test.sh
index f32e1a4..f32e1a4 100755
--- a/sbin/geom/class/tests/eli/nokey_test.sh
+++ b/tests/sys/geom/class/eli/nokey_test.sh
diff --git a/sbin/geom/class/tests/eli/onetime_a_test.sh b/tests/sys/geom/class/eli/onetime_a_test.sh
index 4e26dfb..4e26dfb 100755
--- a/sbin/geom/class/tests/eli/onetime_a_test.sh
+++ b/tests/sys/geom/class/eli/onetime_a_test.sh
diff --git a/sbin/geom/class/tests/eli/onetime_d_test.sh b/tests/sys/geom/class/eli/onetime_d_test.sh
index 51a6abb..51a6abb 100755
--- a/sbin/geom/class/tests/eli/onetime_d_test.sh
+++ b/tests/sys/geom/class/eli/onetime_d_test.sh
diff --git a/sbin/geom/class/tests/eli/onetime_test.sh b/tests/sys/geom/class/eli/onetime_test.sh
index 17061d0..17061d0 100755
--- a/sbin/geom/class/tests/eli/onetime_test.sh
+++ b/tests/sys/geom/class/eli/onetime_test.sh
diff --git a/sbin/geom/class/tests/eli/readonly_test.sh b/tests/sys/geom/class/eli/readonly_test.sh
index 721ad62..721ad62 100755
--- a/sbin/geom/class/tests/eli/readonly_test.sh
+++ b/tests/sys/geom/class/eli/readonly_test.sh
diff --git a/sbin/geom/class/tests/eli/resize_test.sh b/tests/sys/geom/class/eli/resize_test.sh
index 67d6291..67d6291 100755
--- a/sbin/geom/class/tests/eli/resize_test.sh
+++ b/tests/sys/geom/class/eli/resize_test.sh
diff --git a/sbin/geom/class/tests/eli/setkey_test.sh b/tests/sys/geom/class/eli/setkey_test.sh
index 458100c..458100c 100755
--- a/sbin/geom/class/tests/eli/setkey_test.sh
+++ b/tests/sys/geom/class/eli/setkey_test.sh
diff --git a/sbin/geom/class/tests/gate/1_test.sh b/tests/sys/geom/class/gate/1_test.sh
index fb6fd62..fb6fd62 100755
--- a/sbin/geom/class/tests/gate/1_test.sh
+++ b/tests/sys/geom/class/gate/1_test.sh
diff --git a/sbin/geom/class/tests/gate/2_test.sh b/tests/sys/geom/class/gate/2_test.sh
index be89acc..be89acc 100755
--- a/sbin/geom/class/tests/gate/2_test.sh
+++ b/tests/sys/geom/class/gate/2_test.sh
diff --git a/sbin/geom/class/tests/gate/3_test.sh b/tests/sys/geom/class/gate/3_test.sh
index 8901aca..8901aca 100755
--- a/sbin/geom/class/tests/gate/3_test.sh
+++ b/tests/sys/geom/class/gate/3_test.sh
diff --git a/sbin/geom/class/tests/gate/Makefile b/tests/sys/geom/class/gate/Makefile
index 985d98f..985d98f 100644
--- a/sbin/geom/class/tests/gate/Makefile
+++ b/tests/sys/geom/class/gate/Makefile
diff --git a/sbin/geom/class/tests/gate/conf.sh b/tests/sys/geom/class/gate/conf.sh
index 4eede08..4eede08 100755
--- a/sbin/geom/class/tests/gate/conf.sh
+++ b/tests/sys/geom/class/gate/conf.sh
diff --git a/sbin/geom/class/tests/geom_subr.sh b/tests/sys/geom/class/geom_subr.sh
index a039377..a039377 100644
--- a/sbin/geom/class/tests/geom_subr.sh
+++ b/tests/sys/geom/class/geom_subr.sh
diff --git a/sbin/geom/class/tests/gpt/Makefile b/tests/sys/geom/class/gpt/Makefile
index be11f0a..be11f0a 100644
--- a/sbin/geom/class/tests/gpt/Makefile
+++ b/tests/sys/geom/class/gpt/Makefile
diff --git a/sbin/geom/class/tests/gpt/gctl.c b/tests/sys/geom/class/gpt/gctl.c
index 136a616..136a616 100644
--- a/sbin/geom/class/tests/gpt/gctl.c
+++ b/tests/sys/geom/class/gpt/gctl.c
diff --git a/sbin/geom/class/tests/gpt/gctl_test.pl b/tests/sys/geom/class/gpt/gctl_test.pl
index 0f30805..0f30805 100755
--- a/sbin/geom/class/tests/gpt/gctl_test.pl
+++ b/tests/sys/geom/class/gpt/gctl_test.pl
diff --git a/sbin/geom/class/tests/mirror/1_test.sh b/tests/sys/geom/class/mirror/1_test.sh
index af82a14..af82a14 100755
--- a/sbin/geom/class/tests/mirror/1_test.sh
+++ b/tests/sys/geom/class/mirror/1_test.sh
diff --git a/sbin/geom/class/tests/mirror/2_test.sh b/tests/sys/geom/class/mirror/2_test.sh
index 5605c44..5605c44 100755
--- a/sbin/geom/class/tests/mirror/2_test.sh
+++ b/tests/sys/geom/class/mirror/2_test.sh
diff --git a/sbin/geom/class/tests/mirror/3_test.sh b/tests/sys/geom/class/mirror/3_test.sh
index b7f8525..b7f8525 100755
--- a/sbin/geom/class/tests/mirror/3_test.sh
+++ b/tests/sys/geom/class/mirror/3_test.sh
diff --git a/sbin/geom/class/tests/mirror/4_test.sh b/tests/sys/geom/class/mirror/4_test.sh
index 6efcc02..6efcc02 100755
--- a/sbin/geom/class/tests/mirror/4_test.sh
+++ b/tests/sys/geom/class/mirror/4_test.sh
diff --git a/sbin/geom/class/tests/mirror/5_test.sh b/tests/sys/geom/class/mirror/5_test.sh
index 3a176b5..3a176b5 100755
--- a/sbin/geom/class/tests/mirror/5_test.sh
+++ b/tests/sys/geom/class/mirror/5_test.sh
diff --git a/sbin/geom/class/tests/mirror/6_test.sh b/tests/sys/geom/class/mirror/6_test.sh
index 68036e9..68036e9 100755
--- a/sbin/geom/class/tests/mirror/6_test.sh
+++ b/tests/sys/geom/class/mirror/6_test.sh
diff --git a/sbin/geom/class/tests/mirror/7_test.sh b/tests/sys/geom/class/mirror/7_test.sh
index f5bf71a..f5bf71a 100755
--- a/sbin/geom/class/tests/mirror/7_test.sh
+++ b/tests/sys/geom/class/mirror/7_test.sh
diff --git a/sbin/geom/class/tests/mirror/Makefile b/tests/sys/geom/class/mirror/Makefile
index cf3784f..cf3784f 100644
--- a/sbin/geom/class/tests/mirror/Makefile
+++ b/tests/sys/geom/class/mirror/Makefile
diff --git a/sbin/geom/class/tests/mirror/conf.sh b/tests/sys/geom/class/mirror/conf.sh
index d8595f1..d8595f1 100755
--- a/sbin/geom/class/tests/mirror/conf.sh
+++ b/tests/sys/geom/class/mirror/conf.sh
diff --git a/sbin/geom/class/tests/nop/1_test.sh b/tests/sys/geom/class/nop/1_test.sh
index 4d6b65d..4d6b65d 100755
--- a/sbin/geom/class/tests/nop/1_test.sh
+++ b/tests/sys/geom/class/nop/1_test.sh
diff --git a/sbin/geom/class/tests/nop/2_test.sh b/tests/sys/geom/class/nop/2_test.sh
index 7422345..7422345 100755
--- a/sbin/geom/class/tests/nop/2_test.sh
+++ b/tests/sys/geom/class/nop/2_test.sh
diff --git a/sbin/geom/class/tests/nop/Makefile b/tests/sys/geom/class/nop/Makefile
index 81a4e99..81a4e99 100644
--- a/sbin/geom/class/tests/nop/Makefile
+++ b/tests/sys/geom/class/nop/Makefile
diff --git a/sbin/geom/class/tests/nop/conf.sh b/tests/sys/geom/class/nop/conf.sh
index e38e10c..e38e10c 100755
--- a/sbin/geom/class/tests/nop/conf.sh
+++ b/tests/sys/geom/class/nop/conf.sh
diff --git a/sbin/geom/class/tests/raid3/10_test.sh b/tests/sys/geom/class/raid3/10_test.sh
index edd827d..edd827d 100755
--- a/sbin/geom/class/tests/raid3/10_test.sh
+++ b/tests/sys/geom/class/raid3/10_test.sh
diff --git a/sbin/geom/class/tests/raid3/11_test.sh b/tests/sys/geom/class/raid3/11_test.sh
index 0407261..0407261 100755
--- a/sbin/geom/class/tests/raid3/11_test.sh
+++ b/tests/sys/geom/class/raid3/11_test.sh
diff --git a/sbin/geom/class/tests/raid3/12_test.sh b/tests/sys/geom/class/raid3/12_test.sh
index 10533c6..10533c6 100755
--- a/sbin/geom/class/tests/raid3/12_test.sh
+++ b/tests/sys/geom/class/raid3/12_test.sh
diff --git a/sbin/geom/class/tests/raid3/1_test.sh b/tests/sys/geom/class/raid3/1_test.sh
index 4c0b4a2..4c0b4a2 100755
--- a/sbin/geom/class/tests/raid3/1_test.sh
+++ b/tests/sys/geom/class/raid3/1_test.sh
diff --git a/sbin/geom/class/tests/raid3/2_test.sh b/tests/sys/geom/class/raid3/2_test.sh
index 22ebd38..22ebd38 100755
--- a/sbin/geom/class/tests/raid3/2_test.sh
+++ b/tests/sys/geom/class/raid3/2_test.sh
diff --git a/sbin/geom/class/tests/raid3/3_test.sh b/tests/sys/geom/class/raid3/3_test.sh
index f068b06..f068b06 100755
--- a/sbin/geom/class/tests/raid3/3_test.sh
+++ b/tests/sys/geom/class/raid3/3_test.sh
diff --git a/sbin/geom/class/tests/raid3/4_test.sh b/tests/sys/geom/class/raid3/4_test.sh
index 810f13d..810f13d 100755
--- a/sbin/geom/class/tests/raid3/4_test.sh
+++ b/tests/sys/geom/class/raid3/4_test.sh
diff --git a/sbin/geom/class/tests/raid3/5_test.sh b/tests/sys/geom/class/raid3/5_test.sh
index 7bc8d42..7bc8d42 100755
--- a/sbin/geom/class/tests/raid3/5_test.sh
+++ b/tests/sys/geom/class/raid3/5_test.sh
diff --git a/sbin/geom/class/tests/raid3/6_test.sh b/tests/sys/geom/class/raid3/6_test.sh
index 20bf192..20bf192 100755
--- a/sbin/geom/class/tests/raid3/6_test.sh
+++ b/tests/sys/geom/class/raid3/6_test.sh
diff --git a/sbin/geom/class/tests/raid3/7_test.sh b/tests/sys/geom/class/raid3/7_test.sh
index 23666f8..23666f8 100755
--- a/sbin/geom/class/tests/raid3/7_test.sh
+++ b/tests/sys/geom/class/raid3/7_test.sh
diff --git a/sbin/geom/class/tests/raid3/8_test.sh b/tests/sys/geom/class/raid3/8_test.sh
index 2eb9b1a..2eb9b1a 100755
--- a/sbin/geom/class/tests/raid3/8_test.sh
+++ b/tests/sys/geom/class/raid3/8_test.sh
diff --git a/sbin/geom/class/tests/raid3/9_test.sh b/tests/sys/geom/class/raid3/9_test.sh
index 0ef010a..0ef010a 100755
--- a/sbin/geom/class/tests/raid3/9_test.sh
+++ b/tests/sys/geom/class/raid3/9_test.sh
diff --git a/sbin/geom/class/tests/raid3/Makefile b/tests/sys/geom/class/raid3/Makefile
index c1c95f1..c1c95f1 100644
--- a/sbin/geom/class/tests/raid3/Makefile
+++ b/tests/sys/geom/class/raid3/Makefile
diff --git a/sbin/geom/class/tests/raid3/conf.sh b/tests/sys/geom/class/raid3/conf.sh
index 4f141df..4f141df 100755
--- a/sbin/geom/class/tests/raid3/conf.sh
+++ b/tests/sys/geom/class/raid3/conf.sh
diff --git a/sbin/geom/class/tests/shsec/1_test.sh b/tests/sys/geom/class/shsec/1_test.sh
index ab0bb37..ab0bb37 100755
--- a/sbin/geom/class/tests/shsec/1_test.sh
+++ b/tests/sys/geom/class/shsec/1_test.sh
diff --git a/sbin/geom/class/tests/shsec/2_test.sh b/tests/sys/geom/class/shsec/2_test.sh
index 9dfe36a..9dfe36a 100755
--- a/sbin/geom/class/tests/shsec/2_test.sh
+++ b/tests/sys/geom/class/shsec/2_test.sh
diff --git a/sbin/geom/class/tests/shsec/Makefile b/tests/sys/geom/class/shsec/Makefile
index 81a4e99..81a4e99 100644
--- a/sbin/geom/class/tests/shsec/Makefile
+++ b/tests/sys/geom/class/shsec/Makefile
diff --git a/sbin/geom/class/tests/shsec/conf.sh b/tests/sys/geom/class/shsec/conf.sh
index 7800eb7..7800eb7 100755
--- a/sbin/geom/class/tests/shsec/conf.sh
+++ b/tests/sys/geom/class/shsec/conf.sh
diff --git a/sbin/geom/class/tests/stripe/1_test.sh b/tests/sys/geom/class/stripe/1_test.sh
index 7923763..7923763 100755
--- a/sbin/geom/class/tests/stripe/1_test.sh
+++ b/tests/sys/geom/class/stripe/1_test.sh
diff --git a/sbin/geom/class/tests/stripe/2_test.sh b/tests/sys/geom/class/stripe/2_test.sh
index f6e11f5..f6e11f5 100755
--- a/sbin/geom/class/tests/stripe/2_test.sh
+++ b/tests/sys/geom/class/stripe/2_test.sh
diff --git a/sbin/geom/class/tests/stripe/Makefile b/tests/sys/geom/class/stripe/Makefile
index 81a4e99..81a4e99 100644
--- a/sbin/geom/class/tests/stripe/Makefile
+++ b/tests/sys/geom/class/stripe/Makefile
diff --git a/sbin/geom/class/tests/stripe/conf.sh b/tests/sys/geom/class/stripe/conf.sh
index fd0f41c..fd0f41c 100755
--- a/sbin/geom/class/tests/stripe/conf.sh
+++ b/tests/sys/geom/class/stripe/conf.sh
diff --git a/sbin/geom/class/tests/uzip/1_test.sh b/tests/sys/geom/class/uzip/1_test.sh
index 222b6c9..222b6c9 100755
--- a/sbin/geom/class/tests/uzip/1_test.sh
+++ b/tests/sys/geom/class/uzip/1_test.sh
diff --git a/sbin/geom/class/tests/uzip/Makefile b/tests/sys/geom/class/uzip/Makefile
index b4e1d7d..b4e1d7d 100644
--- a/sbin/geom/class/tests/uzip/Makefile
+++ b/tests/sys/geom/class/uzip/Makefile
diff --git a/sbin/geom/class/tests/uzip/conf.sh b/tests/sys/geom/class/uzip/conf.sh
index 8a3b459..8a3b459 100755
--- a/sbin/geom/class/tests/uzip/conf.sh
+++ b/tests/sys/geom/class/uzip/conf.sh
diff --git a/sbin/geom/class/tests/uzip/etalon/etalon.txt b/tests/sys/geom/class/uzip/etalon/etalon.txt
index cb8acf3..cb8acf3 100644
--- a/sbin/geom/class/tests/uzip/etalon/etalon.txt
+++ b/tests/sys/geom/class/uzip/etalon/etalon.txt