Integrate tools/regression/geom* into the FreeBSD test suite under sbin/geom/...

XXX: test

etc/mtree/BSD.tests.dist

@@ -336,6 +336,42 @@
         ..
         devd
         ..
+        geom
+            class
+                concat
+                ..
+                eli
+                ..
+                gate
+                ..
+                gpt
+                ..
+                mirror
+                ..
+                nop
+                ..
+                raid3
+                ..
+                shsec
+                ..
+                stripe
+                ..
+                uzip
+                    etalon
+                    ..
+                ..
+            ..
+            core
+                ConfCmp
+                ..
+                Data
+                ..
+                MdLoad
+                ..
+                Ref
+                ..
+            ..
+        ..
         growfs
         ..
         ifconfig

sbin/geom/class/tests/Makefile

@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+TESTS_SUBDIRS+=	concat
+TESTS_SUBDIRS+=	eli
+TESTS_SUBDIRS+=	gate
+TESTS_SUBDIRS+=	gpt
+TESTS_SUBDIRS+=	mirror
+TESTS_SUBDIRS+=	nop
+TESTS_SUBDIRS+=	raid3
+TESTS_SUBDIRS+=	shsec
+TESTS_SUBDIRS+=	stripe
+TESTS_SUBDIRS+=	uzip
+
+BINDIR=		${TESTSBASE}/sbin/geom/class
+
+FILES+=		geom_subr.sh
+
+.include <bsd.test.mk>

sbin/geom/class/tests/eli/attach_d_test.sh

@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..3"

sbin/geom/class/tests/eli/delkey_test.sh

@@ -4,10 +4,10 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+keyfile2=`mktemp $base.XXXXXX` || exit 1
+keyfile3=`mktemp $base.XXXXXX` || exit 1
+keyfile4=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..14"

sbin/geom/class/tests/eli/detach_l_test.sh

@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..4"

sbin/geom/class/tests/eli/init_B_test.sh

@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-backupfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+backupfile=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..13"
 

sbin/geom/class/tests/eli/init_J_test.sh

