aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2015-08-02 00:37:33 +0000
committerMark Johnston <markj@FreeBSD.org>2015-08-02 00:37:33 +0000
commitd912066c36534e9820d304b986e64e520af08547 (patch)
tree59c8981c72fccda410c416090e6c97aa9b94c9e2
parent0996b154643cea48857a4e002b8641caebb82a09 (diff)
downloadsrc-d912066c36534e9820d304b986e64e520af08547.tar.gz
src-d912066c36534e9820d304b986e64e520af08547.zip
Add a src.conf option to build and install the DTrace test suite.
Reviewed by: gnn, ngie Differential Revision: https://reviews.freebsd.org/D3195
Notes
Notes: svn path=/head/; revision=286174
-rw-r--r--cddl/usr.sbin/dtrace/Makefile6
-rw-r--r--share/mk/src.opts.mk5
-rw-r--r--tools/build/options/WITH_DTRACE_TESTS5
3 files changed, 16 insertions, 0 deletions
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index 8c5e3abe5a07..551f6cf80031 100644
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace
PROG= dtrace
@@ -22,4 +24,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
LIBADD= dtrace
+.if ${MK_DTRACE_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 48c51fa575da..ba8f48f8eabf 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -178,6 +178,7 @@ __DEFAULT_YES_OPTIONS = \
__DEFAULT_NO_OPTIONS = \
BSD_GREP \
CLANG_EXTRAS \
+ DTRACE_TESTS \
EISA \
HESIOD \
LLDB \
@@ -318,6 +319,10 @@ MK_KERBEROS:= no
MK_AUTHPF:= no
.endif
+.if ${MK_TESTS} == "no"
+MK_DTRACE_TESTS:= no
+.endif
+
.if ${MK_TEXTPROC} == "no"
MK_GROFF:= no
.endif
diff --git a/tools/build/options/WITH_DTRACE_TESTS b/tools/build/options/WITH_DTRACE_TESTS
new file mode 100644
index 000000000000..dc85e2b5defd
--- /dev/null
+++ b/tools/build/options/WITH_DTRACE_TESTS
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to build and install the DTrace test suite in
+.Pa /usr/tests/cddl/usr.sbin/dtrace .
+This test suite is considered experimental on architectures other than
+amd64/amd64 and running it may cause system instability.