Add supporting changes for `Add limited sandbox capability to "make c…

…heck"` 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
project-fifo · Aug 14, 2017 · 18951ee · 18951ee
2 parents d42d7dc + dabaa52
commit 18951ee
Show file tree

Hide file tree

Showing 113 changed files with 129 additions and 0 deletions.
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
@@ -6,6 +6,7 @@
 PACKAGE=runtime
 PROG=	cat
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
@@ -6,6 +6,7 @@
 PACKAGE=runtime
 PROG=	chmod
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.prog.mk>
diff --git a/bin/date/Makefile b/bin/date/Makefile
@@ -7,6 +7,7 @@ PACKAGE=runtime
 PROG=	date
 SRCS=	date.c netdate.c vary.c
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
@@ -38,6 +38,7 @@ test: ${PROG} gen
 
 	@rm -f gen 1M_zeroes* obs_zeroes
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
@@ -6,6 +6,7 @@
 PACKAGE=runtime
 PROG=	echo
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
@@ -12,6 +12,7 @@ CFLAGS+= -fwrapv
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
@@ -10,6 +10,7 @@ MAN=	ln.1 symlink.7
 LINKS=	${BINDIR}/ln ${BINDIR}/link
 MLINKS=	ln.1 link.1
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
@@ -14,6 +14,7 @@ CFLAGS+= -DCOLORLS
 LIBADD+=	termcapw
 .endif
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
@@ -6,6 +6,7 @@
 PACKAGE=runtime
 PROG=	mv
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
@@ -33,6 +33,7 @@ SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
@@ -19,6 +19,7 @@ MLINKS=	pkill.1 pgrep.1
 SYMLINKS=	../..${BINDIR}/pkill /usr/bin/pkill
 SYMLINKS+=	../..${BINDIR}/pgrep /usr/bin/pgrep
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile
@@ -5,6 +5,7 @@
 PACKAGE=runtime
 PROG=	pwait
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.prog.mk>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
@@ -64,6 +64,7 @@ syntax.c syntax.h: mksyntax
 token.h: mktokens
 	sh ${.CURDIR}/mktokens
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
@@ -6,6 +6,7 @@
 PACKAGE=runtime
 PROG=	sleep
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/test/Makefile b/bin/test/Makefile
@@ -8,6 +8,7 @@ PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
 MLINKS=	test.1 [.1
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
@@ -72,6 +72,7 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
 MAN=		atf-c++.3
 MLINKS+=	atf-c++.3 atf-c-api++.3  # Backwards compatibility.
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include "../common.mk"

diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
@@ -97,6 +97,7 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
 MAN=		atf-c.3
 MLINKS+=	atf-c.3 atf-c-api.3  # Backwards compatibility.
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include "../common.mk"

diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
@@ -413,6 +413,7 @@ MLINKS+=	archive_write_set_options.3 archive_write_set_format_option.3
 MLINKS+=	archive_write_set_options.3 archive_write_set_option.3
 MLINKS+=	libarchive.3 archive.3
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
@@ -173,6 +173,7 @@ libkern.${LIBC_ARCH}:: ${KMSRCS}
 	${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
 .endif
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>

diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
@@ -47,6 +47,7 @@ SHLIB_MAJOR=	7
 
 .include <src.opts.mk>
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile
@@ -18,6 +18,7 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile
@@ -18,6 +18,7 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile
@@ -18,6 +18,7 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile
@@ -18,6 +18,7 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
@@ -43,6 +43,7 @@ WARNS?=		2
 
 PRECIOUSLIB=
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
@@ -38,6 +38,7 @@ MLINKS+=kvm_read.3 kvm_read2.3 kvm_read.3 kvm_write.3
 
 .include <src.opts.mk>
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}=	tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
@@ -15,6 +15,7 @@ CFLAGS+=	-I${SRCTOP}/crypto
 VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
@@ -17,6 +17,7 @@ SRCS+=	msgio.c
 SRCS+=	nvlist.c
 SRCS+=	nvpair.c
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libpathconv/Makefile b/lib/libpathconv/Makefile
@@ -13,6 +13,7 @@ SRCS=		abs2rel.c rel2abs.c
 #VERSION_DEF=	${SRCTOP/lib/libc/Versions.def
 #SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
@@ -41,6 +41,7 @@ SHLIB_MAJOR=	4
 
 MAN=
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
@@ -21,6 +21,7 @@ PRECIOUSLIB=
 VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=${.CURDIR}/Symbol.map
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile
@@ -14,6 +14,7 @@ VERSION_DEF=	${.CURDIR}/Version.def
 
 .PATH:	${SRCTOP}/sys/kern
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
@@ -69,6 +69,7 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
 SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
 .endif
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
@@ -85,6 +85,7 @@ MLINKS+=pw_util.3 pw_copy.3 \
 	pw_util.3 pw_tempname.3 \
 	pw_util.3 pw_tmp.3
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile
@@ -110,6 +110,7 @@ MLINKS=	xo_attr.3 xo_attr_h.3 \
 	xo_syslog.3 xo_set_logmask.3 \
 	xo_syslog.3 xo_vsyslog.3
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
@@ -228,6 +228,7 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3
 
 .include <src.opts.mk>
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
@@ -40,6 +40,7 @@ CFLAGS+=	-DATF_SHELL='"/bin/sh"'
 
 LIBADD=		atf_cxx
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile
@@ -72,6 +72,7 @@ FILESGROUPS=	SUBR
 SUBRDIR=	${SHAREDIR}/atf
 SUBR=		libatf-sh.subr
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include "../../../lib/atf/common.mk"

diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
@@ -85,6 +85,7 @@ beforeinstall:
 
 .PATH: ${.CURDIR}/${RTLD_ARCH}
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
@@ -18,6 +18,7 @@ CFLAGS+=-I. -I${.CURDIR}
 
 CLEANFILES= y.output
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
@@ -46,6 +46,7 @@ LIBADD=	util
 
 WARNS?=	2
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
@@ -22,6 +22,7 @@ NO_WCAST_ALIGN= yes
 
 LIBADD=	util
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
@@ -67,6 +67,7 @@ MAN=	ifconfig.8
 CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs
 WARNS?=	2
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
@@ -8,6 +8,7 @@ MAN=		mdconfig.8
 
 LIBADD=		util geom
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
@@ -31,6 +31,7 @@ YFLAGS=
 
 LIBADD=	m md
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
@@ -266,6 +266,7 @@ SUBDIR+=pf
 .endif
 .endif
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 SUBDIR_PARALLEL=

diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
@@ -131,6 +131,7 @@ afterinstall:
 		echo "Run tzsetup(8) manually to update /etc/localtime."; \
 	fi
 
+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git 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
@@ -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
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -266,6 +266,7 @@ SUBDIR+=pf @@
     .endif
     .endif
+    HAS_TESTS=
     SUBDIR.${MK_TESTS}+= tests
     SUBDIR_PARALLEL=
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# $FreeBSD$

		.include "${SRCTOP}/tests/Makefile.inc0"