d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert traditional ${MK_TESTS} conditional idiom for including test

Browse Source 
directories to SUBDIR.${MK_TESTS} idiom

This is being done to pave the way for future work (and homogenity) in
^/projects/make-check-sandbox .

No functional change intended.

MFC after:	1 weeks
This commit is contained in:
Enji Cooper 2017-08-02 08:35:51 +00:00
parent cd155b5603
commit 4b330699f8
113 changed files with 117 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/cat/Makefile
View File

@ -6,8 +6,6 @@
PACKAGE=runtime PACKAGE=runtime
PROG= cat PROG= cat
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/date/Makefile
View File

@ -7,8 +7,6 @@ PACKAGE=runtime
PROG= date PROG= date
SRCS= date.c netdate.c vary.c SRCS= date.c netdate.c vary.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/dd/Makefile
View File

@ -38,8 +38,6 @@ test: ${PROG} gen
@rm -f gen 1M_zeroes* obs_zeroes @rm -f gen 1M_zeroes* obs_zeroes
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/echo/Makefile
View File

@ -6,8 +6,6 @@
PACKAGE=runtime PACKAGE=runtime
PROG= echo PROG= echo
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/expr/Makefile
View File

@ -12,8 +12,6 @@ CFLAGS+= -fwrapv
NO_WMISSING_VARIABLE_DECLARATIONS= NO_WMISSING_VARIABLE_DECLARATIONS=
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/ln/Makefile
View File

@ -10,8 +10,6 @@ MAN= ln.1 symlink.7
LINKS= ${BINDIR}/ln ${BINDIR}/link LINKS= ${BINDIR}/ln ${BINDIR}/link
MLINKS= ln.1 link.1 MLINKS= ln.1 link.1
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/ls/Makefile
View File

@ -14,8 +14,6 @@ CFLAGS+= -DCOLORLS
LIBADD+= termcapw LIBADD+= termcapw
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/mv/Makefile
View File

@ -6,8 +6,6 @@
PACKAGE=runtime PACKAGE=runtime
PROG= mv PROG= mv
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/pax/Makefile
View File

@ -33,8 +33,6 @@ 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 \ gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
tables.c tar.c tty_subs.c tables.c tar.c tty_subs.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/pkill/Makefile
View File

@ -19,8 +19,6 @@ MLINKS= pkill.1 pgrep.1
SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill
SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/sh/Makefile
View File

@ -64,8 +64,6 @@ syntax.c syntax.h: mksyntax
token.h: mktokens token.h: mktokens
sh ${.CURDIR}/mktokens sh ${.CURDIR}/mktokens
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/sleep/Makefile
View File

@ -6,8 +6,6 @@
PACKAGE=runtime PACKAGE=runtime
PROG= sleep PROG= sleep
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
bin/test/Makefile
View File

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

4
cddl/Makefile
View File

@ -5,9 +5,7 @@
SUBDIR= lib .WAIT \ SUBDIR= lib .WAIT \
sbin usr.bin usr.sbin sbin usr.bin usr.sbin
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+=tests
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

5
cddl/lib/Makefile
View File

@ -12,11 +12,8 @@ SUBDIR= ${_drti} \
${_libzfs_core} \ ${_libzfs_core} \
${_libzfs} \ ${_libzfs} \
${_libzpool} \ ${_libzpool} \
${_tests}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
.if ${MK_ZFS} != "no" .if ${MK_ZFS} != "no"
_libzfs_core= libzfs_core _libzfs_core= libzfs_core

6
cddl/sbin/Makefile
View File

@ -2,11 +2,9 @@
.include <src.opts.mk> .include <src.opts.mk>
SUBDIR= ${_tests} ${_zfs} ${_zpool} SUBDIR= ${_zfs} ${_zpool}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
.if ${MK_ZFS} != "no" .if ${MK_ZFS} != "no"
_zfs= zfs _zfs= zfs

5
cddl/usr.bin/Makefile
View File

@ -6,15 +6,12 @@ SUBDIR= \
ctfconvert \ ctfconvert \
ctfdump \ ctfdump \
ctfmerge \ ctfmerge \
${_tests} \
${_zinject} \ ${_zinject} \
${_zlook} \ ${_zlook} \
${_zstreamdump} \ ${_zstreamdump} \
${_ztest} ${_ztest}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
.if ${MK_ZFS} != "no" .if ${MK_ZFS} != "no"
_zinject= zinject _zinject= zinject

