svn commit: r321960 - in projects/make-check-sandbox/tests: . etc sys sys/geom/class sys/pjdfstest sys/pjdfstest/tests

[Ngie Cooper]

Author: ngie
Date: Wed Aug  2 22:24:08 2017
New Revision: 321960
URL: https://svnweb.freebsd.org/changeset/base/321960

Log:
  Use MK_CHECK_USE_SANDBOX in tests/..., to deal with the fact that
  tests/... is a special snowflake directory and using HAS_TESTS would
  result in a nasty layering violation between bsd.tests.mk and
  bsd.prog.mk.
  
  Add reachover Makefile.inc's which get the default value from
  Makefile.inc0 (inspired by gnu/usr.bin/binutils/Makefile.inc0).

Added:
  projects/make-check-sandbox/tests/Makefile.inc0   (contents, props changed)
  projects/make-check-sandbox/tests/etc/Makefile.inc   (contents, props changed)
  projects/make-check-sandbox/tests/sys/geom/class/Makefile.inc   (contents, props changed)
  projects/make-check-sandbox/tests/sys/pjdfstest/Makefile.inc   (contents, props changed)
  projects/make-check-sandbox/tests/sys/pjdfstest/tests/Makefile.inc   (contents, props changed)
Modified:
  projects/make-check-sandbox/tests/Makefile
  projects/make-check-sandbox/tests/sys/Makefile.inc

Modified: projects/make-check-sandbox/tests/Makefile
==============================================================================
--- projects/make-check-sandbox/tests/Makefile	Wed Aug  2 22:19:45 2017	(r321959)
+++ projects/make-check-sandbox/tests/Makefile	Wed Aug  2 22:24:08 2017	(r321960)
@@ -17,4 +17,5 @@ afterinstall: install-tests-local
 install-tests-local: .PHONY
 	${INSTALL_SYMLINK} ../local/tests ${DESTDIR}${TESTSDIR}/local
 
+.include "Makefile.inc0"
 .include <bsd.test.mk>

Added: projects/make-check-sandbox/tests/Makefile.inc0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/tests/Makefile.inc0	Wed Aug  2 22:24:08 2017	(r321960)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+# tests/... doesn't conform to bsd.lib.mk and bsd.prog.mk, so specify a sane
+# default for MK_CHECK_USE_SANDBOX. src.opts.mk will override the value if the
+# user sets it to no.
+MK_CHECK_USE_SANDBOX=	yes
+
+.include <src.opts.mk>
+

Added: projects/make-check-sandbox/tests/etc/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/tests/etc/Makefile.inc	Wed Aug  2 22:24:08 2017	(r321960)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"

Modified: projects/make-check-sandbox/tests/sys/Makefile.inc
==============================================================================
--- projects/make-check-sandbox/tests/sys/Makefile.inc	Wed Aug  2 22:19:45 2017	(r321959)
+++ projects/make-check-sandbox/tests/sys/Makefile.inc	Wed Aug  2 22:24:08 2017	(r321960)
@@ -1,3 +1,5 @@
 # $FreeBSD$
 
 WARNS?=		6
+
+.include "${SRCTOP}/tests/Makefile.inc0"

Added: projects/make-check-sandbox/tests/sys/geom/class/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/tests/sys/geom/class/Makefile.inc	Wed Aug  2 22:24:08 2017	(r321960)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"

Added: projects/make-check-sandbox/tests/sys/pjdfstest/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/tests/sys/pjdfstest/Makefile.inc	Wed Aug  2 22:24:08 2017	(r321960)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"

Added: projects/make-check-sandbox/tests/sys/pjdfstest/tests/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/make-check-sandbox/tests/sys/pjdfstest/tests/Makefile.inc	Wed Aug  2 22:24:08 2017	(r321960)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"