Index: user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc	(nonexistent)
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-GEOM_CLASS=		${.CURDIR:T}
-
-TESTSDIR=		${TESTSBASE}/sys/geom/class/${GEOM_CLASS}

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl.c
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl.c	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl.c	(nonexistent)
@@ -1,166 +0,0 @@
-/*-
- * Copyright (c) 2005, 2006 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <errno.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;
-	char *value;
-};
-
-struct retval *retval;
-int verbose;
-
-static void
-usage()
-{
-	fprintf(stdout, "usage: %s [-v] param[:len][=value] ...\n",
-	    getprogname());
-	exit(1);
-}
-
-static int
-parse(char *arg, char **param, char **value, int *len)
-{
-	char *e, *colon, *equal;
-
-	if (*arg == '\0')
-		return (EINVAL);
-
-	colon = strchr(arg, ':');
-	equal = strchr(arg, '=');
-	if (colon == NULL && equal == NULL)
-		return (EINVAL);
-	if (colon == arg || equal == arg)
-		return (EINVAL);
-	if (colon != NULL && equal != NULL && equal < colon)
-		return (EINVAL);
-
-	if (colon != NULL)
-		*colon++ = '\0';
-	if (equal != NULL)
-		*equal++ = '\0';
-
-	*param = arg;
-	if (colon != NULL) {
-		/* Length specification. This parameter is RW. */
-		if (*colon == '\0')
-			return (EINVAL);
-		*len = strtol(colon, &e, 0);
-		if (*e != '\0')
-			return (EINVAL);
-		if (*len <= 0 || *len > PATH_MAX)
-			return (EINVAL);
-		*value = malloc(*len);
-		if (*value == NULL)
-			return (ENOMEM);
-		memset(*value, 0, *len);
-		if (equal != NULL) {
-			if (strlen(equal) >= PATH_MAX)
-				return (ENOMEM);
-			strcpy(*value, equal);
-		}
-	} else {
-		/* This parameter is RO. */
-		*len = -1;
-		if (*equal == '\0')
-			return (EINVAL);
-		*value = equal;
-	}
-
-	return (0);
-}
-
-int main(int argc, char *argv[])
-{
-	struct retval *rv;
-	struct gctl_req *req;
-	char *param, *value;
-	const char *s;
-	int c, len;
-
-	req = gctl_get_handle();
-	gctl_ro_param(req, "class", -1, "GPT");
-
-	while ((c = getopt(argc, argv, "v")) != -1) {
-		switch (c) {
-		case 'v':
-			verbose = 1;
-			break;
-		case '?':
-		default:
-			usage();
-			/* NOTREACHED */
-			break;
-		}
-	}
-
-	while (optind < argc) {
-		if (!parse(argv[optind++], &param, &value, &len)) {
-			if (len > 0) {
-				rv = malloc(sizeof(struct retval));
-				rv->param = param;
-				rv->value = value;
-				rv->retval = retval;
-				retval = rv;
-				gctl_rw_param(req, param, len, value);
-			} else
-				gctl_ro_param(req, param, -1, value);
-		}
-	}
-
-	if (verbose)
-		gctl_dump(req, stdout);
-
-	s = gctl_issue(req);
-	if (s == NULL) {
-		printf("PASS");
-		while (retval != NULL) {
-			rv = retval->retval;
-			printf(" %s=%s", retval->param, retval->value);
-			free(retval->value);
-			free(retval);
-			retval = rv;
-		}
-		printf("\n");
-	} else
-		printf("FAIL %s\n", s);
-
-	gctl_free(req);
-	return (0);
-}

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl.c
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/gpt/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/gpt/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/gpt/Makefile	(nonexistent)
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-BINDIR=			${TESTSDIR}
-
-TAP_TESTS_PERL+=	gctl_test
-
-PROGS+=			gctl
-MAN=
-
-DPADD.gctl+=		${LIBGEOM}
-LDADD.gctl+=		-lgeom
-
-.include <bsd.test.mk>

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/gpt/Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl_test.pl
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl_test.pl	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl_test.pl	(nonexistent)
@@ -1,202 +0,0 @@
-#!/usr/bin/env perl -w
-#
-# Copyright (c) 2005, 2006 Marcel Moolenaar
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# $FreeBSD$
-
-my $srcdir = `dirname $0`;
-chomp $srcdir;
-
-my $tmpdir = $ENV{TMPDIR} || "/tmp";
-
-my $cmd = "$srcdir/gctl";
-my $out = "$cmd.out";
-my $disk = "$tmpdir/disk-$$";
-my $mntpt = "$tmpdir/mount-$$";
-
-my %steps = (
-    "000" => "gctl",
-    "001" => "gctl verb=bogus",
-    "010" => "gctl verb=create",
-    "011" => "gctl verb=create provider=bogus",
-    "020" => "mdcfg create pristine",
-    "021" => "gctl verb=create provider=%dev% entries=-1",
-    "022" => "gctl verb=create provider=%dev% entries=128",
-    "023" => "gctl verb=create provider=%dev%",
-    "024" => "gctl verb=modify geom=%dev%",
-    "025" => "conf",
-    "030" => "gctl verb=add",
-    "031" => "gctl verb=add geom=bogus",
-    "032" => "gctl verb=add geom=%dev%",
-    "033" => "gctl verb=add geom=%dev% type=bogus",
-    "034" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace",
-    "035" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=1",
-    "036" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34",
-    "037" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34 end=12345678",
-    "038" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry=129",
-    "039" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry:8=5",
-    "040" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry=5",
-    "041" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=546",
-    "042" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=162 end=417",
-    "043" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=100 end=300",
-    "044" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=300 end=500",
-    "045" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry:8",
-    "046" => "gctl verb=add geom=%dev% type=d2bd4509-c4ff-11da-b4cc-00306e39b62f start=418 end=546 entry:8",
-    "047" => "conf",
-    "050" => "gctl verb=remove geom=%dev% entry=5",
-    "051" => "gctl verb=remove geom=%dev% entry=2",
-    "052" => "gctl verb=remove geom=%dev% entry=1",
-    "053" => "gctl verb=remove geom=%dev% entry=1",
-    "054" => "conf",
-    "060" => "gctl verb=add geom=%dev% type=516e7cb6-6ecf-11d6-8ff8-00022d09712b start=34 end=546 entry:8=1",
-    "061" => "mount %dev%p1",
-    "062" => "gctl verb=remove geom=%dev% entry=1",
-    "063" => "umount %dev%p1",
-    "064" => "gctl verb=remove geom=%dev% entry=1",
-    "065" => "conf",
-    "100" => "mdcfg destroy",
-    "110" => "mdcfg create corrupted",
-    "111" => "gctl verb=add geom=%dev%",
-    "120" => "mdcfg destroy",
-);
-
-my %result = (
-    "000" => "FAIL Verb missing",
-    "001" => "FAIL 22 verb 'bogus'",
-    "010" => "FAIL 87 provider",
-    "011" => "FAIL 22 provider 'bogus'",
-    "020" => "",
-    "021" => "FAIL 22 entries -1",
-    "022" => "PASS",
-    "023" => "FAIL 17 geom '%dev%'",
-    "024" => "FAIL 87 entry",
-    "025" => "b1856477950e5786898c8f01361196cf",
-    "030" => "FAIL 87 geom",
-    "031" => "FAIL 22 geom 'bogus'",
-    "032" => "FAIL 87 type",
-    "033" => "FAIL 22 type 'bogus'",
-    "034" => "FAIL 87 start",
-    "035" => "FAIL 22 start 1",
-    "036" => "FAIL 87 end",
-    "037" => "FAIL 22 end 12345678",
-    "038" => "FAIL 22 entry 129",
-    "039" => "PASS entry=5",
-    "040" => "FAIL 17 entry 5",
-    "041" => "FAIL 28 start/end 34/546",
-    "042" => "FAIL 28 start/end 162/417",
-    "043" => "FAIL 28 start/end 100/300",
-    "044" => "FAIL 28 start/end 300/500",
-    "045" => "PASS entry=1",
-    "046" => "PASS entry=2",
-    "047" => "50783a39eecfc62a29db24381e12b9d8",
-    "050" => "PASS",
-    "051" => "PASS",
-    "052" => "PASS",
-    "053" => "FAIL 2 entry 1",
-    "054" => "b1856477950e5786898c8f01361196cf",
-    "060" => "PASS",
-    "061" => "PASS",
-    "062" => "FAIL 16",
-    "063" => "PASS",
-    "064" => "PASS",
-    "065" => "b1856477950e5786898c8f01361196cf",
-    "100" => "",
-    "110" => "",
-    "111" => "FAIL 6 geom '%dev%'",
-    "120" => "",
-);
-
-my $verbose = "";
-if (exists $ENV{'TEST_VERBOSE'}) {
-    $verbose = "-v";
-}
-
-# Make sure we have permission to use gctl...
-if (`$cmd` =~ "^FAIL Permission denied") {
-    print "1..0 # SKIP not enough permission\n";
-    unlink $cmd;
-    exit 0;
-}
-
-$count = keys (%steps);
-print "1..$count\n";
-
-my $nr = 1;
-my $dev = "n/a";
-foreach my $key (sort keys %steps) {
-    my ($action, $args) = split(/ /, $steps{$key}, 2);
-    my $res = $result{$key};
-    $args = "" if (not defined $args);
-    $args =~ s/%dev%/$dev/g;
-    $res =~ s/%dev%/$dev/g;
-
-    if ($action =~ "^gctl") {
-	system("$cmd $verbose $args | tee $out 2>&1");
-	$st = `tail -1 $out`;
-	if ($st =~ "^$res") {
-	    print "ok $nr \# gctl($key)\n";
-	} else {
-	    print "not ok $nr \# gctl($key) - $st\n";
-	}
-	unlink $out;
-    } elsif ($action =~ "^mdcfg") {
-	if ($args =~ "^create") {
-	    system("dd if=/dev/zero of=$disk count=1024 2>&1");
-	    if ($args =~ "corrupted") {
-		system("gpt create -p $disk");
-	    }
-	    $dev = `mdconfig -a -t vnode -f $disk`;
-	    chomp $dev;
-	} elsif ($args =~ "^destroy") {
-	    $dev =~ s/md/-u /g;
-	    system("mdconfig -d $dev");
-	    unlink $disk;
-	    $dev = "n/a";
-	}
-	print "ok $nr \# mdcfg($key)\n";
-    } elsif ($action =~ "^conf") {
-	system("sysctl -b kern.geom.conftxt | grep -a $dev | sed -e s:$disk:DISK:g -e s:$dev:DEV:g | sort | md5 -p | tee $out 2>&1");
-	$st = `tail -1 $out`;
-	if ($st =~ "^$res") {
-	    print "ok $nr \# conf($key)\n";
-	} else {
-	    print "not ok $nr \# conf($key) - $st\n";
-	}
-	unlink $out;
-    } elsif ($action =~ "^mount") {
-	    system("mkdir $mntpt-$args");
-	    system("newfs $args");
-	    system("mount -t ufs /dev/$args $mntpt-$args");
-	    print "ok $nr \# mount($key)\n";
-    } elsif ($action =~ "^umount") {
-	    system("umount $mntpt-$args");
-	    system("rmdir $mntpt-$args");
-	    print "ok $nr \# umount($key)\n";
-    }
-    $nr += 1;
-}
-
-unlink $cmd;
-exit 0;

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/gpt/gctl_test.pl
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/concat/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/concat/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/concat/1_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/concat/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/concat/2_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/concat/2_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/concat/2_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/concat/2_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/concat/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/concat/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/concat/Makefile	(revision 293822)
@@ -1,10 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/concat/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/concat/conf.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/concat/conf.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/concat/conf.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/Makefile	(revision 293822)
@@ -1,36 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/attach_d_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/attach_d_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/attach_d_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/attach_d_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/configure_b_B_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/configure_b_B_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/configure_b_B_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/configure_b_B_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/delkey_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/delkey_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/delkey_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/delkey_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/detach_l_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/detach_l_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/detach_l_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/detach_l_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/init_B_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/init_B_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/init_B_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/init_B_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/init_J_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/init_J_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/init_J_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/init_J_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/init_a_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/init_a_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/init_a_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/init_a_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/init_i_P_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/init_i_P_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/init_i_P_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/init_i_P_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/init_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/init_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/init_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/init_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_copy_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_copy_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_copy_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_copy_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_data_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_data_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_data_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_data_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_hmac_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_hmac_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_hmac_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/integrity_hmac_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/kill_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/kill_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/kill_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/kill_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/nokey_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/nokey_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/nokey_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/nokey_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_a_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_a_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_a_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_a_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_d_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_d_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_d_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_d_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/onetime_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/readonly_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/readonly_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/readonly_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/readonly_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/resize_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/resize_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/resize_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/resize_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/setkey_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/setkey_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/setkey_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/eli/setkey_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/eli/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/eli/conf.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/eli/conf.sh	(revision 293822)
@@ -1,19 +1,21 @@
 #!/bin/sh
 # $FreeBSD$
 
 class="eli"
 base=`basename $0`
 
