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
This commit is contained in:
ngie 2017-08-14 19:21:37 +00:00
commit 18951eee49
113 changed files with 129 additions and 0 deletions

View File

@ -6,6 +6,7 @@
PACKAGE=runtime
PROG= cat
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -6,6 +6,7 @@
PACKAGE=runtime
PROG= chmod
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -38,6 +38,7 @@ test: ${PROG} gen
@rm -f gen 1M_zeroes* obs_zeroes
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -6,6 +6,7 @@
PACKAGE=runtime
PROG= echo
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -12,6 +12,7 @@ CFLAGS+= -fwrapv
NO_WMISSING_VARIABLE_DECLARATIONS=
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -14,6 +14,7 @@ CFLAGS+= -DCOLORLS
LIBADD+= termcapw
.endif
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -6,6 +6,7 @@
PACKAGE=runtime
PROG= mv
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -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>

View File

@ -5,6 +5,7 @@
PACKAGE=runtime
PROG= pwait
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -6,6 +6,7 @@
PACKAGE=runtime
PROG= sleep
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -8,6 +8,7 @@ PROG= test
LINKS= ${BINDIR}/test ${BINDIR}/[
MLINKS= test.1 [.1
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -47,6 +47,7 @@ SHLIB_MAJOR= 7
.include <src.opts.mk>
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -18,6 +18,7 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -18,6 +18,7 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -18,6 +18,7 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -18,6 +18,7 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -43,6 +43,7 @@ WARNS?= 2
PRECIOUSLIB=
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -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>

View File

@ -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>

View File

@ -17,6 +17,7 @@ SRCS+= msgio.c
SRCS+= nvlist.c
SRCS+= nvpair.c
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -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>

View File

@ -41,6 +41,7 @@ SHLIB_MAJOR= 4
MAN=
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -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>

View File

@ -14,6 +14,7 @@ VERSION_DEF= ${.CURDIR}/Version.def
.PATH: ${SRCTOP}/sys/kern
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -40,6 +40,7 @@ CFLAGS+= -DATF_SHELL='"/bin/sh"'
LIBADD= atf_cxx
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -72,6 +72,7 @@ FILESGROUPS= SUBR
SUBRDIR= ${SHAREDIR}/atf
SUBR= libatf-sh.subr
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include "../../../lib/atf/common.mk"

View File

@ -85,6 +85,7 @@ beforeinstall:
.PATH: ${.CURDIR}/${RTLD_ARCH}
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -18,6 +18,7 @@ CFLAGS+=-I. -I${.CURDIR}
CLEANFILES= y.output
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -46,6 +46,7 @@ LIBADD= util
WARNS?= 2
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -22,6 +22,7 @@ NO_WCAST_ALIGN= yes
LIBADD= util
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -8,6 +8,7 @@ MAN= mdconfig.8
LIBADD= util geom
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -31,6 +31,7 @@ YFLAGS=
LIBADD= m md
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -266,6 +266,7 @@ SUBDIR+=pf
.endif
.endif
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=

View File

@ -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>

View File

@ -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>

8
tests/Makefile.inc0 Normal file
View File

@ -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>

3
tests/etc/Makefile.inc Normal file
View File

@ -0,0 +1,3 @@
# $FreeBSD$
.include "${SRCTOP}/tests/Makefile.inc0"

View File

@ -1,3 +1,5 @@
# $FreeBSD$
WARNS?= 6
.include "${SRCTOP}/tests/Makefile.inc0"

View File

@ -0,0 +1,3 @@
# $FreeBSD$
.include "${SRCTOP}/tests/Makefile.inc0"

View File

@ -0,0 +1,3 @@
# $FreeBSD$
.include "${SRCTOP}/tests/Makefile.inc0"

View File

@ -0,0 +1,3 @@
# $FreeBSD$
.include "../Makefile.inc"

View File

@ -7,6 +7,7 @@ PROG= apply
LIBADD= sbuf
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -6,6 +6,7 @@
PROG= basename
MLINKS= basename.1 dirname.1
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -33,6 +33,7 @@ beforeinstall:
${DESTDIR}${SHAREDIR}/calendar/${link}
.endfor
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -5,6 +5,7 @@
PROG= col
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -5,6 +5,7 @@
PROG= comm
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -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>

View File

@ -4,6 +4,7 @@
PROG= csplit
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -5,6 +5,7 @@
PROG= cut
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -4,6 +4,7 @@
PROG= diff3
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -6,6 +6,7 @@
PROG= dirname
MAN=
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -6,6 +6,7 @@
PROG= du
LIBADD= util
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -4,6 +4,7 @@
PROG= file2c
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -92,6 +92,7 @@ LIBADD+= gnuregex
CFLAGS+= -DWITHOUT_NLS
.endif
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -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>

View File

@ -6,6 +6,7 @@ PROG= ident
LIBADD= sbuf
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -5,6 +5,7 @@
PROG= join
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -5,6 +5,7 @@
PROG= jot
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -8,6 +8,7 @@ PACKAGE=acct
PROG= lastcomm
SRCS= lastcomm.c readrec.c
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -5,6 +5,7 @@
PROG= limits
LIBADD= util
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -35,6 +35,7 @@ LIBADD= util
WARNS?= 6
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -6,6 +6,7 @@
PROG= pr
SRCS= pr.c egetopt.c
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -5,6 +5,7 @@
PROG= printf
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -22,6 +22,7 @@ SRCS= procstat.c \
LIBADD+= procstat xo util sbuf
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -8,6 +8,7 @@ WARNS= 3
MAN1= sdiff.1
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -4,6 +4,7 @@
PROG= soelim
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -4,6 +4,7 @@
PROG= timeout
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -5,6 +5,7 @@
PROG= truncate
LIBADD= util
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -5,6 +5,7 @@
PROG= uniq
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -8,6 +8,7 @@ FILESDIR= ${SHAREDIR}/misc
LIBADD= edit
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -7,6 +7,7 @@ PROG= uudecode
LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode
MAN=
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -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>

View File

@ -6,6 +6,7 @@
PROG= xargs
SRCS= xargs.c strnsubst.c
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

Some files were not shown because too many files have changed in this diff Show More