svn commit: r286174 - in head: cddl/usr.sbin/dtrace share/mk tools/build/options

[Mark Johnston]

Author: markj
Date: Sun Aug  2 00:37:33 2015
New Revision: 286174
URL: https://svnweb.freebsd.org/changeset/base/286174

Log:
  Add a src.conf option to build and install the DTrace test suite.
  
  Reviewed by:	gnn, ngie
  Differential Revision:	https://reviews.freebsd.org/D3195

Added:
  head/tools/build/options/WITH_DTRACE_TESTS   (contents, props changed)
Modified:
  head/cddl/usr.sbin/dtrace/Makefile
  head/share/mk/src.opts.mk

Modified: head/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/Makefile	Sun Aug  2 00:33:34 2015	(r286173)
+++ head/cddl/usr.sbin/dtrace/Makefile	Sun Aug  2 00:37:33 2015	(r286174)
@@ -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/
 
 LIBADD=	dtrace
 
+.if ${MK_DTRACE_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sun Aug  2 00:33:34 2015	(r286173)
+++ head/share/mk/src.opts.mk	Sun Aug  2 00:37:33 2015	(r286174)
@@ -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

Added: head/tools/build/options/WITH_DTRACE_TESTS
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_DTRACE_TESTS	Sun Aug  2 00:37:33 2015	(r286174)
@@ -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.