From 8c09935728787235a761b6104c91ad6885ed4cd8 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 2 Aug 2017 08:14:06 +0000 Subject: [PATCH] Add HAS_TESTS to all Makefiles that use the SUBDIR.${MK_TESTS}+= tests idiom --- bin/chmod/Makefile | 1 + bin/pwait/Makefile | 1 + bin/sh/Makefile | 5 ++--- lib/libcam/Makefile | 1 + lib/libkvm/Makefile | 1 + lib/libsbuf/Makefile | 1 + usr.bin/du/Makefile | 1 + usr.bin/stat/Makefile | 1 + 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile index 3b2c2d1ecac6..ffb3352ba553 100644 --- a/bin/chmod/Makefile +++ b/bin/chmod/Makefile @@ -6,6 +6,7 @@ PACKAGE=runtime PROG= chmod +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile index ab9f3ae73565..210ae3cdb918 100644 --- a/bin/pwait/Makefile +++ b/bin/pwait/Makefile @@ -5,6 +5,7 @@ PACKAGE=runtime PROG= pwait +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 65856de36491..62a74f80f79c 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -64,8 +64,7 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile index 4ea82681a071..47280e22c270 100644 --- a/lib/libcam/Makefile +++ b/lib/libcam/Makefile @@ -47,6 +47,7 @@ SHLIB_MAJOR= 7 .include +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index 38f997ae370d..3d3d6041da2b 100644 --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -38,6 +38,7 @@ MLINKS+=kvm_read.3 kvm_read2.3 kvm_read.3 kvm_write.3 .include +HAS_TESTS= SUBDIR.${MK_TESTS}= tests .include diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile index 3e89f11c1b6c..ac8be92c8dbd 100644 --- a/lib/libsbuf/Makefile +++ b/lib/libsbuf/Makefile @@ -14,6 +14,7 @@ VERSION_DEF= ${.CURDIR}/Version.def .PATH: ${SRCTOP}/sys/kern +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile index 4340812457d8..b9256f3cec30 100644 --- a/usr.bin/du/Makefile +++ b/usr.bin/du/Makefile @@ -6,6 +6,7 @@ PROG= du LIBADD= util +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile index bc560a4243d0..e0a5a10bcf58 100644 --- a/usr.bin/stat/Makefile +++ b/usr.bin/stat/Makefile @@ -7,6 +7,7 @@ PROG= stat LINKS= ${BINDIR}/stat ${BINDIR}/readlink MLINKS= stat.1 readlink.1 +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include