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
project-fifo · Aug 2, 2017 · d810089 · d810089
1 parent 43c5cd5
commit d810089
Show file tree

Hide file tree

Showing 113 changed files with 117 additions and 346 deletions.
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	cat
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/date/Makefile b/bin/date/Makefile
@@ -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>
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
@@ -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>
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	echo
 
-.if ${MK_TESTS} != "no"
-SUBDIR+= 	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
@@ -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>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
@@ -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>
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
@@ -14,8 +14,6 @@ CFLAGS+= -DCOLORLS
 LIBADD+=	termcapw
 .endif
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	mv
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
@@ -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 \
 	tables.c tar.c tty_subs.c
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
@@ -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>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
@@ -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>
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	sleep
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
diff --git a/bin/test/Makefile b/bin/test/Makefile
@@ -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>
diff --git a/cddl/Makefile b/cddl/Makefile
@@ -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=
 

diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
@@ -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

diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
@@ -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

diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
@@ -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

diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
@@ -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"

diff --git a/contrib/ofed/usr.bin/Makefile b/contrib/ofed/usr.bin/Makefile
@@ -4,9 +4,7 @@ SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat \
 	ibsysstat ibtracert opensm perfquery saquery \
 	sminfo smpdump smpquery vendstat
 
-.if ${MK_TESTS} != "no"
-SUBDIR+= osmtest
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 SUBDIR_PARALLEL=
 

diff --git a/gnu/Makefile b/gnu/Makefile
@@ -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=
 

diff --git a/lib/atf/Makefile b/lib/atf/Makefile
@@ -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>
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
@@ -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>
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
@@ -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>
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
@@ -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+=	libarchive.3 archive.3
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
@@ -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>
 

diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile
@@ -18,8 +18,6 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile
@@ -18,8 +18,6 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile
@@ -18,8 +18,6 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile
@@ -18,8 +18,6 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
@@ -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>
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
@@ -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>
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
@@ -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>
diff --git a/lib/libpathconv/Makefile b/lib/libpathconv/Makefile
@@ -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>
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
@@ -41,8 +41,6 @@ SHLIB_MAJOR=	4
 
 MAN=
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
@@ -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>
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
@@ -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>