+# We need to use linear probing in order to detect the first available md(4)
+# device instead of using mdconfig -a -t, because geli(8) attachs md(4) devices
 no=0
 while [ -c /dev/md$no ]; do
 	: $(( no += 1 ))
 done
 
 geli_test_cleanup()
 {
 	[ -c /dev/md${no}.eli ] && geli detach md${no}.eli
 	mdconfig -d -u $no
 }
 trap geli_test_cleanup ABRT EXIT INT TERM
 
 . `dirname $0`/../geom_subr.sh
Index: user/ngie/more-tests2/tests/sys/geom/class/gate/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/gate/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/gate/1_test.sh	(revision 293822)
@@ -1,61 +1,62 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
+echo '1..2'
+
 base=`basename $0`
 us=0
 while [ -c /dev/ggate${us} ]; do
 	: $(( us += 1 ))
 done
 conf=`mktemp $base.XXXXXX` || exit 1
-pidfile=ggated.pid
+pidfile=/var/run/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
+if ! ggated -p $port $conf; then
 	echo 'ggated failed to start'
 	echo 'Bail out!'
 	exit 1
 fi
+sleep 1
 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

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/gate/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/gate/2_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/gate/2_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/gate/2_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/gate/2_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/gate/3_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/gate/3_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/gate/3_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/gate/3_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/gate/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/gate/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/gate/Makefile	(revision 293822)
@@ -1,11 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh	(revision 293822)
@@ -1,48 +1,60 @@
 #!/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} || geom ${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}
