Index: lib/googletest/gmock/Makefile =================================================================== --- lib/googletest/gmock/Makefile +++ lib/googletest/gmock/Makefile @@ -42,7 +42,4 @@ SRCS+= gmock-all.cc -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - .include Index: lib/googletest/gmock/tests/Makefile =================================================================== --- /dev/null +++ lib/googletest/gmock/tests/Makefile @@ -1,14 +0,0 @@ -# $FreeBSD$ - -.include - -.PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test - -GTESTS+= gmock_stress_test - -LIBADD+= pthread gtest gmock - -# The next release will resolve a number of build warnings issues. -NO_WERROR= - -.include Index: lib/googletest/gmock_main/Makefile =================================================================== --- lib/googletest/gmock_main/Makefile +++ lib/googletest/gmock_main/Makefile @@ -19,7 +19,4 @@ SRCS+= gmock_main.cc -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - .include Index: lib/googletest/gmock_main/tests/Makefile =================================================================== --- /dev/null +++ lib/googletest/gmock_main/tests/Makefile @@ -1,37 +0,0 @@ -# $FreeBSD$ - -.include - -.PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test - -GTESTS+= gmock-actions_test -GTESTS+= gmock-cardinalities_test -GTESTS+= gmock_ex_test -GTESTS+= gmock-generated-actions_test -GTESTS+= gmock-generated-function-mockers_test -GTESTS+= gmock-generated-internal-utils_test -GTESTS+= gmock-generated-matchers_test -GTESTS+= gmock-internal-utils_test -GTESTS+= gmock-matchers_test -GTESTS+= gmock-more-actions_test -GTESTS+= gmock-nice-strict_test -GTESTS+= gmock-port_test -GTESTS+= gmock-spec-builders_test -GTESTS+= gmock_link_test -GTESTS+= gmock_test - -CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include -CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} -CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -CXXFLAGS+= -I${GOOGLETEST_SRCROOT} - -SRCS.gmock_link_test= \ - gmock_link_test.cc \ - gmock_link2_test.cc - -LIBADD= gmock_main gmock gtest - -# The next release will resolve a number of build warnings issues. -NO_WERROR= - -.include Index: lib/googletest/gtest/Makefile =================================================================== --- lib/googletest/gtest/Makefile +++ lib/googletest/gtest/Makefile @@ -47,7 +47,4 @@ LIBADD+= pthread regex -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - .include Index: lib/googletest/gtest/tests/Makefile =================================================================== --- /dev/null +++ lib/googletest/gtest/tests/Makefile @@ -1,46 +0,0 @@ -# $FreeBSD$ - -.include - -.PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test - -GTESTS+= gtest_environment_test -GTESTS+= gtest_no_test_unittest -GTESTS+= googletest-param-test-test -GTESTS+= gtest_premature_exit_test -GTESTS+= gtest_repeat_test -GTESTS+= gtest_stress_test -GTESTS+= gtest_throw_on_failure_ex_test -GTESTS+= gtest-unittest-api_test - -CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -CXXFLAGS+= -I${GOOGLETEST_SRCROOT} - -.for death_test in gtest-death-test_ex_catch_test gtest-death-test_ex_nocatch_test -# XXX: copying source files in order to tweak CXXFLAGS seems hacky. -${death_test}.cc: googletest-death-test_ex_test.cc - ${CP} ${.ALLSRC} ${.TARGET} -CLEANFILES+= ${death_test}.cc -CXXFLAGS.${death_test}+= -fexception -.endfor - -CXXFLAGS.gtest-death-test_ex_catch_test+= \ - -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1 - -CXXFLAGS.gtest-death-test_ex_nocatch_test+= \ - -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0 - -SRCS.googletest-param-test-test= \ - googletest-param-test-test.cc \ - googletest-param-test2-test.cc - -LIBADD+= gtest - -# XXX: explicitly listing -lpthread is incorrect. src.libnames.mk should be -# handling this. -LIBADD.gtest_stress_test+= pthread - -# The next release will resolve a number of build warnings issues. -NO_WERROR= - -.include Index: lib/googletest/gtest_main/Makefile =================================================================== --- lib/googletest/gtest_main/Makefile +++ lib/googletest/gtest_main/Makefile @@ -17,7 +17,4 @@ SRCS+= gtest_main.cc -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - .include Index: lib/googletest/gtest_main/tests/Makefile =================================================================== --- /dev/null +++ lib/googletest/gtest_main/tests/Makefile @@ -1,44 +0,0 @@ -# $FreeBSD$ - -.include - -.PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test - -GTESTS+= googletest-death-test-test -GTESTS+= googletest-filepath-test -GTESTS+= googletest-linked-ptr-test -GTESTS+= googletest-listener-test -GTESTS+= gtest_main_unittest -GTESTS+= googletest-message-test -GTESTS+= googletest-options-test -GTESTS+= googletest-port-test -GTESTS+= gtest_pred_impl_unittest -GTESTS+= googletest-printers-test -GTESTS+= gtest_prod_test -GTESTS+= gtest_sole_header_test -GTESTS+= googletest-test-part-test -GTESTS+= gtest-typed-test_test -GTESTS+= gtest_skip_test -GTESTS+= gtest_skip_in_environment_setup_test -GTESTS+= gtest_unittest - -CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -CXXFLAGS+= -I${GOOGLETEST_SRCROOT} - -SRCS.gtest-typed-test_test= \ - gtest-typed-test_test.cc \ - gtest-typed-test2_test.cc - -SRCS.gtest_prod_test= \ - gtest_prod_test.cc \ - production.cc - -LIBADD+= gtest gtest_main - -LIBADD.googletest-port-test+= pthread -LIBADD.gtest_unittest+= pthread - -# The next release will resolve a number of build warnings issues. -NO_WERROR= - -.include Index: lib/googletest/tests/Makefile =================================================================== --- lib/googletest/tests/Makefile +++ lib/googletest/tests/Makefile @@ -3,4 +3,10 @@ .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 Index: lib/googletest/tests/Makefile.inc =================================================================== --- /dev/null +++ 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}