Add a src.conf option to build and install the DTrace test suite.

Reviewed by:	gnn, ngie
Differential Revision:	https://reviews.freebsd.org/D3195

diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index 8c5e3abe5a070a93d376e66123486e36d22cfdf9..551f6cf800313aca228d92d39c7a5f3db98c503b 100644 (file)
--- 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 48c51fa575da9bb3628e3f885e36366566cdcf79..ba8f48f8eabf9acebf5fa4b2ae134aa6463d8ac3 100644 (file)
--- 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 (file)
index 0000000..dc85e2b
--- /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.