@@ -4,10 +4,10 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile0=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-passfile0=`mktemp /tmp/$base.XXXXXX` || exit 1
-passfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile0=`mktemp $base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+passfile0=`mktemp $base.XXXXXX` || exit 1
+passfile1=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..150"

sbin/geom/class/tests/eli/init_a_test.sh

@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..1380"
 
@@ -26,7 +26,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
 		for secsize in 512 1024 2048 4096 8192; do
-			rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+			rnd=`mktemp $base.XXXXXX` || exit 1
 			mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
 
 			dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1

sbin/geom/class/tests/eli/init_i_P_test.sh

@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..1"

sbin/geom/class/tests/eli/init_test.sh

@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..460"
 
@@ -25,7 +25,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for secsize in 512 1024 2048 4096 8192; do
-		rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+		rnd=`mktemp $base.XXXXXX` || exit 1
 		mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
 
 		dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1

sbin/geom/class/tests/eli/integrity_copy_test.sh

@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sector=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+sector=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..5520"
 

sbin/geom/class/tests/eli/integrity_data_test.sh

@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sector=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+sector=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..2760"
 

sbin/geom/class/tests/eli/integrity_hmac_test.sh

@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
-sector=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
+sector=`mktemp $base.XXXXXX` || exit 1
 
 echo "1..2760"
 

sbin/geom/class/tests/eli/kill_test.sh

@@ -4,8 +4,8 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+keyfile2=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..9"

sbin/geom/class/tests/eli/nokey_test.sh

@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..8"

sbin/geom/class/tests/eli/onetime_a_test.sh

@@ -25,7 +25,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	keylen=${cipher##*:}
 	for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do
 		for secsize in 512 1024 2048 4096 8192; do
-			rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+			rnd=`mktemp $base.XXXXXX` || exit 1
 			mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1
 
 			geli onetime -a $aalgo -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null

sbin/geom/class/tests/eli/onetime_test.sh

@@ -24,7 +24,7 @@ for cipher in aes:0 aes:128 aes:256 \
 	ealgo=${cipher%%:*}
 	keylen=${cipher##*:}
 	for secsize in 512 1024 2048 4096 8192; do
-		rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
+		rnd=`mktemp $base.XXXXXX` || exit 1
 		mdconfig -a -t malloc -s `expr $secsize \* $sectors`b -u $no || exit 1
 
 		geli onetime -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null

sbin/geom/class/tests/eli/readonly_test.sh

@@ -4,7 +4,7 @@
 base=`basename $0`
 no=45
 sectors=100
-keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1
+keyfile=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..11"

sbin/geom/class/tests/eli/setkey_test.sh

@@ -4,12 +4,12 @@
 base=`basename $0`
 no=45
 sectors=100
-rnd=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1
-keyfile5=`mktemp /tmp/$base.XXXXXX` || exit 1
+rnd=`mktemp $base.XXXXXX` || exit 1
+keyfile1=`mktemp $base.XXXXXX` || exit 1
+keyfile2=`mktemp $base.XXXXXX` || exit 1
+keyfile3=`mktemp $base.XXXXXX` || exit 1
+keyfile4=`mktemp $base.XXXXXX` || exit 1
+keyfile5=`mktemp $base.XXXXXX` || exit 1
 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1
 
 echo "1..16"

sbin/geom/class/tests/gate/Makefile

@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+=	1_test
+TAP_TESTS_SH+=	2_test
+TAP_TESTS_SH+=	3_test
+
+.include <bsd.test.mk>

sbin/geom/class/tests/gpt/gctl.c

@@ -29,13 +29,14 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <errno.h>
-#include <libgeom.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <libgeom.h>
+
 struct retval {
 	struct retval *retval;
 	const char *param;

sbin/geom/class/tests/gpt/gctl_test.pl

@@ -29,10 +29,12 @@
 my $srcdir = `dirname $0`;
 chomp $srcdir;
 
-my $cmd = "/tmp/gctl-$$";
+my $tmpdir = $ENV{TMPDIR} || "/tmp";
+
+my $cmd = "$srcdir/gctl";
 my $out = "$cmd.out";
-my $disk = "/tmp/disk-$$";
-my $mntpt = "/tmp/mount-$$";
+my $disk = "$tmpdir/disk-$$";
+my $mntpt = "$tmpdir/mount-$$";
 
 my %steps = (
     "000" => "gctl",
@@ -131,13 +133,6 @@ if (exists $ENV{'TEST_VERBOSE'}) {
     $verbose = "-v";
 }
 
-# Compile the driver...
-my $st = system("cc -o $cmd -g $srcdir/test.c -lgeom");
-if ($st != 0) {
-    print "1..0 # SKIP error compiling test.c\n";
-    exit 0;
-}
-
 # Make sure we have permission to use gctl...
 if (`$cmd` =~ "^FAIL Permission denied") {
     print "1..0 # SKIP not enough permission\n";

sbin/geom/class/tests/uzip/1.sh

@@ -8,8 +8,9 @@ mntpoint="/mnt/test-1"
 #
 # prepare
 kldload geom_uzip
-uudecode test-1.img.uzip.uue
-num=`mdconfig -an -f test-1.img.uzip` || exit 1
+UUE=$(dirname $0)/1.img.uzip.uue
+uudecode $UUE
+num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1
 sleep 1
 
 #

sbin/geom/class/tests/uzip/2.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+#
+# prepare
+
+UUE=$(dirname $0)/1.img.uzip.uue
+
+kldload geom_uzip
+uudecode $UUE
+num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1
+sleep 1
+
+#
+# destroy
+kldunload geom_uzip

sbin/geom/class/tests/uzip/Makefile

@@ -0,0 +1,34 @@
+#
+# $FreeBSD$
+#
+# Regression test for geom_uzip.
+#
+
+IMAGE=		1.img
+ZIMAGE=		${IMAGE}.uzip
+UZIMAGE=	${ZIMAGE}.uue
+
+CLEANFILES+=	${IMAGE} ${UZIMAGE} ${ZIMAGE}
+
+${IMAGE}:
+	makefs -s 1048576 ${.TARGET} ${.CURDIR}/etalon
+
+${ZIMAGE}: ${IMAGE}
+	mkuzip -o ${.TARGET} ${.ALLSRC}
+
+${UZIMAGE}: ${IMAGE} ${ZIMAGE}
+	printf "#\n# $$" >${.TARGET}
+	printf "FreeBSD$$\n#\n\n" >> ${.TARGET}
+	uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET}
+
+FILES+=		${UZIMAGE}
+FILESDIR=	${TESTSDIR}
+
+FILESGROUPS=	FILES etalon
+etalon+=	etalon/etalon.txt
+etalonDIR=	${TESTSDIR}/etalon
+
+PLAIN_TESTS_SH+=	1
+PLAIN_TESTS_SH+=	2
+
+.include <bsd.test.mk>

sbin/geom/core/tests/ConfCmp/ConfCmp.c

@@ -190,7 +190,7 @@ dofile(char *filename)
 	XML_SetCharacterDataHandler(parser, CharData);
 	fd = open(filename, O_RDONLY);
 	if (fd < 0)
-		err(1, filename);
+		err(1, "%s", filename);
 	fstat(fd, &st);
 	p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0);
 	i = XML_Parse(parser, p, st.st_size, 1);
@@ -217,6 +217,7 @@ print_node(struct node *np)
 	printf("\n");
 }
 
+#if 0
 static void
 print_tree(struct node *np, int n)
 {
@@ -226,6 +227,7 @@ print_tree(struct node *np, int n)
 	LIST_FOREACH(np1, &np->children, siblings)
 		print_tree(np1, n + 2);
 }
+#endif
 
 static void
 sort_node(struct node *np)

sbin/geom/core/tests/ConfCmp/Makefile

@@ -0,0 +1,43 @@
+# $FreeBSD$
+
+BINDIR=	${TESTSBASE}/sbin/geom/core/ConfCmp
+
+PROG=	ConfCmp
+SRCS+=	ConfCmp.c
+SRCS+=	subr_sbuf.c
+
+.PATH: ${SRCTOP}/sys/kern
+
+# Uncomment for ElectricFence
+#LDADD+= -lefence -L/usr/local/lib
+
+DPADD+=		${LIBBSDXML}
+LDADD+=		-lbsdxml
+
+LDFLAGS+=	-static
+
+MAN=
+CLEANFILES+=	 _*
+
+# XXX: this should be in a test script
+check: .PHONY
+check: ${PROG}
+	cd ${.CURDIR} && env PATH="$$PATH:${.OBJDIR}" ${MAKE} _check
+
+_check: .PHONY
+_check: ${PROG}
+	rm -f _* *.core
+	cd ${.CURDIR}; ${PROG} a1.conf a1.conf
+	cd ${.CURDIR}; ${PROG} a1.conf a1a.conf
+	cd ${.CURDIR}; if ${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; ${PROG} a2.conf a2.conf
+	cd ${.CURDIR}; ${PROG} a2.conf a2a.conf
+	cd ${.CURDIR}; if ${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi
+	cd ${.CURDIR}; if ${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi
+
+WARNS?=	5
+
+.include <bsd.prog.mk>

sbin/geom/core/tests/MdLoad/Makefile

@@ -1,14 +1,18 @@
 # $FreeBSD$
 
+BINDIR=	${TESTSBASE}/sbin/geom/core/MdLoad
+
 PROG=	MdLoad
+
 DPADD=	${LIBSBUF} ${LIBBSDXML}
 LDADD=	-lsbuf -lbsdxml
 
 MAN=
 
-
 WARNS?=	4
-.include "bsd.prog.mk"
 
-test:	${PROG}
+check: .PHONY
+check: ${PROG}
 	./${PROG} md34 ../Data/disk.critter.ad0.xml
+
+.include <bsd.prog.mk>

sbin/geom/core/tests/MdLoad/MdLoad.c

@@ -216,7 +216,7 @@ g_simdisk_xml_load(const char *file)
 
 	fd = open(file, O_RDONLY);
 	if (fd < 0)
-		err(1, file);
+		err(1, "%s", file);
 	fstat(fd, &st);
 	p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0);
 	i = XML_Parse(parser, p, st.st_size, 1);