svn commit: r293019 - in user/ngie/more-tests2: etc/mtree sbin/geom/class/tests sbin/geom/tests tests/sys tests/sys/geom tests/sys/geom/class tests/sys/geom/class/concat tests/sys/geom/class/eli te...
Garrett Cooper
ngie at FreeBSD.org
Fri Jan 1 00:12:12 UTC 2016
Author: ngie
Date: Fri Jan 1 00:12:10 2016
New Revision: 293019
URL: https://svnweb.freebsd.org/changeset/base/293019
Log:
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
Added:
user/ngie/more-tests2/tests/sys/geom/
user/ngie/more-tests2/tests/sys/geom/class/
user/ngie/more-tests2/tests/sys/geom/class/Makefile
- copied, changed from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile
user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc
- copied, changed from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc
user/ngie/more-tests2/tests/sys/geom/class/concat/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/concat/
user/ngie/more-tests2/tests/sys/geom/class/eli/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/eli/
user/ngie/more-tests2/tests/sys/geom/class/gate/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/gate/
user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh
- copied unchanged from r293018, user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh
user/ngie/more-tests2/tests/sys/geom/class/gpt/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/gpt/
user/ngie/more-tests2/tests/sys/geom/class/mirror/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/mirror/
user/ngie/more-tests2/tests/sys/geom/class/nop/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/nop/
user/ngie/more-tests2/tests/sys/geom/class/raid3/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/raid3/
user/ngie/more-tests2/tests/sys/geom/class/shsec/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/shsec/
user/ngie/more-tests2/tests/sys/geom/class/stripe/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/stripe/
user/ngie/more-tests2/tests/sys/geom/class/uzip/
- copied from r293018, user/ngie/more-tests2/sbin/geom/class/tests/uzip/
Deleted:
user/ngie/more-tests2/sbin/geom/class/tests/
user/ngie/more-tests2/sbin/geom/tests/
Modified:
user/ngie/more-tests2/etc/mtree/BSD.tests.dist
user/ngie/more-tests2/tests/sys/Makefile
Modified: user/ngie/more-tests2/etc/mtree/BSD.tests.dist
==============================================================================
--- user/ngie/more-tests2/etc/mtree/BSD.tests.dist Fri Jan 1 00:11:29 2016 (r293018)
+++ user/ngie/more-tests2/etc/mtree/BSD.tests.dist Fri Jan 1 00:12:10 2016 (r293019)
@@ -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
..
Modified: user/ngie/more-tests2/tests/sys/Makefile
==============================================================================
--- user/ngie/more-tests2/tests/sys/Makefile Fri Jan 1 00:11:29 2016 (r293018)
+++ user/ngie/more-tests2/tests/sys/Makefile Fri Jan 1 00:12:10 2016 (r293019)
@@ -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
Copied and modified: user/ngie/more-tests2/tests/sys/geom/class/Makefile (from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile)
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/Makefile Fri Jan 1 00:11:29 2016 (r293018, copy source)
+++ user/ngie/more-tests2/tests/sys/geom/class/Makefile Fri Jan 1 00:12:10 2016 (r293019)
@@ -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
Copied and modified: user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc (from r293018, user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc)
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc Fri Jan 1 00:11:29 2016 (r293018, copy source)
+++ user/ngie/more-tests2/tests/sys/geom/class/Makefile.inc Fri Jan 1 00:12:10 2016 (r293019)
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
GEOM_CLASS= ${.CURDIR:T}
-TESTSDIR= ${TESTSBASE}/sbin/geom/class/${GEOM_CLASS}
+TESTSDIR= ${TESTSBASE}/sys/geom/class/${GEOM_CLASS}
Copied: user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh (from r293018, user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/tests/sys/geom/class/geom_subr.sh Fri Jan 1 00:12:10 2016 (r293019, copy of r293018, user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh)
@@ -0,0 +1,48 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ $(id -u) -ne 0 ]; then
+ echo 'Tests must be run as root'
+ echo 'Bail out!'
+ exit 1
+fi
+kldstat -q -m g_${class} || g${class} load || exit 1
+
+devwait()
+{
+ while :; do
+ if [ -c /dev/${class}/${name} ]; then
+ return
+ fi
+ sleep 0.2
+ done
+}
+
+# Need to keep track of the test md devices to avoid the scenario where a test
+# failing will cause the other tests to bomb out, or a test failing will leave
+# a large number of md(4) devices lingering around
+: ${TMPDIR=/tmp}
+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
+ 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
+}
More information about the svn-src-user
mailing list