Date: Thu, 4 Apr 2019 18:11:57 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345883 - in projects/fuse2-googletest-engine: lib/googletest/gmock/tests lib/googletest/gtest/tests lib/googletest/gtest_main/tests share/mk Message-ID: <201904041811.x34IBvUT059837@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Apr 4 18:11:56 2019 New Revision: 345883 URL: https://svnweb.freebsd.org/changeset/base/345883 Log: Merge changes from ^/projects/kyua-use-googletest-test-interface svn merge -c 345749,345750 ^/projects/kyua-use-googletest-test-interface Modified: projects/fuse2-googletest-engine/lib/googletest/gmock/tests/Makefile projects/fuse2-googletest-engine/lib/googletest/gtest/tests/Makefile projects/fuse2-googletest-engine/lib/googletest/gtest_main/tests/Makefile projects/fuse2-googletest-engine/share/mk/googletest.test.mk Directory Properties: projects/fuse2-googletest-engine/ (props changed) Modified: projects/fuse2-googletest-engine/lib/googletest/gmock/tests/Makefile ============================================================================== --- projects/fuse2-googletest-engine/lib/googletest/gmock/tests/Makefile Thu Apr 4 17:29:43 2019 (r345882) +++ projects/fuse2-googletest-engine/lib/googletest/gmock/tests/Makefile Thu Apr 4 18:11:56 2019 (r345883) @@ -8,6 +8,11 @@ GTESTS+= gmock_stress_test LIBADD+= pthread gtest gmock +# This test cannot selectively run a single test, as it verifies results when +# `--gtest_list_tests` is run: +# https://github.com/google/googletest/issues/2204 +TEST_INTERFACE.gmock_stress_test= plain + # The next release will resolve a number of build warnings issues. NO_WERROR= Modified: projects/fuse2-googletest-engine/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/fuse2-googletest-engine/lib/googletest/gtest/tests/Makefile Thu Apr 4 17:29:43 2019 (r345882) +++ projects/fuse2-googletest-engine/lib/googletest/gtest/tests/Makefile Thu Apr 4 18:11:56 2019 (r345883) @@ -36,6 +36,17 @@ SRCS.googletest-param-test-test= \ LIBADD+= gtest +# These tests confuse the kyua googletest engine, as they don't conform to the +# googletest spec; they're functional unit tests for the library. +TEST_INTERFACE.gtest_environment_test= plain +TEST_INTERFACE.gtest_no_test_unittest= plain +TEST_INTERFACE.gtest_repeat_test= plain +TEST_INTERFACE.gtest_stress_test= plain +TEST_INTERFACE.gtest_throw_on_failure_ex_test= plain +# This test program cannot selectively run test suites/testcases: +# https://github.com/google/googletest/issues/2205 +TEST_INTERFACE.gtest-unittest-api_test= plain + # XXX: explicitly listing -lpthread is incorrect. src.libnames.mk should be # handling this. LIBADD.gtest_stress_test+= pthread Modified: projects/fuse2-googletest-engine/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/fuse2-googletest-engine/lib/googletest/gtest_main/tests/Makefile Thu Apr 4 17:29:43 2019 (r345882) +++ projects/fuse2-googletest-engine/lib/googletest/gtest_main/tests/Makefile Thu Apr 4 18:11:56 2019 (r345883) @@ -21,6 +21,11 @@ GTESTS+= gtest-typed-test_test GTESTS+= gtest_skip_test GTESTS+= gtest_unittest +# This test cannot selectively run a single test, as it verifies results when +# `--gtest_list_tests` is run: +# https://github.com/google/googletest/issues/2204 +TEST_INTERFACE.googletest-listener-test= plain + CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} Modified: projects/fuse2-googletest-engine/share/mk/googletest.test.mk ============================================================================== --- projects/fuse2-googletest-engine/share/mk/googletest.test.mk Thu Apr 4 17:29:43 2019 (r345882) +++ projects/fuse2-googletest-engine/share/mk/googletest.test.mk Thu Apr 4 18:11:56 2019 (r345883) @@ -26,6 +26,16 @@ # manpage. GTESTS?= +# Default test interface for googletest +# +# This knob should be used if the version of kyua in use doesn't support the +# `googletest` test interface. +.ifdef GTESTS_USE_PLAIN_TEST_INTERFACE +GTESTS_DEFAULT_TEST_INTERFACE= plain +.else +GTESTS_DEFAULT_TEST_INTERFACE= googletest +.endif + .if !empty(GTESTS) .include <googletest.test.inc.mk> @@ -36,6 +46,6 @@ BINDIR.${_T}= ${TESTSDIR} CXXFLAGS.${_T}+= ${GTESTS_CXXFLAGS} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}.cc -TEST_INTERFACE.${_T}= plain +TEST_INTERFACE.${_T}?= ${GTESTS_DEFAULT_TEST_INTERFACE} .endfor .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904041811.x34IBvUT059837>