aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-08-14 19:21:37 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-08-14 19:21:37 +0000
commit188e46ab0332a7887da6f1eb5494d92076e3d31e (patch)
tree6a6d4b83eb771bff058b2138718550b2d3650f03 /tests
parent992f1a8e53e16d91cf43b2a06e856a97dbbe5b87 (diff)
parent79210755878ca1ad93078a8d3f95ffc211be3cef (diff)
downloadsrc-188e46ab0332a7887da6f1eb5494d92076e3d31e.tar.gz
src-188e46ab0332a7887da6f1eb5494d92076e3d31e.zip
Add supporting changes for `Add limited sandbox capability to "make check"`
Non-tests/... changes: - Add HAS_TESTS= to Makefiles with libraries and programs to enable iteration and propagate the appropriate environment down to *.test.mk. tests/... changes: - Add appropriate support Makefile.inc's to set HAS_TESTS in a minimal manner, since tests/... is a special subdirectory tree compared to the others. MFC after: 2 months MFC with: r322511 Reviewed by: arch (silence), testing (silence) Differential Revision: D12014
Notes
Notes: svn path=/head/; revision=322515
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile1
-rw-r--r--tests/Makefile.inc08
-rw-r--r--tests/etc/Makefile.inc3
-rw-r--r--tests/sys/Makefile.inc2
-rw-r--r--tests/sys/geom/class/Makefile.inc3
-rw-r--r--tests/sys/pjdfstest/Makefile.inc3
-rw-r--r--tests/sys/pjdfstest/tests/Makefile.inc3
7 files changed, 23 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 0aed9cfb1b83..a8491fcb937d 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -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>
diff --git a/tests/Makefile.inc0 b/tests/Makefile.inc0
new file mode 100644
index 000000000000..4ba8992bda93
--- /dev/null
+++ b/tests/Makefile.inc0
@@ -0,0 +1,8 @@
+# $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 <bsd.opts.mk>
diff --git a/tests/etc/Makefile.inc b/tests/etc/Makefile.inc
new file mode 100644
index 000000000000..2cba822015ae
--- /dev/null
+++ b/tests/etc/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"
diff --git a/tests/sys/Makefile.inc b/tests/sys/Makefile.inc
index f3418421919d..0b336d3f3ef3 100644
--- a/tests/sys/Makefile.inc
+++ b/tests/sys/Makefile.inc
@@ -1,3 +1,5 @@
# $FreeBSD$
WARNS?= 6
+
+.include "${SRCTOP}/tests/Makefile.inc0"
diff --git a/tests/sys/geom/class/Makefile.inc b/tests/sys/geom/class/Makefile.inc
new file mode 100644
index 000000000000..2cba822015ae
--- /dev/null
+++ b/tests/sys/geom/class/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"
diff --git a/tests/sys/pjdfstest/Makefile.inc b/tests/sys/pjdfstest/Makefile.inc
new file mode 100644
index 000000000000..2cba822015ae
--- /dev/null
+++ b/tests/sys/pjdfstest/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"
diff --git a/tests/sys/pjdfstest/tests/Makefile.inc b/tests/sys/pjdfstest/tests/Makefile.inc
new file mode 100644
index 000000000000..265f86d1ed55
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"