5
cddl/usr.sbin/Makefile
View File

@ -5,14 +5,11 @@
SUBDIR= ${_dtrace} \ SUBDIR= ${_dtrace} \
${_lockstat} \ ${_lockstat} \
${_plockstat} \ ${_plockstat} \
${_tests} \
${_zdb} \ ${_zdb} \
${_zfsd} \ ${_zfsd} \
${_zhack} ${_zhack}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
.if ${MK_ZFS} != "no" .if ${MK_ZFS} != "no"
.if ${MK_LIBTHR} != "no" .if ${MK_LIBTHR} != "no"

4
contrib/ofed/usr.bin/Makefile
View File

@ -4,9 +4,7 @@ SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat \
ibsysstat ibtracert opensm perfquery saquery \ ibsysstat ibtracert opensm perfquery saquery \
sminfo smpdump smpquery vendstat sminfo smpdump smpquery vendstat
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= osmtest
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

6
gnu/Makefile
View File

@ -4,11 +4,9 @@
.include <src.opts.mk> .include <src.opts.mk>
SUBDIR= lib .WAIT \ SUBDIR= lib .WAIT \
${_tests} usr.bin usr.bin
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

5
lib/atf/Makefile
View File

@ -29,10 +29,7 @@
SUBDIR= libatf-c \ SUBDIR= libatf-c \
libatf-c++ \ libatf-c++ \
${_tests}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
lib/atf/libatf-c++/Makefile
View File

@ -72,9 +72,7 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
MAN= atf-c++.3 MAN= atf-c++.3
MLINKS+= atf-c++.3 atf-c-api++.3 # Backwards compatibility. MLINKS+= atf-c++.3 atf-c-api++.3 # Backwards compatibility.
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR= tests
.endif
.include "../common.mk" .include "../common.mk"
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/atf/libatf-c/Makefile
View File

@ -97,9 +97,7 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
MAN= atf-c.3 MAN= atf-c.3
MLINKS+= atf-c.3 atf-c-api.3 # Backwards compatibility. MLINKS+= atf-c.3 atf-c-api.3 # Backwards compatibility.
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR= tests
.endif
.include "../common.mk" .include "../common.mk"
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libarchive/Makefile
View File

@ -413,8 +413,6 @@ MLINKS+= archive_write_set_options.3 archive_write_set_format_option.3
MLINKS+= archive_write_set_options.3 archive_write_set_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_option.3
MLINKS+= libarchive.3 archive.3 MLINKS+= libarchive.3 archive.3
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libc/Makefile
View File

