summaryrefslogtreecommitdiff
path: root/lib/googletest
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2019-02-20 06:03:21 +0000
committerEnji Cooper <ngie@FreeBSD.org>2019-02-20 06:03:21 +0000
commitfedec5d9ee9ce0b6b7bfb2fdf083776ba0996d4c (patch)
tree2894e056ee042a122e702808a411be556e498cec /lib/googletest
parent1ed7b003f6a2cd3fcdfe2aee938b6dc88cd0c468 (diff)
downloadsrc-test2-fedec5d9ee9ce0b6b7bfb2fdf083776ba0996d4c.tar.gz
src-test2-fedec5d9ee9ce0b6b7bfb2fdf083776ba0996d4c.zip
Sprinkle `${HAS_TESTS}` in Makefiles
While here, reindent `SUBDIR.${MK_TESTS}`
Notes
Notes: svn path=/projects/import-googletest-1.8.1/; revision=344339
Diffstat (limited to 'lib/googletest')
-rw-r--r--lib/googletest/gmock/Makefile3
-rw-r--r--lib/googletest/gmock_main/Makefile3
-rw-r--r--lib/googletest/gtest/Makefile3
-rw-r--r--lib/googletest/gtest_main/Makefile3
4 files changed, 9 insertions, 3 deletions
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 <bsd.lib.mk>
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 <bsd.lib.mk>
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 <bsd.lib.mk>
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 <bsd.lib.mk>