From fedec5d9ee9ce0b6b7bfb2fdf083776ba0996d4c Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 20 Feb 2019 06:03:21 +0000 Subject: [PATCH] Sprinkle `${HAS_TESTS}` in Makefiles While here, reindent `SUBDIR.${MK_TESTS}` --- cddl/usr.sbin/zfsd/Makefile | 3 ++- lib/googletest/gmock/Makefile | 3 +++ lib/googletest/gmock_main/Makefile | 3 ++- lib/googletest/gtest/Makefile | 3 ++- lib/googletest/gtest_main/Makefile | 3 ++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cddl/usr.sbin/zfsd/Makefile b/cddl/usr.sbin/zfsd/Makefile index d3642de340ff..205d4b84c200 100644 --- a/cddl/usr.sbin/zfsd/Makefile +++ b/cddl/usr.sbin/zfsd/Makefile @@ -7,6 +7,7 @@ PROG_CXX= zfsd MAN= zfsd.8 -SUBDIR.${MK_GOOGLETEST}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile index 8579d9a82e5a..f26cd5766e82 100644 --- a/lib/googletest/gmock/Makefile +++ b/lib/googletest/gmock/Makefile @@ -42,4 +42,7 @@ INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-generated-actions.h SRCS+= gmock-all.cc +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/lib/googletest/gmock_main/Makefile b/lib/googletest/gmock_main/Makefile index 374d623844a2..a2ecab10d586 100644 --- a/lib/googletest/gmock_main/Makefile +++ b/lib/googletest/gmock_main/Makefile @@ -19,6 +19,7 @@ LDFLAGS+= -L${LIBGMOCKDIR} SRCS+= gmock_main.cc -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile index 25f600df40a3..9caa7da787d9 100644 --- a/lib/googletest/gtest/Makefile +++ b/lib/googletest/gtest/Makefile @@ -47,6 +47,7 @@ SRCS+= gtest-all.cc LIBADD+= pthread -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include diff --git a/lib/googletest/gtest_main/Makefile b/lib/googletest/gtest_main/Makefile index a847518eb898..1499482d878a 100644 --- a/lib/googletest/gtest_main/Makefile +++ b/lib/googletest/gtest_main/Makefile @@ -17,6 +17,7 @@ LDFLAGS+= -L${LIBGTESTDIR} SRCS+= gtest_main.cc -SUBDIR.${MK_TESTS}+= tests +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include