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
svn path=/head/; revision=322515
2024-07-21 02:06:37 +00:00 · 2017-08-14 19:21:37 +00:00 · 2017-08-14 19:21:37 +00:00 · 188e46ab03 · 2020-12-20 02:59:44 +00:00
parent 992f1a8e53 7921075587
commit 188e46ab03
113 changed files with 129 additions and 0 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@ -266,6 +266,7 @@ SUBDIR+=pf
 .endif
 .endif

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 SUBDIR_PARALLEL=
--- 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>
--- 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>
--- 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>
--- a/tests/etc/Makefile.inc
+++ b/tests/etc/Makefile.inc
@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"
--- a/tests/sys/Makefile.inc
+++ b/tests/sys/Makefile.inc
@ -1,3 +1,5 @@
 # $FreeBSD$

 WARNS?=		6
+
+.include "${SRCTOP}/tests/Makefile.inc0"
--- a/tests/sys/geom/class/Makefile.inc
+++ b/tests/sys/geom/class/Makefile.inc
@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"
--- a/tests/sys/pjdfstest/Makefile.inc
+++ b/tests/sys/pjdfstest/Makefile.inc
@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "${SRCTOP}/tests/Makefile.inc0"
--- a/tests/sys/pjdfstest/tests/Makefile.inc
+++ b/tests/sys/pjdfstest/tests/Makefile.inc
@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@ -7,6 +7,7 @@ PROG=	apply

 LIBADD=	sbuf

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/basename/Makefile
+++ b/usr.bin/basename/Makefile
@ -6,6 +6,7 @@
 PROG=	basename
 MLINKS=	basename.1 dirname.1

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@ -24,6 +24,7 @@ LIBADD=	archive
 CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
 .endif

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@ -33,6 +33,7 @@ beforeinstall:
 	    ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/cmp/Makefile
+++ b/usr.bin/cmp/Makefile
@ -6,6 +6,7 @@
 PROG=	cmp
 SRCS=	cmp.c link.c misc.c regular.c special.c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/col/Makefile
+++ b/usr.bin/col/Makefile
@ -5,6 +5,7 @@

 PROG=	col

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@ -5,6 +5,7 @@

 PROG=	comm

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@ -11,6 +11,7 @@ MLINKS=	compress.1 uncompress.1
 # XXX zopen is not part of libc
 # MAN=zopen.3

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@ -32,6 +32,7 @@ CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
 SYMLINKS=bsdcpio ${BINDIR}/cpio
 MLINKS= bsdcpio.1 cpio.1

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/csplit/Makefile
+++ b/usr.bin/csplit/Makefile
@ -4,6 +4,7 @@

 PROG=	csplit

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/cut/Makefile
+++ b/usr.bin/cut/Makefile
@ -5,6 +5,7 @@

 PROG=	cut

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/diff/Makefile
+++ b/usr.bin/diff/Makefile
@ -5,6 +5,7 @@
 PROG=	diff
 SRCS=	diff.c diffdir.c diffreg.c xmalloc.c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/diff3/Makefile
+++ b/usr.bin/diff3/Makefile
@ -4,6 +4,7 @@

 PROG=	diff3

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@ -6,6 +6,7 @@
 PROG=	dirname
 MAN=

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@ -6,6 +6,7 @@
 PROG=	du
 LIBADD=	util

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+=	tests

 .include <bsd.prog.mk>
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@ -4,6 +4,7 @@

 PROG=	file2c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/getconf/Makefile
+++ b/usr.bin/getconf/Makefile
@ -37,6 +37,7 @@ conflicting.names:	confstr.names limits.names sysconf.names
 unique.names:		conflicting.names
 	LC_ALL=C sort -u ${.ALLSRC} >${.TARGET}

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@ -92,6 +92,7 @@ LIBADD+=	gnuregex
 CFLAGS+= -DWITHOUT_NLS
 .endif

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/gzip/Makefile
+++ b/usr.bin/gzip/Makefile
@ -27,6 +27,7 @@ LINKS+=		${BINDIR}/gzip ${BINDIR}/gunzip \
 		${BINDIR}/gzip ${BINDIR}/zcat \
 		${BINDIR}/zdiff ${BINDIR}/zcmp

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@ -10,6 +10,7 @@ MLINKS=	hexdump.1 hd.1
 LINKS=	${BINDIR}/hexdump ${BINDIR}/od
 LINKS+=	${BINDIR}/hexdump ${BINDIR}/hd

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/ident/Makefile
+++ b/usr.bin/ident/Makefile
@ -6,6 +6,7 @@ PROG=	ident

 LIBADD=	sbuf

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/indent/Makefile
+++ b/usr.bin/indent/Makefile
@ -8,6 +8,7 @@ SRCS=	indent.c io.c lexi.c parse.c pr_comment.c args.c

 NO_WMISSING_VARIABLE_DECLARATIONS=

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/join/Makefile
+++ b/usr.bin/join/Makefile
@ -5,6 +5,7 @@

 PROG=	join

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@ -5,6 +5,7 @@

 PROG=	jot

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@ -8,6 +8,7 @@ PACKAGE=acct
 PROG=	lastcomm
 SRCS=	lastcomm.c readrec.c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/limits/Makefile
