aboutsummaryrefslogtreecommitdiff
path: root/cddl/sbin
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2014-04-27 08:13:43 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2014-04-27 08:13:43 +0000
commit9d2ab4a62d6733c45958627ac113bdbd818d1e2a (patch)
treeb92e741b68057a24e381faa9809f32030d65574c /cddl/sbin
parent1991e07af89dbccabfb71af86738da2a979b3d20 (diff)
parent8be1b6d975fae2513af1b0e5ad6923c3c2428ddd (diff)
downloadsrc-9d2ab4a62d6733c45958627ac113bdbd818d1e2a.tar.gz
src-9d2ab4a62d6733c45958627ac113bdbd818d1e2a.zip
Merge head
Notes
Notes: svn path=/projects/bmake/; revision=265006
Diffstat (limited to 'cddl/sbin')
-rw-r--r--cddl/sbin/Makefile6
-rw-r--r--cddl/sbin/tests/Makefile10
2 files changed, 15 insertions, 1 deletions
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index f74307c5fd6a..4fd96f6ee0e5 100644
--- a/cddl/sbin/Makefile
+++ b/cddl/sbin/Makefile
@@ -2,7 +2,11 @@
.include <bsd.own.mk>
-SUBDIR= ${_zfs} ${_zpool}
+SUBDIR= ${_tests} ${_zfs} ${_zpool}
+
+.if ${MK_TESTS} != "no"
+_tests= tests
+.endif
.if ${MK_ZFS} != "no"
_zfs= zfs
diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile
new file mode 100644
index 000000000000..91bbaee271f4
--- /dev/null
+++ b/cddl/sbin/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/cddl/sbin
+
+.PATH: ${.CURDIR:H:H:H}/tests
+KYUAFILE= yes
+
+.include <bsd.test.mk>