svn commit: r290968 - in user/ngie/more-tests2/sbin/geom: class/tests class/tests/concat class/tests/eli class/tests/gpt class/tests/mirror class/tests/nop class/tests/raid3 class/tests/shsec class...
Garrett Cooper
ngie at FreeBSD.org
Tue Nov 17 01:05:03 UTC 2015
Author: ngie
Date: Tue Nov 17 01:05:00 2015
New Revision: 290968
URL: https://svnweb.freebsd.org/changeset/base/290968
Log:
Add Makefiles for integrating the geom testcases into the FreeBSD
test suite
Increase the default timeouts for some of the geom_eli testcases,
otherwise they will time out due to their length and cause a
deterministic cascade of failures with the tests
This is still a WIP
Added:
user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/concat/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/gpt/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/mirror/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/nop/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/raid3/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/shsec/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/class/tests/stripe/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/core/tests/Data/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/core/tests/Makefile (contents, props changed)
user/ngie/more-tests2/sbin/geom/core/tests/Ref/Makefile (contents, props changed)
Modified:
user/ngie/more-tests2/sbin/geom/class/tests/Makefile
Modified: user/ngie/more-tests2/sbin/geom/class/tests/Makefile
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/Makefile Tue Nov 17 01:02:44 2015 (r290967)
+++ user/ngie/more-tests2/sbin/geom/class/tests/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -3,7 +3,7 @@
TESTS_SUBDIRS+= concat
TESTS_SUBDIRS+= eli
TESTS_SUBDIRS+= gate
-TESTS_SUBDIRS+= gpt
+#TESTS_SUBDIRS+= gpt
TESTS_SUBDIRS+= mirror
TESTS_SUBDIRS+= nop
TESTS_SUBDIRS+= raid3
Added: user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/Makefile.inc Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,3 @@
+GEOM_CLASS= ${.CURDIR:T}
+
+TESTSDIR= ${TESTSBASE}/sbin/geom/class/${GEOM_CLASS}
Added: user/ngie/more-tests2/sbin/geom/class/tests/concat/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/concat/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+= 1_test
+TAP_TESTS_SH+= 2_test
+
+FILES+= conf.sh
+FILESNAME_conf.sh= conf.sh
+FILESDIR= ${TESTSDIR}
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+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_test+= timeout="300"
+TEST_METADATA.onetime_a_test+= timeout="300"
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/class/tests/gpt/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/gpt/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+BINDIR= ${TESTSDIR}
+
+TAP_TESTS_PERL+= gctl_test
+
+PROGS+= gctl
+MAN=
+
+DPADD.gctl+= ${LIBGEOM}
+LDADD.gctl+= -lgeom
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/class/tests/mirror/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/mirror/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+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}
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/class/tests/nop/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/nop/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+= 1_test
+TAP_TESTS_SH+= 2_test
+
+FILES+= conf.sh
+FILESNAME_conf.sh= conf.sh
+FILESDIR= ${TESTSDIR}
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/class/tests/raid3/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+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}
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/class/tests/shsec/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/shsec/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+= 1_test
+TAP_TESTS_SH+= 2_test
+
+FILES+= conf.sh
+FILESNAME_conf.sh= conf.sh
+FILESDIR= ${TESTSDIR}
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/class/tests/stripe/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/class/tests/stripe/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH+= 1_test
+TAP_TESTS_SH+= 2_test
+
+FILES+= conf.sh
+FILESNAME_conf.sh= conf.sh
+FILESDIR= ${TESTSDIR}
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/core/tests/Data/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Data/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+FILES+= disk.alpha.da0.xml
+FILES+= disk.alpha2.da0.xml
+FILES+= disk.apple.xml
+FILES+= disk.beast.da0.xml
+FILES+= disk.critter.ad0.xml
+FILES+= disk.empty.flp.xml
+FILES+= disk.far.ad0.xml
+FILES+= disk.flat.da1.xml
+FILES+= disk.kern.flp.xml
+FILES+= disk.msdos.ext.xml
+FILES+= disk.msdos.flp.xml
+FILES+= disk.pc98.wdc0.xml
+FILES+= disk.sun.da0.xml
+FILES+= disk.sun.da1.xml
+FILES+= disk.typo.ad0.xml
+
+FILESDIR= ${TESTSBASE}/sbin/geom/core/Data
+
+.include <bsd.prog.mk>
Added: user/ngie/more-tests2/sbin/geom/core/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/sbin/geom/core
+
+TAP_TESTS_SH+= run_test
+
+SUBDIR+= ConfCmp
+SUBDIR+= Data
+SUBDIR+= MdLoad
+SUBDIR+= Ref
+
+.include <bsd.test.mk>
Added: user/ngie/more-tests2/sbin/geom/core/tests/Ref/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/Makefile Tue Nov 17 01:05:00 2015 (r290968)
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+FILES+= disk.alpha.da0.xml
+FILES+= disk.alpha2.da0.xml
+FILES+= disk.apple.xml
+FILES+= disk.beast.da0.xml
+FILES+= disk.critter.ad0.xml
+FILES+= disk.empty.flp.xml
+FILES+= disk.far.ad0.xml
+FILES+= disk.flat.da1.xml
+FILES+= disk.kern.flp.xml
+FILES+= disk.msdos.ext.xml
+FILES+= disk.msdos.flp.xml
+FILES+= disk.pc98.wdc0.xml
+FILES+= disk.sun.da0.xml
+FILES+= disk.sun.da1.xml
+FILES+= disk.typo.ad0.xml
+
+FILESDIR= ${TESTSBASE}/sbin/geom/core/Ref
+
+.include <bsd.prog.mk>
More information about the svn-src-user
mailing list