svn commit: r267432 - in head: share/man/man5 share/mk tools/build/options

[Glen Barber]

Author: gjb
Date: Fri Jun 13 00:05:06 2014
New Revision: 267432
URL: http://svnweb.freebsd.org/changeset/base/267432

Log:
  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

Added:
  head/tools/build/options/WITH_TESTS
     - copied unchanged from r267423, head/tools/build/options/WITH_TESTS
Deleted:
  head/tools/build/options/WITHOUT_TESTS
Modified:
  head/share/man/man5/src.conf.5
  head/share/mk/src.opts.mk

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Thu Jun 12 22:57:55 2014	(r267431)
+++ head/share/man/man5/src.conf.5	Fri Jun 13 00:05:06 2014	(r267432)
@@ -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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Thu Jun 12 22:57:55 2014	(r267431)
+++ head/share/mk/src.opts.mk	Fri Jun 13 00:05:06 2014	(r267432)
@@ -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
 
 #

Copied: head/tools/build/options/WITH_TESTS (from r267423, head/tools/build/options/WITH_TESTS)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_TESTS	Fri Jun 13 00:05:06 2014	(r267432, copy of r267423, head/tools/build/options/WITH_TESTS)
@@ -0,0 +1,8 @@
+.\" $FreeBSD$
+Set to install the
+.Fx
+Test Suite in
+.Pa /usr/tests/ .
+See
+.Xr tests 7
+for more details.