From owner-svn-src-projects@freebsd.org Thu Apr 4 18:11:58 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 814981551BB8 for ; Thu, 4 Apr 2019 18:11:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 244A685D96; Thu, 4 Apr 2019 18:11:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2AF811C7; Thu, 4 Apr 2019 18:11:57 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x34IBvE2059841; Thu, 4 Apr 2019 18:11:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x34IBvUT059837; Thu, 4 Apr 2019 18:11:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904041811.x34IBvUT059837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 4 Apr 2019 18:11:57 +0000 (UTC) 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 X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/fuse2-googletest-engine: lib/googletest/gmock/tests lib/googletest/gtest/tests lib/googletest/gtest_main/tests share/mk X-SVN-Commit-Revision: 345883 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 244A685D96 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2019 18:11:58 -0000 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 @@ -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