diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-08-14 19:21:37 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-08-14 19:21:37 +0000 |
| commit | 188e46ab0332a7887da6f1eb5494d92076e3d31e (patch) | |
| tree | 6a6d4b83eb771bff058b2138718550b2d3650f03 /usr.bin | |
| parent | 992f1a8e53e16d91cf43b2a06e856a97dbbe5b87 (diff) | |
| parent | 79210755878ca1ad93078a8d3f95ffc211be3cef (diff) | |
| download | src-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 'usr.bin')
49 files changed, 49 insertions, 0 deletions
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile index 9234077aaf18..7af4395be78f 100644 --- 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> diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile index 2fbb26488bf6..1849181a6ef9 100644 --- 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> diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile index 8ea5dee7398e..78780effd700 100644 --- 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> diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index 53bd4675b948..8df56c42ff9d 100644 --- 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> diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile index 0f515f4af5f5..bcde84f0255a 100644 --- 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> diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile index 8773b5dc58ba..f0cf7f76d25d 100644 --- 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> diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile index 2392035e6c39..b28260f1b6ff 100644 --- 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> diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile index bfe46b5da868..1443b96b1abc 100644 --- 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> diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 46cf06e871c1..666bb88ffb19 100644 --- 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> diff --git a/usr.bin/csplit/Makefile b/usr.bin/csplit/Makefile index af23872b969d..1c455c3bc033 100644 --- 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> diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile index 9321756aae86..40a12d53cba8 100644 --- 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> diff --git a/usr.bin/diff/Makefile b/usr.bin/diff/Makefile index 0293d167a6b7..18c4495cf1c7 100644 --- 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> diff --git a/usr.bin/diff3/Makefile b/usr.bin/diff3/Makefile index 03cf52ad9876..fb56e8861955 100644 --- 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> diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile index 3353371c8963..ad16e032fbfb 100644 --- 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> diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile index 4340812457d8..b9256f3cec30 100644 --- 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> diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile index 0f0f8af595c5..f8216adc660b 100644 --- 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> diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile index 46e999c86258..a5cdc0423a25 100644 --- 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> diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index c6d4c2f5cdf9..5166303c09eb 100644 --- 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> diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile index 2a69ac139fa5..ef78508140a7 100644 --- 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> diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile index fd8494c74ed5..276234d1e613 100644 --- 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> diff --git a/usr.bin/ident/Makefile b/usr.bin/ident/Makefile index e8c58c4e93d9..e0a3a80f7b09 100644 --- 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> diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile index 6ab3b2b3831a..0847a2f9fb9c 100644 --- 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> diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile index 575f7abedef8..a0998ad441ce 100644 --- 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> diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile index cc802676fb23..81035c335886 100644 --- 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> diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile index 83a4f96a4c87..61731b8746d2 100644 --- 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> diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile index 5a5af98f3023..68e540df3a49 100644 --- 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> diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile index ffd13d0fdba2..a25995cb9fd6 100644 --- 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> diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile index 68274a4b3763..451abe378bfe 100644 --- 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> diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile index c42ed905b11a..8cfd9b1c62e0 100644 --- 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> diff --git a/usr.bin/pr/Makefile b/usr.bin/pr/Makefile index 6796ea8a8157..15ffee098160 100644 --- 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> diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile index b1b39308e969..54d6f5c8ed39 100644 --- 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> diff --git a/usr.bin/procstat/Makefile b/usr.bin/procstat/Makefile index ed07e634fcc1..03b6cdf933ba 100644 --- 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> diff --git a/usr.bin/sdiff/Makefile b/usr.bin/sdiff/Makefile index 0fa5985c66fe..bc25ac883106 100644 --- 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> diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile index 803de6db23c4..e36feb94c7a5 100644 --- 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> diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile index eda319b1f967..5e9734d0fb82 100644 --- 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> diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile index bc560a4243d0..e0a5a10bcf58 100644 --- 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> diff --git a/usr.bin/tail/Makefile b/usr.bin/tail/Makefile index 8012419affb5..d586afe01c18 100644 --- 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> diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 91e51a4b394e..ad50f7d475e1 100644 --- 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> diff --git a/usr.bin/timeout/Makefile b/usr.bin/timeout/Makefile index 72c855813982..fc1c87edfb7a 100644 --- 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> diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile index 0cd24502e991..abe032ba266d 100644 --- 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> diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile index 2f607d440830..72deb0dd4e77 100644 --- 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> diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile index ab811d458022..5ad8a8e6b4d9 100644 --- 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> diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index 78d843e7794f..7bc1ac89c296 100644 --- 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> diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile index 83fbd64fee87..dbcbe8d93b8a 100644 --- 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> diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile index fac6ef83f8b0..5897d89dc057 100644 --- 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> diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile index caf6d9dd9df6..04cc44840a63 100644 --- 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> diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index 3fffb2f7d97b..4bc0d006cb98 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -14,6 +14,7 @@ CFLAGS+= -I${SRCTOP}/lib/libnetbsd LIBADD= md +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile index e4a765120e97..6a60768b2fd6 100644 --- a/usr.bin/xo/Makefile +++ b/usr.bin/xo/Makefile @@ -18,6 +18,7 @@ CFLAGS+=-I${SRCTOP}/lib/libxo LIBADD= xo util +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile index 455c4b93b230..026a6ccc43fe 100644 --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -21,6 +21,7 @@ CFLAGS+= -DYYPATCH=${YYPATCH} LINKS= ${BINDIR}/yacc ${BINDIR}/byacc MLINKS= yacc.1 byacc.1 +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> |