aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-08-02 08:35:51 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-08-02 08:35:51 +0000
commit4b330699f819a81d8e34d471225143ffeb321855 (patch)
tree3794bbf32b858fa79c3e362a4b95adc8a7863010 /lib
parentcd155b56033ab2693464bdade23e2ccd623e9936 (diff)
downloadsrc-4b330699f819a81d8e34d471225143ffeb321855.tar.gz
src-4b330699f819a81d8e34d471225143ffeb321855.zip
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
Notes
Notes: svn path=/head/; revision=321912
Diffstat (limited to 'lib')
-rw-r--r--lib/atf/Makefile5
-rw-r--r--lib/atf/libatf-c++/Makefile4
-rw-r--r--lib/atf/libatf-c/Makefile4
-rw-r--r--lib/libarchive/Makefile4
-rw-r--r--lib/libc/Makefile4
-rw-r--r--lib/libcasper/services/cap_dns/Makefile4
-rw-r--r--lib/libcasper/services/cap_grp/Makefile4
-rw-r--r--lib/libcasper/services/cap_pwd/Makefile4
-rw-r--r--lib/libcasper/services/cap_sysctl/Makefile4
-rw-r--r--lib/libcrypt/Makefile4
-rw-r--r--lib/libmp/Makefile4
-rw-r--r--lib/libnv/Makefile4
-rw-r--r--lib/libpathconv/Makefile4
-rw-r--r--lib/libproc/Makefile4
-rw-r--r--lib/librt/Makefile4
-rw-r--r--lib/libthr/Makefile4
-rw-r--r--lib/libutil/Makefile4
-rw-r--r--lib/libxo/Makefile4
-rw-r--r--lib/msun/Makefile4
19 files changed, 19 insertions, 58 deletions
diff --git a/lib/atf/Makefile b/lib/atf/Makefile
index 481bce97f13e..baadf535b424 100644
--- 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
index 7325e324a945..08fa39bac893 100644
--- 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
index 4b9ccd2e7fca..4bb48694e817 100644
--- 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
index 646ee28f6c94..228854eeb3de 100644
--- 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
index 97739713cb07..2d4de5c0dfa6 100644
--- 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
index 4a36da134b3a..1317b317f5d7 100644
--- 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
index c2cc4b1a0b9f..2363fa06eb18 100644
--- 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
index ab4be4bacd14..11c37bcd1bdd 100644
--- 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
index 446ec5236e0b..32e1bef0f4f1 100644
--- 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
index a31cdbea34c0..7842c49e7491 100644
--- 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
index 16f96abaa030..496c6839da60 100644
--- 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
index 8ef5d2871124..9e4e7f1e20ca 100644
--- 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
index abdf127df0c8..10da9bb08d6d 100644
--- 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
index 6749251f0006..e487cd207604 100644
--- 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
index 5417b9ef3bff..97306ae59cff 100644
--- 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
index ffdb7b86b834..05c67fac087a 100644
--- 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>
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 847cb6297b0b..176360c656f0 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -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>
diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile
index 7af301fb9339..3bea6ebef71c 100644
--- a/lib/libxo/Makefile
+++ b/lib/libxo/Makefile
@@ -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>
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 99ab57ecf01a..ced343d0d01c 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -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>