-export TMPDIR
-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
+	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
+	rm -f "$TEST_MDS_FILE"
 }
+
+if [ $(id -u) -ne 0 ]; then
+	echo 'Tests must be run as root'
+	echo 'Bail out!'
+	exit 1
+fi
+# If the geom class isn't already loaded, try loading it.
+if ! kldstat -q -m g_${class}; then
+	if ! geom ${class} load; then
+		echo "Could not load module for geom class=${class}"
+		echo 'Bail out!'
+		exit 1
+	fi
+fi
+
+# 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}
+export TMPDIR
+if ! TEST_MDS_FILE=$(mktemp ${TMPDIR}/test_mds.XXXXXX); then
+	echo 'Failed to create temporary file for tracking the test md(4) devices'
+	echo 'Bail out!'
+	exit 1
+fi
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/1_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/2_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/2_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/2_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/2_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/3_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/3_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/3_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/3_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/4_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/4_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/4_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/4_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/5_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/5_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/5_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/5_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/6_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/6_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/6_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/6_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/7_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/7_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/7_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/7_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/Makefile	(revision 293822)
@@ -1,15 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/mirror/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/mirror/conf.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/mirror/conf.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/mirror/conf.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/nop/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/nop/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/nop/1_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/nop/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/nop/2_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/nop/2_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/nop/2_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/nop/2_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/nop/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/nop/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/nop/Makefile	(revision 293822)
@@ -1,10 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/nop/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/nop/conf.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/nop/conf.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/nop/conf.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/10_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/10_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/10_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/10_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/11_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/11_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/11_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/11_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/12_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/12_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/12_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/12_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/1_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/2_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/2_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/2_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/2_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/3_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/3_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/3_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/3_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/4_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/4_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/4_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/4_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/5_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/5_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/5_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/5_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/6_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/6_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/6_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/6_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/7_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/7_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/7_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/7_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/8_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/8_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/8_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/8_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/9_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/9_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/9_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/9_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/Makefile	(revision 293822)
@@ -1,20 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/raid3/conf.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/shsec/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/shsec/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/shsec/1_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/shsec/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/shsec/2_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/shsec/2_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/shsec/2_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/shsec/2_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/shsec/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/shsec/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/shsec/Makefile	(revision 293822)
@@ -1,10 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/shsec/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/shsec/conf.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/shsec/conf.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/shsec/conf.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/stripe/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/stripe/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/stripe/1_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/stripe/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/stripe/2_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/stripe/2_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/stripe/2_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/stripe/2_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/stripe/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/stripe/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/stripe/Makefile	(revision 293822)
@@ -1,10 +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>
Index: user/ngie/more-tests2/tests/sys/geom/class/stripe/conf.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/stripe/conf.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/stripe/conf.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/stripe/conf.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/uzip/1_test.sh
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/uzip/1_test.sh	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/uzip/1_test.sh	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/uzip/1_test.sh
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/uzip/Makefile
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/uzip/Makefile	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/uzip/Makefile	(revision 293822)
@@ -1,36 +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>

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/uzip/Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/uzip/test-1.img.uzip.uue
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/uzip/test-1.img.uzip.uue	(nonexistent)
+++ user/ngie/more-tests2/tests/sys/geom/class/uzip/test-1.img.uzip.uue	(revision 293822)
@@ -0,0 +1,110 @@
+#
+# $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

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/uzip/test-1.img.uzip.uue
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/uzip/etalon/etalon.txt
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/uzip/etalon/etalon.txt	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/uzip/etalon/etalon.txt	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/uzip/etalon/etalon.txt
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: user/ngie/more-tests2/tests/sys/geom/class/uzip
===================================================================
--- user/ngie/more-tests2/tests/sys/geom/class/uzip	(revision 293821)
+++ user/ngie/more-tests2/tests/sys/geom/class/uzip	(revision 293822)

Property changes on: user/ngie/more-tests2/tests/sys/geom/class/uzip
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+test-1.img
+test-1.img.gz