svn commit: r321912 - in head: bin/cat bin/date bin/dd bin/echo bin/expr bin/ln bin/ls bin/mv bin/pax bin/pkill bin/sh bin/sleep bin/test cddl cddl/lib cddl/sbin cddl/usr.bin cddl/usr.sbin contrib/...
Ngie Cooper
ngie at FreeBSD.org
Wed Aug 2 08:36:01 UTC 2017
Author: ngie
Date: Wed Aug 2 08:35:51 2017
New Revision: 321912
URL: https://svnweb.freebsd.org/changeset/base/321912
Log:
Convert traditional ${MK_TESTS} conditional idiom for including test
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
Modified:
head/bin/cat/Makefile
head/bin/date/Makefile
head/bin/dd/Makefile
head/bin/echo/Makefile
head/bin/expr/Makefile
head/bin/ln/Makefile
head/bin/ls/Makefile
head/bin/mv/Makefile
head/bin/pax/Makefile
head/bin/pkill/Makefile
head/bin/sh/Makefile
head/bin/sleep/Makefile
head/bin/test/Makefile
head/cddl/Makefile
head/cddl/lib/Makefile
head/cddl/sbin/Makefile
head/cddl/usr.bin/Makefile
head/cddl/usr.sbin/Makefile
head/contrib/ofed/usr.bin/Makefile
head/gnu/Makefile
head/lib/atf/Makefile
head/lib/atf/libatf-c++/Makefile
head/lib/atf/libatf-c/Makefile
head/lib/libarchive/Makefile
head/lib/libc/Makefile
head/lib/libcasper/services/cap_dns/Makefile
head/lib/libcasper/services/cap_grp/Makefile
head/lib/libcasper/services/cap_pwd/Makefile
head/lib/libcasper/services/cap_sysctl/Makefile
head/lib/libcrypt/Makefile
head/lib/libmp/Makefile
head/lib/libnv/Makefile
head/lib/libpathconv/Makefile
head/lib/libproc/Makefile
head/lib/librt/Makefile
head/lib/libthr/Makefile
head/lib/libutil/Makefile
head/lib/libxo/Makefile
head/lib/msun/Makefile
head/libexec/atf/atf-check/Makefile
head/libexec/atf/atf-sh/Makefile
head/libexec/rtld-elf/Makefile
head/sbin/devd/Makefile
head/sbin/dhclient/Makefile
head/sbin/growfs/Makefile
head/sbin/ifconfig/Makefile
head/sbin/mdconfig/Makefile
head/sbin/pfctl/Makefile
head/secure/Makefile
head/secure/lib/Makefile
head/secure/libexec/Makefile
head/secure/usr.bin/Makefile
head/secure/usr.sbin/Makefile
head/share/Makefile
head/share/examples/Makefile
head/share/zoneinfo/Makefile
head/usr.bin/apply/Makefile
head/usr.bin/basename/Makefile
head/usr.bin/bsdcat/Makefile
head/usr.bin/calendar/Makefile
head/usr.bin/cmp/Makefile
head/usr.bin/col/Makefile
head/usr.bin/comm/Makefile
head/usr.bin/compress/Makefile
head/usr.bin/cpio/Makefile
head/usr.bin/csplit/Makefile
head/usr.bin/cut/Makefile
head/usr.bin/diff/Makefile
head/usr.bin/diff3/Makefile
head/usr.bin/dirname/Makefile
head/usr.bin/file2c/Makefile
head/usr.bin/getconf/Makefile
head/usr.bin/grep/Makefile
head/usr.bin/gzip/Makefile
head/usr.bin/hexdump/Makefile
head/usr.bin/ident/Makefile
head/usr.bin/indent/Makefile
head/usr.bin/join/Makefile
head/usr.bin/jot/Makefile
head/usr.bin/lastcomm/Makefile
head/usr.bin/limits/Makefile
head/usr.bin/m4/Makefile
head/usr.bin/mkimg/Makefile
head/usr.bin/ncal/Makefile
head/usr.bin/pr/Makefile
head/usr.bin/printf/Makefile
head/usr.bin/procstat/Makefile
head/usr.bin/sdiff/Makefile
head/usr.bin/sed/Makefile
head/usr.bin/soelim/Makefile
head/usr.bin/tail/Makefile
head/usr.bin/tar/Makefile
head/usr.bin/timeout/Makefile
head/usr.bin/tr/Makefile
head/usr.bin/truncate/Makefile
head/usr.bin/uniq/Makefile
head/usr.bin/units/Makefile
head/usr.bin/uudecode/Makefile
head/usr.bin/uuencode/Makefile
head/usr.bin/xargs/Makefile
head/usr.bin/xinstall/Makefile
head/usr.bin/xo/Makefile
head/usr.bin/yacc/Makefile
head/usr.sbin/chown/Makefile
head/usr.sbin/etcupdate/Makefile
head/usr.sbin/extattr/Makefile
head/usr.sbin/fstyp/Makefile
head/usr.sbin/makefs/Makefile
head/usr.sbin/newsyslog/Makefile
head/usr.sbin/nmtree/Makefile
head/usr.sbin/pw/Makefile
head/usr.sbin/rpcbind/Makefile
head/usr.sbin/sa/Makefile
Modified: head/bin/cat/Makefile
==============================================================================
--- head/bin/cat/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/cat/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@
PACKAGE=runtime
PROG= cat
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/date/Makefile
==============================================================================
--- head/bin/date/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/date/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -7,8 +7,6 @@ PACKAGE=runtime
PROG= date
SRCS= date.c netdate.c vary.c
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/dd/Makefile
==============================================================================
--- head/bin/dd/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/dd/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -38,8 +38,6 @@ test: ${PROG} gen
@rm -f gen 1M_zeroes* obs_zeroes
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/echo/Makefile
==============================================================================
--- head/bin/echo/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/echo/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@
PACKAGE=runtime
PROG= echo
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/expr/Makefile
==============================================================================
--- head/bin/expr/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/expr/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -12,8 +12,6 @@ CFLAGS+= -fwrapv
NO_WMISSING_VARIABLE_DECLARATIONS=
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/ln/Makefile
==============================================================================
--- head/bin/ln/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/ln/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -10,8 +10,6 @@ MAN= ln.1 symlink.7
LINKS= ${BINDIR}/ln ${BINDIR}/link
MLINKS= ln.1 link.1
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/ls/Makefile
==============================================================================
--- head/bin/ls/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/ls/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -14,8 +14,6 @@ CFLAGS+= -DCOLORLS
LIBADD+= termcapw
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/mv/Makefile
==============================================================================
--- head/bin/mv/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/mv/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@
PACKAGE=runtime
PROG= mv
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/pax/Makefile
==============================================================================
--- head/bin/pax/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/pax/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -33,8 +33,6 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file
gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
tables.c tar.c tty_subs.c
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/pkill/Makefile
==============================================================================
--- head/bin/pkill/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/pkill/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -19,8 +19,6 @@ MLINKS= pkill.1 pgrep.1
SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill
SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/sh/Makefile
==============================================================================
--- head/bin/sh/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/sh/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -64,8 +64,6 @@ syntax.c syntax.h: mksyntax
token.h: mktokens
sh ${.CURDIR}/mktokens
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/sleep/Makefile
==============================================================================
--- head/bin/sleep/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/sleep/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@
PACKAGE=runtime
PROG= sleep
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/bin/test/Makefile
==============================================================================
--- head/bin/test/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/bin/test/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -8,8 +8,6 @@ PROG= test
LINKS= ${BINDIR}/test ${BINDIR}/[
MLINKS= test.1 [.1
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/cddl/Makefile
==============================================================================
--- head/cddl/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/cddl/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,9 +5,7 @@
SUBDIR= lib .WAIT \
sbin usr.bin usr.sbin
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/cddl/lib/Makefile
==============================================================================
--- head/cddl/lib/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/cddl/lib/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -12,11 +12,8 @@ SUBDIR= ${_drti} \
${_libzfs_core} \
${_libzfs} \
${_libzpool} \
- ${_tests}
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.if ${MK_ZFS} != "no"
_libzfs_core= libzfs_core
Modified: head/cddl/sbin/Makefile
==============================================================================
--- head/cddl/sbin/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/cddl/sbin/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -2,11 +2,9 @@
.include <src.opts.mk>
-SUBDIR= ${_tests} ${_zfs} ${_zpool}
+SUBDIR= ${_zfs} ${_zpool}
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.if ${MK_ZFS} != "no"
_zfs= zfs
Modified: head/cddl/usr.bin/Makefile
==============================================================================
--- head/cddl/usr.bin/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/cddl/usr.bin/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,15 +6,12 @@ SUBDIR= \
ctfconvert \
ctfdump \
ctfmerge \
- ${_tests} \
${_zinject} \
${_zlook} \
${_zstreamdump} \
${_ztest}
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.if ${MK_ZFS} != "no"
_zinject= zinject
Modified: head/cddl/usr.sbin/Makefile
==============================================================================
--- head/cddl/usr.sbin/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/cddl/usr.sbin/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,14 +5,11 @@
SUBDIR= ${_dtrace} \
${_lockstat} \
${_plockstat} \
- ${_tests} \
${_zdb} \
${_zfsd} \
${_zhack}
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.if ${MK_ZFS} != "no"
.if ${MK_LIBTHR} != "no"
Modified: head/contrib/ofed/usr.bin/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/contrib/ofed/usr.bin/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -4,9 +4,7 @@ SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibrout
ibsysstat ibtracert opensm perfquery saquery \
sminfo smpdump smpquery vendstat
-.if ${MK_TESTS} != "no"
-SUBDIR+= osmtest
-.endif
+SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/gnu/Makefile
==============================================================================
--- head/gnu/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/gnu/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -4,11 +4,9 @@
.include <src.opts.mk>
SUBDIR= lib .WAIT \
- ${_tests} usr.bin
+ usr.bin
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/lib/atf/Makefile
==============================================================================
--- head/lib/atf/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/atf/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -29,10 +29,7 @@
SUBDIR= libatf-c \
libatf-c++ \
- ${_tests}
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.subdir.mk>
Modified: head/lib/atf/libatf-c++/Makefile
==============================================================================
--- head/lib/atf/libatf-c++/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/atf/libatf-c++/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -72,9 +72,7 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
MAN= atf-c++.3
MLINKS+= atf-c++.3 atf-c-api++.3 # Backwards compatibility.
-.if ${MK_TESTS} != "no"
-SUBDIR= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include "../common.mk"
.include <bsd.lib.mk>
Modified: head/lib/atf/libatf-c/Makefile
==============================================================================
--- head/lib/atf/libatf-c/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/atf/libatf-c/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -97,9 +97,7 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
MAN= atf-c.3
MLINKS+= atf-c.3 atf-c-api.3 # Backwards compatibility.
-.if ${MK_TESTS} != "no"
-SUBDIR= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include "../common.mk"
.include <bsd.lib.mk>
Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libarchive/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -413,8 +413,6 @@ MLINKS+= archive_write_set_options.3 archive_write_set
MLINKS+= archive_write_set_options.3 archive_write_set_option.3
MLINKS+= libarchive.3 archive.3
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libc/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -173,9 +173,7 @@ libkern.${LIBC_ARCH}:: ${KMSRCS}
${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libcasper/services/cap_dns/Makefile
==============================================================================
--- head/lib/libcasper/services/cap_dns/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libcasper/services/cap_dns/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libcasper/services/cap_grp/Makefile
==============================================================================
--- head/lib/libcasper/services/cap_grp/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libcasper/services/cap_grp/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libcasper/services/cap_pwd/Makefile
==============================================================================
--- head/lib/libcasper/services/cap_pwd/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libcasper/services/cap_pwd/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libcasper/services/cap_sysctl/Makefile
==============================================================================
--- head/lib/libcasper/services/cap_sysctl/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libcasper/services/cap_sysctl/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -18,8 +18,6 @@ LIBADD= nv
CFLAGS+=-I${.CURDIR}
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libcrypt/Makefile
==============================================================================
--- head/lib/libcrypt/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libcrypt/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -43,9 +43,7 @@ WARNS?= 2
PRECIOUSLIB=
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
.include <bsd.subdir.mk>
Modified: head/lib/libmp/Makefile
==============================================================================
--- head/lib/libmp/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libmp/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -15,8 +15,6 @@ CFLAGS+= -I${SRCTOP}/crypto
VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libnv/Makefile
==============================================================================
--- head/lib/libnv/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libnv/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -17,8 +17,6 @@ SRCS+= msgio.c
SRCS+= nvlist.c
SRCS+= nvpair.c
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libpathconv/Makefile
==============================================================================
--- head/lib/libpathconv/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libpathconv/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -13,8 +13,6 @@ SRCS= abs2rel.c rel2abs.c
#VERSION_DEF= ${SRCTOP/lib/libc/Versions.def
#SYMBOL_MAPS= ${.CURDIR}/Symbol.map
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libproc/Makefile
==============================================================================
--- head/lib/libproc/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libproc/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -41,8 +41,6 @@ SHLIB_MAJOR= 4
MAN=
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/librt/Makefile
==============================================================================
--- head/lib/librt/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/librt/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -21,8 +21,6 @@ PRECIOUSLIB=
VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS=${.CURDIR}/Symbol.map
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libthr/Makefile
==============================================================================
--- head/lib/libthr/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libthr/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -69,8 +69,6 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libutil/Makefile
==============================================================================
--- head/lib/libutil/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libutil/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -84,8 +84,6 @@ MLINKS+=pw_util.3 pw_copy.3 \
pw_util.3 pw_tempname.3 \
pw_util.3 pw_tmp.3
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/libxo/Makefile
==============================================================================
--- head/lib/libxo/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/libxo/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -110,8 +110,6 @@ MLINKS= xo_attr.3 xo_attr_h.3 \
xo_syslog.3 xo_set_logmask.3 \
xo_syslog.3 xo_vsyslog.3
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/lib/msun/Makefile
==============================================================================
--- head/lib/msun/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/lib/msun/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -228,8 +228,6 @@ MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3
.include <src.opts.mk>
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.lib.mk>
Modified: head/libexec/atf/atf-check/Makefile
==============================================================================
--- head/libexec/atf/atf-check/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/libexec/atf/atf-check/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -40,8 +40,6 @@ CFLAGS+= -DATF_SHELL='"/bin/sh"'
LIBADD= atf_cxx
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/libexec/atf/atf-sh/Makefile
==============================================================================
--- head/libexec/atf/atf-sh/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/libexec/atf/atf-sh/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -72,9 +72,7 @@ FILESGROUPS= SUBR
SUBRDIR= ${SHAREDIR}/atf
SUBR= libatf-sh.subr
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include "../../../lib/atf/common.mk"
.include <bsd.prog.mk>
Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/libexec/rtld-elf/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -85,9 +85,7 @@ beforeinstall:
.PATH: ${.CURDIR}/${RTLD_ARCH}
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
${PROG_FULL}: ${VERSION_MAP}
Modified: head/sbin/devd/Makefile
==============================================================================
--- head/sbin/devd/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/sbin/devd/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -18,8 +18,6 @@ CFLAGS+=-I. -I${.CURDIR}
CLEANFILES= y.output
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/sbin/dhclient/Makefile
==============================================================================
--- head/sbin/dhclient/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/sbin/dhclient/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -46,8 +46,6 @@ LIBADD= util
WARNS?= 2
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/sbin/growfs/Makefile
==============================================================================
--- head/sbin/growfs/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/sbin/growfs/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -22,8 +22,6 @@ NO_WCAST_ALIGN= yes
LIBADD= util
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/sbin/ifconfig/Makefile
==============================================================================
--- head/sbin/ifconfig/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/sbin/ifconfig/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -67,8 +67,6 @@ MAN= ifconfig.8
CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs
WARNS?= 2
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/sbin/mdconfig/Makefile
==============================================================================
--- head/sbin/mdconfig/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/sbin/mdconfig/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -8,8 +8,6 @@ MAN= mdconfig.8
LIBADD= util geom
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/sbin/pfctl/Makefile
==============================================================================
--- head/sbin/pfctl/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/sbin/pfctl/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -31,8 +31,6 @@ YFLAGS=
LIBADD= m md
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/secure/Makefile
==============================================================================
--- head/secure/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/secure/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -3,12 +3,10 @@
.include <src.opts.mk>
SUBDIR= lib .WAIT \
- libexec ${_tests} usr.bin usr.sbin
+ libexec usr.bin usr.sbin
SUBDIR_PARALLEL=
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
# These are the programs which depend on crypto, but not Kerberos.
SPROGS= lib/libfetch lib/libpam lib/libradius lib/libtelnet \
Modified: head/secure/lib/Makefile
==============================================================================
--- head/secure/lib/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/secure/lib/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -10,8 +10,6 @@ SUBDIR+=libssh
.endif
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.subdir.mk>
Modified: head/secure/libexec/Makefile
==============================================================================
--- head/secure/libexec/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/secure/libexec/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -7,9 +7,7 @@ SUBDIR=
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/secure/usr.bin/Makefile
==============================================================================
--- head/secure/usr.bin/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/secure/usr.bin/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -10,9 +10,7 @@ SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-
.endif
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/secure/usr.sbin/Makefile
==============================================================================
--- head/secure/usr.sbin/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/secure/usr.sbin/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -7,9 +7,7 @@ SUBDIR=
SUBDIR+=sshd
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/share/Makefile
==============================================================================
--- head/share/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/share/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -26,7 +26,6 @@ SUBDIR= ${_colldef} \
${_syscons} \
tabset \
termcap \
- ${_tests} \
${_timedef} \
${_vt} \
${_zoneinfo}
@@ -82,9 +81,7 @@ _doc= doc
_syscons= syscons
.endif
-.if ${MK_TESTS} != "no"
-_tests= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.if ${MK_VT} != "no"
_vt= vt
Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/share/examples/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -266,9 +266,7 @@ SUBDIR+=pf
.endif
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/share/zoneinfo/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -131,8 +131,6 @@ afterinstall:
echo "Run tzsetup(8) manually to update /etc/localtime."; \
fi
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/apply/Makefile
==============================================================================
--- head/usr.bin/apply/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/apply/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -7,8 +7,6 @@ PROG= apply
LIBADD= sbuf
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/basename/Makefile
==============================================================================
--- head/usr.bin/basename/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/basename/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@
PROG= basename
MLINKS= basename.1 dirname.1
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/bsdcat/Makefile
==============================================================================
--- head/usr.bin/bsdcat/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/bsdcat/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -24,8 +24,6 @@ LIBADD= archive
CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/calendar/Makefile
==============================================================================
--- head/usr.bin/calendar/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/calendar/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -33,8 +33,6 @@ beforeinstall:
${DESTDIR}${SHAREDIR}/calendar/${link}
.endfor
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/cmp/Makefile
==============================================================================
--- head/usr.bin/cmp/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/cmp/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@
PROG= cmp
SRCS= cmp.c link.c misc.c regular.c special.c
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/col/Makefile
==============================================================================
--- head/usr.bin/col/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/col/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,8 +5,6 @@
PROG= col
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/comm/Makefile
==============================================================================
--- head/usr.bin/comm/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/comm/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,8 +5,6 @@
PROG= comm
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/compress/Makefile
==============================================================================
--- head/usr.bin/compress/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/compress/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -11,8 +11,6 @@ MLINKS= compress.1 uncompress.1
# XXX zopen is not part of libc
# MAN=zopen.3
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/cpio/Makefile
==============================================================================
--- head/usr.bin/cpio/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/cpio/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -32,8 +32,6 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST
SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/csplit/Makefile
==============================================================================
--- head/usr.bin/csplit/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/csplit/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -4,8 +4,6 @@
PROG= csplit
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/cut/Makefile
==============================================================================
--- head/usr.bin/cut/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/cut/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,8 +5,6 @@
PROG= cut
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/diff/Makefile
==============================================================================
--- head/usr.bin/diff/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/diff/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,8 +5,6 @@
PROG= diff
SRCS= diff.c diffdir.c diffreg.c xmalloc.c
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/diff3/Makefile
==============================================================================
--- head/usr.bin/diff3/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/diff3/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -4,8 +4,6 @@
PROG= diff3
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/dirname/Makefile
==============================================================================
--- head/usr.bin/dirname/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/dirname/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@
PROG= dirname
MAN=
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/file2c/Makefile
==============================================================================
--- head/usr.bin/file2c/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/file2c/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -4,8 +4,6 @@
PROG= file2c
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/getconf/Makefile
==============================================================================
--- head/usr.bin/getconf/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/getconf/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -37,8 +37,6 @@ conflicting.names: confstr.names limits.names sysconf.
unique.names: conflicting.names
LC_ALL=C sort -u ${.ALLSRC} >${.TARGET}
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/grep/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -92,8 +92,6 @@ LIBADD+= gnuregex
CFLAGS+= -DWITHOUT_NLS
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/gzip/Makefile
==============================================================================
--- head/usr.bin/gzip/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/gzip/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -27,8 +27,6 @@ LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip \
${BINDIR}/gzip ${BINDIR}/zcat \
${BINDIR}/zdiff ${BINDIR}/zcmp
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/hexdump/Makefile
==============================================================================
--- head/usr.bin/hexdump/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/hexdump/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -10,8 +10,6 @@ MLINKS= hexdump.1 hd.1
LINKS= ${BINDIR}/hexdump ${BINDIR}/od
LINKS+= ${BINDIR}/hexdump ${BINDIR}/hd
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/ident/Makefile
==============================================================================
--- head/usr.bin/ident/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/ident/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -6,8 +6,6 @@ PROG= ident
LIBADD= sbuf
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/indent/Makefile
==============================================================================
--- head/usr.bin/indent/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/indent/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -8,8 +8,6 @@ SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c
NO_WMISSING_VARIABLE_DECLARATIONS=
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/join/Makefile
==============================================================================
--- head/usr.bin/join/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/join/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,8 +5,6 @@
PROG= join
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: head/usr.bin/jot/Makefile
==============================================================================
--- head/usr.bin/jot/Makefile Wed Aug 2 08:14:06 2017 (r321911)
+++ head/usr.bin/jot/Makefile Wed Aug 2 08:35:51 2017 (r321912)
@@ -5,8 +5,6 @@
PROG= jot
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list