From owner-svn-src-head@freebsd.org  Sun Aug  2 00:37:35 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C4F59B1E8D;
 Sun,  2 Aug 2015 00:37:35 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 29B7310C8;
 Sun,  2 Aug 2015 00:37:35 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t720bZ02028058;
 Sun, 2 Aug 2015 00:37:35 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t720bYPt028055;
 Sun, 2 Aug 2015 00:37:34 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201508020037.t720bYPt028055@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 2 Aug 2015 00:37:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286174 - in head: cddl/usr.sbin/dtrace share/mk
 tools/build/options
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Aug 2015 00:37:35 -0000

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.