summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-06-13 00:05:06 +0000
committergjb <gjb@FreeBSD.org>2014-06-13 00:05:06 +0000
commit08525adddbc57ee01bf4238698dd54eb2391d8e7 (patch)
tree6b4a04606fc0c5c3a886aa8e9d0aa97c26109741 /share
parent53910142305520c16ea5df64e2fe14ab9c9b3623 (diff)
downloadFreeBSD-src-08525adddbc57ee01bf4238698dd54eb2391d8e7.zip
FreeBSD-src-08525adddbc57ee01bf4238698dd54eb2391d8e7.tar.gz
Revert r267424 and r267425:
More exploration will be needed in order to silence the tinderbox mails caused by setting WITH_TESTS=1 by default. Ref: http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-amd64-amd64.full With hat: re
Diffstat (limited to 'share')
-rw-r--r--share/man/man5/src.conf.59
-rw-r--r--share/mk/src.opts.mk2
2 files changed, 5 insertions, 6 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index ac1a377..ac88137 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
.\" $FreeBSD$
-.Dd June 11, 2014
+.Dd June 8, 2014
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -1021,16 +1021,15 @@ Set to not build and install
Set to not build
.Xr telnet 8
and related programs.
-.It Va WITHOUT_TESTS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_TESTS 267424 2014-06-12 18:54:52Z jmmv
-Set to not build nor install the
+.It Va WITH_TESTS
+.\" from FreeBSD: head/tools/build/options/WITH_TESTS 267033 2014-06-03 22:34:27Z jmmv
+Set to install the
.Fx
Test Suite in
.Pa /usr/tests/ .
See
.Xr tests 7
for more details.
-This also disables the build of all test-related dependencies, including ATF.
.It Va WITHOUT_TEXTPROC
.\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam
Set to not build
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 398496e..c680285 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -143,7 +143,6 @@ __DEFAULT_YES_OPTIONS = \
SYSINSTALL \
TCSH \
TELNET \
- TESTS \
TEXTPROC \
UNBOUND \
USB \
@@ -169,6 +168,7 @@ __DEFAULT_NO_OPTIONS = \
SHARED_TOOLCHAIN \
SORT_THREADS \
SVN \
+ TESTS \
USB_GADGET_EXAMPLES
#
OpenPOWER on IntegriCloud