+++ b/usr.bin/limits/Makefile
@ -5,6 +5,7 @@
 PROG=	limits
 LIBADD=	util

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@ -20,6 +20,7 @@ tokenizer.o: parser.h

 CLEANFILES+=	parser.c parser.h tokenizer.o

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/mkimg/Makefile
+++ b/usr.bin/mkimg/Makefile
@ -35,6 +35,7 @@ LIBADD=	util

 WARNS?=	6

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@ -9,6 +9,7 @@ LIBADD=	calendar ncursesw
 LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/pr/Makefile
+++ b/usr.bin/pr/Makefile
@ -6,6 +6,7 @@
 PROG=	pr
 SRCS=	pr.c egetopt.c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@ -5,6 +5,7 @@

 PROG=	printf

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/procstat/Makefile
+++ b/usr.bin/procstat/Makefile
@ -22,6 +22,7 @@ SRCS=	procstat.c		\

 LIBADD+=	procstat xo util sbuf

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/sdiff/Makefile
+++ b/usr.bin/sdiff/Makefile
@ -8,6 +8,7 @@ WARNS=	3

 MAN1=	sdiff.1

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@ -8,6 +8,7 @@ SRCS=	compile.c main.c misc.c process.c

 WARNS?=	2

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/soelim/Makefile
+++ b/usr.bin/soelim/Makefile
@ -4,6 +4,7 @@

 PROG=	soelim

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/stat/Makefile
+++ b/usr.bin/stat/Makefile
@ -7,6 +7,7 @@ PROG=	stat
 LINKS=	${BINDIR}/stat ${BINDIR}/readlink
 MLINKS=	stat.1 readlink.1

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+=	tests

 .include <bsd.prog.mk>
--- a/usr.bin/tail/Makefile
+++ b/usr.bin/tail/Makefile
@ -6,6 +6,7 @@
 PROG=	tail
 SRCS=	forward.c misc.c read.c reverse.c tail.c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@ -33,6 +33,7 @@ CFLAGS+=	-I${_LIBARCHIVEDIR}/libarchive_fe
 SYMLINKS=	bsdtar ${BINDIR}/tar
 MLINKS=	bsdtar.1 tar.1

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/timeout/Makefile
+++ b/usr.bin/timeout/Makefile
@ -4,6 +4,7 @@

 PROG=	timeout

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/tr/Makefile
+++ b/usr.bin/tr/Makefile
@ -6,6 +6,7 @@
 PROG=	tr
 SRCS=	cmap.c cset.c str.c tr.c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/truncate/Makefile
+++ b/usr.bin/truncate/Makefile
@ -5,6 +5,7 @@
 PROG=	truncate
 LIBADD=	util

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/uniq/Makefile
+++ b/usr.bin/uniq/Makefile
@ -5,6 +5,7 @@

 PROG=	uniq

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@ -8,6 +8,7 @@ FILESDIR=	${SHAREDIR}/misc

 LIBADD=	edit

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@ -7,6 +7,7 @@ PROG=	uudecode
 LINKS=	${BINDIR}/uudecode ${BINDIR}/b64decode
 MAN=

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@ -11,6 +11,7 @@ MLINKS=	uuencode.1 uudecode.1 \
 	uuencode.1 b64encode.1 \
 	b64encode.1 b64decode.1

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@ -6,6 +6,7 @@
 PROG=	xargs
 SRCS=	xargs.c strnsubst.c

+HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

 .include <bsd.prog.mk>
--- a/Show more
+++ b/Show more