Date: Wed, 2 Aug 2017 08:38:36 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321913 - in projects/make-check-sandbox: 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... Message-ID: <201708020838.v728caF8018823@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Aug 2 08:38:36 2017 New Revision: 321913 URL: https://svnweb.freebsd.org/changeset/base/321913 Log: MFhead@r321912 Modified: projects/make-check-sandbox/bin/cat/Makefile projects/make-check-sandbox/bin/date/Makefile projects/make-check-sandbox/bin/dd/Makefile projects/make-check-sandbox/bin/echo/Makefile projects/make-check-sandbox/bin/expr/Makefile projects/make-check-sandbox/bin/ln/Makefile projects/make-check-sandbox/bin/ls/Makefile projects/make-check-sandbox/bin/mv/Makefile projects/make-check-sandbox/bin/pax/Makefile projects/make-check-sandbox/bin/pkill/Makefile projects/make-check-sandbox/bin/sh/Makefile projects/make-check-sandbox/bin/sleep/Makefile projects/make-check-sandbox/bin/test/Makefile projects/make-check-sandbox/cddl/Makefile projects/make-check-sandbox/cddl/lib/Makefile projects/make-check-sandbox/cddl/sbin/Makefile projects/make-check-sandbox/cddl/usr.bin/Makefile projects/make-check-sandbox/cddl/usr.sbin/Makefile projects/make-check-sandbox/contrib/ofed/usr.bin/Makefile projects/make-check-sandbox/gnu/Makefile projects/make-check-sandbox/lib/atf/Makefile projects/make-check-sandbox/lib/atf/libatf-c++/Makefile projects/make-check-sandbox/lib/atf/libatf-c/Makefile projects/make-check-sandbox/lib/libarchive/Makefile projects/make-check-sandbox/lib/libc/Makefile projects/make-check-sandbox/lib/libcasper/services/cap_dns/Makefile projects/make-check-sandbox/lib/libcasper/services/cap_grp/Makefile projects/make-check-sandbox/lib/libcasper/services/cap_pwd/Makefile projects/make-check-sandbox/lib/libcasper/services/cap_sysctl/Makefile projects/make-check-sandbox/lib/libcrypt/Makefile projects/make-check-sandbox/lib/libmp/Makefile projects/make-check-sandbox/lib/libnv/Makefile projects/make-check-sandbox/lib/libpathconv/Makefile projects/make-check-sandbox/lib/libproc/Makefile projects/make-check-sandbox/lib/librt/Makefile projects/make-check-sandbox/lib/libthr/Makefile projects/make-check-sandbox/lib/libutil/Makefile projects/make-check-sandbox/lib/libxo/Makefile projects/make-check-sandbox/lib/msun/Makefile projects/make-check-sandbox/libexec/atf/atf-check/Makefile projects/make-check-sandbox/libexec/atf/atf-sh/Makefile projects/make-check-sandbox/libexec/rtld-elf/Makefile projects/make-check-sandbox/sbin/devd/Makefile projects/make-check-sandbox/sbin/dhclient/Makefile projects/make-check-sandbox/sbin/growfs/Makefile projects/make-check-sandbox/sbin/ifconfig/Makefile projects/make-check-sandbox/sbin/mdconfig/Makefile projects/make-check-sandbox/sbin/pfctl/Makefile projects/make-check-sandbox/secure/Makefile projects/make-check-sandbox/secure/lib/Makefile projects/make-check-sandbox/secure/libexec/Makefile projects/make-check-sandbox/secure/usr.bin/Makefile projects/make-check-sandbox/secure/usr.sbin/Makefile projects/make-check-sandbox/share/Makefile projects/make-check-sandbox/share/examples/Makefile projects/make-check-sandbox/share/zoneinfo/Makefile projects/make-check-sandbox/sys/amd64/amd64/elf_machdep.c projects/make-check-sandbox/sys/amd64/amd64/initcpu.c projects/make-check-sandbox/sys/amd64/include/md_var.h projects/make-check-sandbox/sys/amd64/linux/linux_sysvec.c projects/make-check-sandbox/usr.bin/apply/Makefile projects/make-check-sandbox/usr.bin/basename/Makefile projects/make-check-sandbox/usr.bin/bsdcat/Makefile projects/make-check-sandbox/usr.bin/calendar/Makefile projects/make-check-sandbox/usr.bin/cmp/Makefile projects/make-check-sandbox/usr.bin/col/Makefile projects/make-check-sandbox/usr.bin/comm/Makefile projects/make-check-sandbox/usr.bin/compress/Makefile projects/make-check-sandbox/usr.bin/cpio/Makefile projects/make-check-sandbox/usr.bin/csplit/Makefile projects/make-check-sandbox/usr.bin/cut/Makefile projects/make-check-sandbox/usr.bin/diff/Makefile projects/make-check-sandbox/usr.bin/diff3/Makefile projects/make-check-sandbox/usr.bin/dirname/Makefile projects/make-check-sandbox/usr.bin/file2c/Makefile projects/make-check-sandbox/usr.bin/getconf/Makefile projects/make-check-sandbox/usr.bin/grep/Makefile projects/make-check-sandbox/usr.bin/gzip/Makefile projects/make-check-sandbox/usr.bin/hexdump/Makefile projects/make-check-sandbox/usr.bin/ident/Makefile projects/make-check-sandbox/usr.bin/indent/Makefile projects/make-check-sandbox/usr.bin/join/Makefile projects/make-check-sandbox/usr.bin/jot/Makefile projects/make-check-sandbox/usr.bin/lastcomm/Makefile projects/make-check-sandbox/usr.bin/limits/Makefile projects/make-check-sandbox/usr.bin/m4/Makefile projects/make-check-sandbox/usr.bin/mkimg/Makefile projects/make-check-sandbox/usr.bin/ncal/Makefile projects/make-check-sandbox/usr.bin/pr/Makefile projects/make-check-sandbox/usr.bin/printf/Makefile projects/make-check-sandbox/usr.bin/procstat/Makefile projects/make-check-sandbox/usr.bin/sdiff/Makefile projects/make-check-sandbox/usr.bin/sed/Makefile projects/make-check-sandbox/usr.bin/soelim/Makefile projects/make-check-sandbox/usr.bin/tail/Makefile projects/make-check-sandbox/usr.bin/tar/Makefile projects/make-check-sandbox/usr.bin/timeout/Makefile projects/make-check-sandbox/usr.bin/tr/Makefile projects/make-check-sandbox/usr.bin/truncate/Makefile projects/make-check-sandbox/usr.bin/uniq/Makefile projects/make-check-sandbox/usr.bin/units/Makefile projects/make-check-sandbox/usr.bin/uudecode/Makefile projects/make-check-sandbox/usr.bin/uuencode/Makefile projects/make-check-sandbox/usr.bin/xargs/Makefile projects/make-check-sandbox/usr.bin/xinstall/Makefile projects/make-check-sandbox/usr.bin/xo/Makefile projects/make-check-sandbox/usr.bin/yacc/Makefile projects/make-check-sandbox/usr.sbin/chown/Makefile projects/make-check-sandbox/usr.sbin/etcupdate/Makefile projects/make-check-sandbox/usr.sbin/extattr/Makefile projects/make-check-sandbox/usr.sbin/fstyp/Makefile projects/make-check-sandbox/usr.sbin/makefs/Makefile projects/make-check-sandbox/usr.sbin/newsyslog/Makefile projects/make-check-sandbox/usr.sbin/nmtree/Makefile projects/make-check-sandbox/usr.sbin/pw/Makefile projects/make-check-sandbox/usr.sbin/rpcbind/Makefile projects/make-check-sandbox/usr.sbin/sa/Makefile Directory Properties: projects/make-check-sandbox/ (props changed) projects/make-check-sandbox/cddl/ (props changed) Modified: projects/make-check-sandbox/bin/cat/Makefile ============================================================================== --- projects/make-check-sandbox/bin/cat/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/cat/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= cat -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/bin/date/Makefile ============================================================================== --- projects/make-check-sandbox/bin/date/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/date/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/bin/dd/Makefile ============================================================================== --- projects/make-check-sandbox/bin/dd/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/dd/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/bin/echo/Makefile ============================================================================== --- projects/make-check-sandbox/bin/echo/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/echo/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= echo -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/bin/expr/Makefile ============================================================================== --- projects/make-check-sandbox/bin/expr/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/expr/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/bin/ln/Makefile ============================================================================== --- projects/make-check-sandbox/bin/ln/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/ln/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/bin/ls/Makefile ============================================================================== --- projects/make-check-sandbox/bin/ls/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/ls/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/bin/mv/Makefile ============================================================================== --- projects/make-check-sandbox/bin/mv/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/mv/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= mv -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/bin/pax/Makefile ============================================================================== --- projects/make-check-sandbox/bin/pax/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/pax/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/bin/pkill/Makefile ============================================================================== --- projects/make-check-sandbox/bin/pkill/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/pkill/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/bin/sh/Makefile ============================================================================== --- projects/make-check-sandbox/bin/sh/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/sh/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -65,6 +65,6 @@ token.h: mktokens sh ${.CURDIR}/mktokens HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/bin/sleep/Makefile ============================================================================== --- projects/make-check-sandbox/bin/sleep/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/sleep/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= sleep -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/bin/test/Makefile ============================================================================== --- projects/make-check-sandbox/bin/test/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/bin/test/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/cddl/Makefile ============================================================================== --- projects/make-check-sandbox/cddl/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/cddl/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/cddl/lib/Makefile ============================================================================== --- projects/make-check-sandbox/cddl/lib/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/cddl/lib/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/cddl/sbin/Makefile ============================================================================== --- projects/make-check-sandbox/cddl/sbin/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/cddl/sbin/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/cddl/usr.bin/Makefile ============================================================================== --- projects/make-check-sandbox/cddl/usr.bin/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/cddl/usr.bin/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/cddl/usr.sbin/Makefile ============================================================================== --- projects/make-check-sandbox/cddl/usr.sbin/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/cddl/usr.sbin/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/contrib/ofed/usr.bin/Makefile ============================================================================== --- projects/make-check-sandbox/contrib/ofed/usr.bin/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/contrib/ofed/usr.bin/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/gnu/Makefile ============================================================================== --- projects/make-check-sandbox/gnu/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/gnu/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/atf/Makefile ============================================================================== --- projects/make-check-sandbox/lib/atf/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/atf/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/atf/libatf-c++/Makefile ============================================================================== --- projects/make-check-sandbox/lib/atf/libatf-c++/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/atf/libatf-c++/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/atf/libatf-c/Makefile ============================================================================== --- projects/make-check-sandbox/lib/atf/libatf-c/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/atf/libatf-c/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libarchive/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libarchive/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libarchive/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libc/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libc/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libc/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libcasper/services/cap_dns/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libcasper/services/cap_dns/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libcasper/services/cap_dns/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libcasper/services/cap_grp/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libcasper/services/cap_grp/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libcasper/services/cap_grp/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libcasper/services/cap_pwd/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libcasper/services/cap_pwd/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libcasper/services/cap_pwd/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libcasper/services/cap_sysctl/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libcasper/services/cap_sysctl/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libcasper/services/cap_sysctl/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libcrypt/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libcrypt/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libcrypt/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libmp/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libmp/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libmp/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libnv/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libnv/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libnv/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libpathconv/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libpathconv/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libpathconv/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libproc/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libproc/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libproc/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -41,8 +41,6 @@ SHLIB_MAJOR= 4 MAN= -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.lib.mk> Modified: projects/make-check-sandbox/lib/librt/Makefile ============================================================================== --- projects/make-check-sandbox/lib/librt/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/librt/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libthr/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libthr/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libthr/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libutil/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libutil/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libutil/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/libxo/Makefile ============================================================================== --- projects/make-check-sandbox/lib/libxo/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/libxo/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/lib/msun/Makefile ============================================================================== --- projects/make-check-sandbox/lib/msun/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/lib/msun/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/libexec/atf/atf-check/Makefile ============================================================================== --- projects/make-check-sandbox/libexec/atf/atf-check/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/libexec/atf/atf-check/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/libexec/atf/atf-sh/Makefile ============================================================================== --- projects/make-check-sandbox/libexec/atf/atf-sh/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/libexec/atf/atf-sh/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/libexec/rtld-elf/Makefile ============================================================================== --- projects/make-check-sandbox/libexec/rtld-elf/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/libexec/rtld-elf/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/sbin/devd/Makefile ============================================================================== --- projects/make-check-sandbox/sbin/devd/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sbin/devd/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/sbin/dhclient/Makefile ============================================================================== --- projects/make-check-sandbox/sbin/dhclient/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sbin/dhclient/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -46,8 +46,6 @@ LIBADD= util WARNS?= 2 -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/sbin/growfs/Makefile ============================================================================== --- projects/make-check-sandbox/sbin/growfs/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sbin/growfs/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/sbin/ifconfig/Makefile ============================================================================== --- projects/make-check-sandbox/sbin/ifconfig/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sbin/ifconfig/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/sbin/mdconfig/Makefile ============================================================================== --- projects/make-check-sandbox/sbin/mdconfig/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sbin/mdconfig/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/sbin/pfctl/Makefile ============================================================================== --- projects/make-check-sandbox/sbin/pfctl/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sbin/pfctl/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -31,8 +31,6 @@ YFLAGS= LIBADD= m md -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/secure/Makefile ============================================================================== --- projects/make-check-sandbox/secure/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/secure/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/secure/lib/Makefile ============================================================================== --- projects/make-check-sandbox/secure/lib/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/secure/lib/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -10,8 +10,6 @@ SUBDIR+=libssh .endif .endif -.if ${MK_TESTS} != "no" -SUBDIR+=tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.subdir.mk> Modified: projects/make-check-sandbox/secure/libexec/Makefile ============================================================================== --- projects/make-check-sandbox/secure/libexec/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/secure/libexec/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/secure/usr.bin/Makefile ============================================================================== --- projects/make-check-sandbox/secure/usr.bin/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/secure/usr.bin/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/secure/usr.sbin/Makefile ============================================================================== --- projects/make-check-sandbox/secure/usr.sbin/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/secure/usr.sbin/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -7,9 +7,7 @@ SUBDIR= SUBDIR+=sshd .endif -.if ${MK_TESTS} != "no" -SUBDIR+=tests -.endif +SUBDIR.${MK_TESTS}+= tests SUBDIR_PARALLEL= Modified: projects/make-check-sandbox/share/Makefile ============================================================================== --- projects/make-check-sandbox/share/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/share/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/share/examples/Makefile ============================================================================== --- projects/make-check-sandbox/share/examples/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/share/examples/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -266,9 +266,7 @@ SUBDIR+=pf .endif .endif -.if ${MK_TESTS} != "no" -SUBDIR+=tests -.endif +SUBDIR.${MK_TESTS}+= tests SUBDIR_PARALLEL= Modified: projects/make-check-sandbox/share/zoneinfo/Makefile ============================================================================== --- projects/make-check-sandbox/share/zoneinfo/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/share/zoneinfo/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/sys/amd64/amd64/elf_machdep.c ============================================================================== --- projects/make-check-sandbox/sys/amd64/amd64/elf_machdep.c Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sys/amd64/amd64/elf_machdep.c Wed Aug 2 08:38:36 2017 (r321913) @@ -84,6 +84,25 @@ struct sysentvec elf64_freebsd_sysvec = { }; INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec); +void +amd64_lower_shared_page(struct sysentvec *sv) +{ + if (hw_lower_amd64_sharedpage != 0) { + sv->sv_maxuser -= PAGE_SIZE; + sv->sv_shared_page_base -= PAGE_SIZE; + sv->sv_usrstack -= PAGE_SIZE; + sv->sv_psstrings -= PAGE_SIZE; + } +} + +/* + * Do this fixup before INIT_SYSENTVEC (SI_ORDER_ANY) because the latter + * uses the value of sv_shared_page_base. + */ +SYSINIT(elf64_sysvec_fixup, SI_SUB_EXEC, SI_ORDER_FIRST, + (sysinit_cfunc_t) amd64_lower_shared_page, + &elf64_freebsd_sysvec); + static Elf64_Brandinfo freebsd_brand_info = { .brand = ELFOSABI_FREEBSD, .machine = EM_X86_64, Modified: projects/make-check-sandbox/sys/amd64/amd64/initcpu.c ============================================================================== --- projects/make-check-sandbox/sys/amd64/amd64/initcpu.c Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sys/amd64/amd64/initcpu.c Wed Aug 2 08:38:36 2017 (r321913) @@ -48,6 +48,11 @@ __FBSDID("$FreeBSD$"); static int hw_instruction_sse; SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, &hw_instruction_sse, 0, "SIMD/MMX2 instructions available in CPU"); +static int lower_sharedpage_init; +int hw_lower_amd64_sharedpage; +SYSCTL_INT(_hw, OID_AUTO, lower_amd64_sharedpage, CTLFLAG_RDTUN, + &hw_lower_amd64_sharedpage, 0, + "Lower sharedpage to work around Ryzen issue with executing code near the top of user memory"); /* * -1: automatic (default) * 0: keep enable CLFLUSH @@ -120,6 +125,28 @@ init_amd(void) msr = rdmsr(0xc0011020); msr |= (uint64_t)1 << 15; wrmsr(0xc0011020, msr); + } + } + + /* + * Work around a problem on Ryzen that is triggered by executing + * code near the top of user memory, in our case the signal + * trampoline code in the shared page on amd64. + * + * This function is executed once for the BSP before tunables take + * effect so the value determined here can be overridden by the + * tunable. This function is then executed again for each AP and + * also on resume. Set a flag the first time so that value set by + * the tunable is not overwritten. + * + * The stepping and/or microcode versions should be checked after + * this issue is fixed by AMD so that we don't use this mode if not + * needed. + */ + if (lower_sharedpage_init == 0) { + lower_sharedpage_init = 1; + if (CPUID_TO_FAMILY(cpu_id) == 0x17) { + hw_lower_amd64_sharedpage = 1; } } } Modified: projects/make-check-sandbox/sys/amd64/include/md_var.h ============================================================================== --- projects/make-check-sandbox/sys/amd64/include/md_var.h Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sys/amd64/include/md_var.h Wed Aug 2 08:38:36 2017 (r321913) @@ -34,11 +34,14 @@ #include <x86/x86_var.h> -extern uint64_t *vm_page_dump; +extern uint64_t *vm_page_dump; +extern int hw_lower_amd64_sharedpage; struct savefpu; +struct sysentvec; void amd64_db_resume_dbreg(void); +void amd64_lower_shared_page(struct sysentvec *); void amd64_syscall(struct thread *td, int traced); void doreti_iret(void) __asm(__STRING(doreti_iret)); void doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault)); Modified: projects/make-check-sandbox/sys/amd64/linux/linux_sysvec.c ============================================================================== --- projects/make-check-sandbox/sys/amd64/linux/linux_sysvec.c Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/sys/amd64/linux/linux_sysvec.c Wed Aug 2 08:38:36 2017 (r321913) @@ -833,6 +833,8 @@ static void linux_vdso_install(void *param) { + amd64_lower_shared_page(&elf_linux_sysvec); + linux_szsigcode = (&_binary_linux_locore_o_end - &_binary_linux_locore_o_start); Modified: projects/make-check-sandbox/usr.bin/apply/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/apply/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/apply/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -7,8 +7,6 @@ PROG= apply LIBADD= sbuf -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/usr.bin/basename/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/basename/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/basename/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/usr.bin/bsdcat/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/bsdcat/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/bsdcat/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/usr.bin/calendar/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/calendar/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/calendar/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/usr.bin/cmp/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/cmp/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/cmp/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/usr.bin/col/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/col/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/col/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -5,8 +5,6 @@ PROG= col -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/usr.bin/comm/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/comm/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/comm/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -5,8 +5,6 @@ PROG= comm -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/usr.bin/compress/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/compress/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/compress/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/usr.bin/cpio/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/cpio/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/cpio/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/usr.bin/csplit/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/csplit/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/csplit/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -4,8 +4,6 @@ PROG= csplit -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/usr.bin/cut/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/cut/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/cut/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -5,8 +5,6 @@ PROG= cut -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/usr.bin/diff/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/diff/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/diff/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -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: projects/make-check-sandbox/usr.bin/diff3/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/diff3/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/diff3/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -4,8 +4,6 @@ PROG= diff3 -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/usr.bin/dirname/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/dirname/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/dirname/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -6,8 +6,6 @@ PROG= dirname MAN= -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/make-check-sandbox/usr.bin/file2c/Makefile ============================================================================== --- projects/make-check-sandbox/usr.bin/file2c/Makefile Wed Aug 2 08:35:51 2017 (r321912) +++ projects/make-check-sandbox/usr.bin/file2c/Makefile Wed Aug 2 08:38:36 2017 (r321913) @@ -4,8 +4,6 @@ PROG= file2c -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708020838.v728caF8018823>