@ -173,9 +173,7 @@ libkern.${LIBC_ARCH}:: ${KMSRCS}
${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH} ${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libcasper/services/cap_dns/Makefile
View File

@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libcasper/services/cap_grp/Makefile
View File

@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libcasper/services/cap_pwd/Makefile
View File

@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libcasper/services/cap_sysctl/Makefile
View File

@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libcrypt/Makefile
View File

@ -43,9 +43,7 @@ WARNS?= 2
PRECIOUSLIB= PRECIOUSLIB=
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
lib/libmp/Makefile
View File

@ -15,8 +15,6 @@ CFLAGS+= -I${SRCTOP}/crypto
VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libnv/Makefile
View File

@ -17,8 +17,6 @@ SRCS+= msgio.c
SRCS+= nvlist.c SRCS+= nvlist.c
SRCS+= nvpair.c SRCS+= nvpair.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libpathconv/Makefile
View File

@ -13,8 +13,6 @@ SRCS= abs2rel.c rel2abs.c
#VERSION_DEF= ${SRCTOP/lib/libc/Versions.def #VERSION_DEF= ${SRCTOP/lib/libc/Versions.def
#SYMBOL_MAPS= ${.CURDIR}/Symbol.map #SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libproc/Makefile
View File

@ -41,8 +41,6 @@ SHLIB_MAJOR= 4
MAN= MAN=
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/librt/Makefile
View File

@ -21,8 +21,6 @@ PRECIOUSLIB=
VERSION_DEF=${SRCTOP}/lib/libc/Versions.def VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS=${.CURDIR}/Symbol.map SYMBOL_MAPS=${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libthr/Makefile
View File

@ -69,8 +69,6 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libutil/Makefile
View File

@ -84,8 +84,6 @@ MLINKS+=pw_util.3 pw_copy.3 \
pw_util.3 pw_tempname.3 \ pw_util.3 pw_tempname.3 \
pw_util.3 pw_tmp.3 pw_util.3 pw_tmp.3
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libxo/Makefile
View File

@ -110,8 +110,6 @@ MLINKS= xo_attr.3 xo_attr_h.3 \
xo_syslog.3 xo_set_logmask.3 \ xo_syslog.3 xo_set_logmask.3 \
xo_syslog.3 xo_vsyslog.3 xo_syslog.3 xo_vsyslog.3
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/msun/Makefile
View File

@ -228,8 +228,6 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3
.include <src.opts.mk> .include <src.opts.mk>
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
libexec/atf/atf-check/Makefile
View File

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

4
libexec/atf/atf-sh/Makefile
View File

@ -72,9 +72,7 @@ FILESGROUPS= SUBR
SUBRDIR= ${SHAREDIR}/atf SUBRDIR= ${SHAREDIR}/atf
SUBR= libatf-sh.subr SUBR= libatf-sh.subr
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include "../../../lib/atf/common.mk" .include "../../../lib/atf/common.mk"
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
libexec/rtld-elf/Makefile
View File

@ -85,9 +85,7 @@ beforeinstall:
.PATH: ${.CURDIR}/${RTLD_ARCH} .PATH: ${.CURDIR}/${RTLD_ARCH}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>
${PROG_FULL}: ${VERSION_MAP} ${PROG_FULL}: ${VERSION_MAP}

4
sbin/devd/Makefile
View File

@ -18,8 +18,6 @@ CFLAGS+=-I. -I${.CURDIR}
CLEANFILES= y.output CLEANFILES= y.output
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
sbin/dhclient/Makefile
View File

@ -46,8 +46,6 @@ LIBADD= util
WARNS?= 2 WARNS?= 2
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
sbin/growfs/Makefile
View File

@ -22,8 +22,6 @@ NO_WCAST_ALIGN= yes
LIBADD= util LIBADD= util
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
sbin/ifconfig/Makefile
View File

@ -67,8 +67,6 @@ MAN= ifconfig.8
CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs
WARNS?= 2 WARNS?= 2
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
sbin/mdconfig/Makefile
View File

@ -8,8 +8,6 @@ MAN= mdconfig.8
LIBADD= util geom LIBADD= util geom
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
sbin/pfctl/Makefile
View File

@ -31,8 +31,6 @@ YFLAGS=
LIBADD= m md LIBADD= m md
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

6
secure/Makefile
View File

@ -3,12 +3,10 @@
.include <src.opts.mk> .include <src.opts.mk>
SUBDIR= lib .WAIT \ SUBDIR= lib .WAIT \
libexec ${_tests} usr.bin usr.sbin libexec usr.bin usr.sbin
SUBDIR_PARALLEL= SUBDIR_PARALLEL=
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
# These are the programs which depend on crypto, but not Kerberos. # These are the programs which depend on crypto, but not Kerberos.
SPROGS= lib/libfetch lib/libpam lib/libradius lib/libtelnet \ SPROGS= lib/libfetch lib/libpam lib/libradius lib/libtelnet \

4
secure/lib/Makefile
View File

@ -10,8 +10,6 @@ SUBDIR+=libssh
.endif .endif
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+=tests
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
secure/libexec/Makefile
View File

@ -7,9 +7,7 @@ SUBDIR=
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+=tests
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

4
secure/usr.bin/Makefile
View File

@ -10,9 +10,7 @@ SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
.endif .endif
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+=tests
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

4
secure/usr.sbin/Makefile
View File

@ -7,9 +7,7 @@ SUBDIR=
SUBDIR+=sshd SUBDIR+=sshd
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+=tests
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

5
share/Makefile
View File

@ -26,7 +26,6 @@ SUBDIR= ${_colldef} \
${_syscons} \ ${_syscons} \
tabset \ tabset \
termcap \ termcap \
${_tests} \
${_timedef} \ ${_timedef} \
${_vt} \ ${_vt} \
${_zoneinfo} ${_zoneinfo}
@ -82,9 +81,7 @@ _doc= doc
_syscons= syscons _syscons= syscons
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
_tests= tests
.endif
.if ${MK_VT} != "no" .if ${MK_VT} != "no"
_vt= vt _vt= vt

4
share/examples/Makefile
View File

@ -266,9 +266,7 @@ SUBDIR+=pf
.endif .endif
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+=tests
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

4
share/zoneinfo/Makefile
View File

@ -131,8 +131,6 @@ afterinstall:
echo "Run tzsetup(8) manually to update /etc/localtime."; \ echo "Run tzsetup(8) manually to update /etc/localtime."; \
fi fi
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/apply/Makefile
View File

@ -7,8 +7,6 @@ PROG= apply
LIBADD= sbuf LIBADD= sbuf
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/basename/Makefile
View File

@ -6,8 +6,6 @@
PROG= basename PROG= basename
MLINKS= basename.1 dirname.1 MLINKS= basename.1 dirname.1
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/bsdcat/Makefile
View File

@ -24,8 +24,6 @@ LIBADD= archive
CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/calendar/Makefile
View File

@ -33,8 +33,6 @@ beforeinstall:
${DESTDIR}${SHAREDIR}/calendar/${link} ${DESTDIR}${SHAREDIR}/calendar/${link}
.endfor .endfor
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/cmp/Makefile
View File

@ -6,8 +6,6 @@
PROG= cmp PROG= cmp
SRCS= cmp.c link.c misc.c regular.c special.c SRCS= cmp.c link.c misc.c regular.c special.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/col/Makefile
View File

@ -5,8 +5,6 @@
PROG= col PROG= col
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/comm/Makefile
View File

@ -5,8 +5,6 @@
PROG= comm PROG= comm
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/compress/Makefile
View File

@ -11,8 +11,6 @@ MLINKS= compress.1 uncompress.1
# XXX zopen is not part of libc # XXX zopen is not part of libc
# MAN=zopen.3 # MAN=zopen.3
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/cpio/Makefile
View File

@ -32,8 +32,6 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
SYMLINKS=bsdcpio ${BINDIR}/cpio SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1 MLINKS= bsdcpio.1 cpio.1
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/csplit/Makefile
View File

@ -4,8 +4,6 @@
PROG= csplit PROG= csplit
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/cut/Makefile
View File

@ -5,8 +5,6 @@
PROG= cut PROG= cut
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/diff/Makefile
View File

@ -5,8 +5,6 @@
PROG= diff PROG= diff
SRCS= diff.c diffdir.c diffreg.c xmalloc.c SRCS= diff.c diffdir.c diffreg.c xmalloc.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/diff3/Makefile
View File

@ -4,8 +4,6 @@
PROG= diff3 PROG= diff3
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/dirname/Makefile
View File

@ -6,8 +6,6 @@
PROG= dirname PROG= dirname
MAN= MAN=
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/file2c/Makefile
View File

@ -4,8 +4,6 @@
PROG= file2c PROG= file2c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/getconf/Makefile
View File

@ -37,8 +37,6 @@ conflicting.names: confstr.names limits.names sysconf.names
unique.names: conflicting.names unique.names: conflicting.names
LC_ALL=C sort -u ${.ALLSRC} >${.TARGET} LC_ALL=C sort -u ${.ALLSRC} >${.TARGET}
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/grep/Makefile
View File

@ -92,8 +92,6 @@ LIBADD+= gnuregex
CFLAGS+= -DWITHOUT_NLS CFLAGS+= -DWITHOUT_NLS
.endif .endif
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/gzip/Makefile
View File

@ -27,8 +27,6 @@ LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip \
${BINDIR}/gzip ${BINDIR}/zcat \ ${BINDIR}/gzip ${BINDIR}/zcat \
${BINDIR}/zdiff ${BINDIR}/zcmp ${BINDIR}/zdiff ${BINDIR}/zcmp
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/hexdump/Makefile
View File

@ -10,8 +10,6 @@ MLINKS= hexdump.1 hd.1
LINKS= ${BINDIR}/hexdump ${BINDIR}/od LINKS= ${BINDIR}/hexdump ${BINDIR}/od
LINKS+= ${BINDIR}/hexdump ${BINDIR}/hd LINKS+= ${BINDIR}/hexdump ${BINDIR}/hd
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/ident/Makefile
View File

@ -6,8 +6,6 @@ PROG= ident
LIBADD= sbuf LIBADD= sbuf
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/indent/Makefile
View File

@ -8,8 +8,6 @@ SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c
NO_WMISSING_VARIABLE_DECLARATIONS= NO_WMISSING_VARIABLE_DECLARATIONS=
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/join/Makefile
View File

@ -5,8 +5,6 @@
PROG= join PROG= join
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/jot/Makefile
View File

@ -5,8 +5,6 @@
PROG= jot PROG= jot
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/lastcomm/Makefile
View File

@ -8,8 +8,6 @@ PACKAGE=acct
PROG= lastcomm PROG= lastcomm
SRCS= lastcomm.c readrec.c SRCS= lastcomm.c readrec.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/limits/Makefile
View File

@ -5,8 +5,6 @@
PROG= limits PROG= limits
LIBADD= util LIBADD= util
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/m4/Makefile
View File

@ -20,8 +20,6 @@ tokenizer.o: parser.h
CLEANFILES+= parser.c parser.h tokenizer.o CLEANFILES+= parser.c parser.h tokenizer.o
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/mkimg/Makefile
View File

@ -35,8 +35,6 @@ LIBADD= util
WARNS?= 6 WARNS?= 6
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/ncal/Makefile
View File

@ -9,8 +9,6 @@ LIBADD= calendar ncursesw
LINKS= ${BINDIR}/ncal ${BINDIR}/cal LINKS= ${BINDIR}/ncal ${BINDIR}/cal
MLINKS= ncal.1 cal.1 MLINKS= ncal.1 cal.1
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/pr/Makefile
View File

@ -6,8 +6,6 @@
PROG= pr PROG= pr
SRCS= pr.c egetopt.c SRCS= pr.c egetopt.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/printf/Makefile
View File

@ -5,8 +5,6 @@
PROG= printf PROG= printf
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/procstat/Makefile
View File

@ -22,8 +22,6 @@ SRCS= procstat.c \
LIBADD+= procstat xo util sbuf LIBADD+= procstat xo util sbuf
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/sdiff/Makefile
View File

@ -8,8 +8,6 @@ WARNS= 3
MAN1= sdiff.1 MAN1= sdiff.1
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/sed/Makefile
View File

@ -8,8 +8,6 @@ SRCS= compile.c main.c misc.c process.c
WARNS?= 2 WARNS?= 2
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/soelim/Makefile
View File

@ -4,8 +4,6 @@
PROG= soelim PROG= soelim
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/tail/Makefile
View File

@ -6,8 +6,6 @@
PROG= tail PROG= tail
SRCS= forward.c misc.c read.c reverse.c tail.c SRCS= forward.c misc.c read.c reverse.c tail.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/tar/Makefile
View File

@ -33,8 +33,6 @@ CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe
SYMLINKS= bsdtar ${BINDIR}/tar SYMLINKS= bsdtar ${BINDIR}/tar
MLINKS= bsdtar.1 tar.1 MLINKS= bsdtar.1 tar.1
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/timeout/Makefile
View File

@ -4,8 +4,6 @@
PROG= timeout PROG= timeout
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/tr/Makefile
View File

@ -6,8 +6,6 @@
PROG= tr PROG= tr
SRCS= cmap.c cset.c str.c tr.c SRCS= cmap.c cset.c str.c tr.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/truncate/Makefile
View File

@ -5,8 +5,6 @@
PROG= truncate PROG= truncate
LIBADD= util LIBADD= util
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/uniq/Makefile
View File

@ -5,8 +5,6 @@
PROG= uniq PROG= uniq
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/units/Makefile
View File

@ -8,8 +8,6 @@ FILESDIR= ${SHAREDIR}/misc
LIBADD= edit LIBADD= edit
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/uudecode/Makefile
View File

@ -7,8 +7,6 @@ PROG= uudecode
LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode
MAN= MAN=
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/uuencode/Makefile
View File

@ -11,8 +11,6 @@ MLINKS= uuencode.1 uudecode.1 \
uuencode.1 b64encode.1 \ uuencode.1 b64encode.1 \
b64encode.1 b64decode.1 b64encode.1 b64decode.1
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.bin/xargs/Makefile
View File

@ -6,8 +6,6 @@
PROG= xargs PROG= xargs
SRCS= xargs.c strnsubst.c SRCS= xargs.c strnsubst.c
.if ${MK_TESTS} != "no" SUBDIR.${MK_TESTS}+= tests
SUBDIR+= tests
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

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