From d912066c36534e9820d304b986e64e520af08547 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Sun, 2 Aug 2015 00:37:33 +0000 Subject: [PATCH] Add a src.conf option to build and install the DTrace test suite. Reviewed by: gnn, ngie Differential Revision: https://reviews.freebsd.org/D3195 --- cddl/usr.sbin/dtrace/Makefile | 6 ++++++ share/mk/src.opts.mk | 5 +++++ tools/build/options/WITH_DTRACE_TESTS | 5 +++++ 3 files changed, 16 insertions(+) create mode 100644 tools/build/options/WITH_DTRACE_TESTS 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 + .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 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.