diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile index 8eb9fb99a368..d5a71d3c33a6 100644 --- a/lib/googletest/gmock/Makefile +++ b/lib/googletest/gmock/Makefile @@ -1,48 +1,45 @@ # $FreeBSD$ .include .PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src LIB_CXX= gmock SHLIB_MAJOR= 0 PRIVATELIB= true CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include LIBADD+= gtest LDFLAGS+= -L${.OBJDIR:H}/gtest INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} MAIN_INCS+= gmock/gmock-matchers.h MAIN_INCS+= gmock/gmock-more-actions.h MAIN_INCS+= gmock/gmock-generated-actions.h MAIN_INCS+= gmock/gmock-generated-matchers.h MAIN_INCS+= gmock/gmock-generated-nice-strict.h MAIN_INCS+= gmock/gmock-more-matchers.h MAIN_INCS+= gmock/gmock-generated-function-mockers.h MAIN_INCS+= gmock/gmock-cardinalities.h MAIN_INCS+= gmock/gmock-spec-builders.h MAIN_INCS+= gmock/gmock.h MAIN_INCS+= gmock/gmock-actions.h INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal INTERNAL_INCS+= gmock/internal/gmock-port.h INTERNAL_INCS+= gmock/internal/gmock-internal-utils.h INTERNAL_INCS+= gmock/internal/gmock-generated-internal-utils.h INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-port.h INTERNAL_CUSTOM_INCS+= gmock/internal/custom/gmock-matchers.h 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 a2ecab10d586..238f342d55eb 100644 --- a/lib/googletest/gmock_main/Makefile +++ b/lib/googletest/gmock_main/Makefile @@ -1,25 +1,22 @@ # $FreeBSD$ .include .PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src LIB_CXX= gmock_main SHLIB_MAJOR= 0 PRIVATELIB= true CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include LIBADD+= gmock # NB: LDFLAGS added for buildworld builds LDFLAGS+= -L${LIBGTESTDIR} LDFLAGS+= -L${LIBGMOCKDIR} SRCS+= gmock_main.cc -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - .include diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile index 103bf84db5b2..470682faebc1 100644 --- a/lib/googletest/gtest/Makefile +++ b/lib/googletest/gtest/Makefile @@ -1,53 +1,50 @@ # $FreeBSD$ .include .PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src LIB_CXX= gtest SHLIB_MAJOR= 0 PRIVATELIB= true CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS MAIN_INCSDIR= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} MAIN_INCS+= gtest/gtest-death-test.h MAIN_INCS+= gtest/gtest-message.h MAIN_INCS+= gtest/gtest-param-test.h MAIN_INCS+= gtest/gtest-printers.h MAIN_INCS+= gtest/gtest-spi.h MAIN_INCS+= gtest/gtest-test-part.h MAIN_INCS+= gtest/gtest-typed-test.h MAIN_INCS+= gtest/gtest.h MAIN_INCS+= gtest/gtest_pred_impl.h MAIN_INCS+= gtest/gtest_prod.h INTERNAL_INCSDIR= ${MAIN_INCSDIR}/internal INTERNAL_INCS+= gtest/internal/gtest-death-test-internal.h INTERNAL_INCS+= gtest/internal/gtest-filepath.h INTERNAL_INCS+= gtest/internal/gtest-internal.h INTERNAL_INCS+= gtest/internal/gtest-linked_ptr.h INTERNAL_INCS+= gtest/internal/gtest-param-util-generated.h INTERNAL_INCS+= gtest/internal/gtest-param-util.h INTERNAL_INCS+= gtest/internal/gtest-port-arch.h INTERNAL_INCS+= gtest/internal/gtest-port.h INTERNAL_INCS+= gtest/internal/gtest-string.h INTERNAL_INCS+= gtest/internal/gtest-tuple.h INTERNAL_INCS+= gtest/internal/gtest-type-util.h INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-port.h INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest-printers.h INTERNAL_CUSTOM_INCS+= gtest/internal/custom/gtest.h SRCS+= gtest-all.cc LIBADD+= pthread regex -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - .include diff --git a/lib/googletest/gtest_main/Makefile b/lib/googletest/gtest_main/Makefile index 1499482d878a..dc102ed8a6e0 100644 --- a/lib/googletest/gtest_main/Makefile +++ b/lib/googletest/gtest_main/Makefile @@ -1,23 +1,20 @@ # $FreeBSD$ .include .PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src LIB_CXX= gtest_main SHLIB_MAJOR= 0 PRIVATELIB= true CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} LIBADD+= gtest # NB: LDFLAGS added for buildworld builds LDFLAGS+= -L${LIBGTESTDIR} SRCS+= gtest_main.cc -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - .include diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile index 3b3078f8612a..1df9936ff6cf 100644 --- a/lib/googletest/tests/Makefile +++ b/lib/googletest/tests/Makefile @@ -1,6 +1,12 @@ # $FreeBSD$ .PATH: ${SRCTOP}/tests KYUAFILE= yes +# Note: we start the gmock_main and gmock tests first since those take up to +# 60 seconds to build, so starting them late seriously reduces build parallism. +SUBDIR= gmock_main gmock gtest_main gtest + +SUBDIR_PARALLEL= + .include diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc new file mode 100644 index 000000000000..3b6b7fc07a9b --- /dev/null +++ b/lib/googletest/tests/Makefile.inc @@ -0,0 +1,6 @@ +# $FreeBSD$ + +.include "../Makefile.inc" +# Keep the existing tests directory structure (with subdirs per component) +# rather than installing all of them to /usr/tests/lib/googletest +TESTSDIR= ${TESTSBASE}/lib/googletest/${.CURDIR:T} diff --git a/lib/googletest/gmock/tests/Makefile b/lib/googletest/tests/gmock/Makefile similarity index 100% rename from lib/googletest/gmock/tests/Makefile rename to lib/googletest/tests/gmock/Makefile diff --git a/lib/googletest/gmock_main/tests/Makefile b/lib/googletest/tests/gmock_main/Makefile similarity index 100% rename from lib/googletest/gmock_main/tests/Makefile rename to lib/googletest/tests/gmock_main/Makefile diff --git a/lib/googletest/gtest/tests/Makefile b/lib/googletest/tests/gtest/Makefile similarity index 100% rename from lib/googletest/gtest/tests/Makefile rename to lib/googletest/tests/gtest/Makefile diff --git a/lib/googletest/gtest_main/tests/Makefile b/lib/googletest/tests/gtest_main/Makefile similarity index 100% rename from lib/googletest/gtest_main/tests/Makefile rename to lib/googletest/tests/gtest_main/Makefile