From owner-svn-src-projects@freebsd.org Tue Sep 3 14:06:00 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC666DC151 for ; Tue, 3 Sep 2019 14:05:59 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7yv1dv5z4P4Y; Tue, 3 Sep 2019 14:05:59 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 7CCD919F32; Tue, 3 Sep 2019 14:05:53 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id B5C0C15C5D; Sun, 31 Mar 2019 06:21:36 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F89C6BC0E; Sun, 31 Mar 2019 06:21:36 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1C55715C34; Sun, 31 Mar 2019 06:21:36 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 5756215C32 for ; Sun, 31 Mar 2019 06:21:33 +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 2A8776BC04; Sun, 31 Mar 2019 06:21:33 +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 0469E22BD6; Sun, 31 Mar 2019 06:21:33 +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 x2V6LWlp035877; Sun, 31 Mar 2019 06:21:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2V6LWC0035875; Sun, 31 Mar 2019 06:21:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903310621.x2V6LWC0035875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345750 - in projects/kyua-use-googletest-test-interface/lib/googletest: gmock/tests gtest/tests gtest_main/tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/kyua-use-googletest-test-interface/lib/googletest: gmock/tests gtest/tests gtest_main/tests X-SVN-Commit-Revision: 345750 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3F89C6BC0E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:01 -0000 X-Original-Date: Sun, 31 Mar 2019 06:21:32 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:01 -0000 Author: ngie Date: Sun Mar 31 06:21:32 2019 New Revision: 345750 URL: https://svnweb.freebsd.org/changeset/base/345750 Log: Use the test engine interface plain for some googlemock/googletest provided tests The issues are as follows: i. Some tests don't execute `RUN_ALL_TESTS()`. ii. Some tests incorrectly analyze the results when `--gtest_list_tests` is specified on the command line. iii. Some tests assume all tests are run (in order to analyze the results at the end of the test program as part of Environment::TearDown()). The above items cause Kyua googletest engine to bail, since there is spurious output on the command line (in the case of i. and ii.), or failures/asserts are needlessly triggered (in the case of iii.). Add comments noting why the testcases cannot use the googletest interface, along with their respective googletest issues. Case ii: https://github.com/google/googletest/issues/2204 Case iii: https://github.com/google/googletest/issues/2205 Modified: projects/kyua-use-googletest-test-interface/lib/googletest/gmock/tests/Makefile projects/kyua-use-googletest-test-interface/lib/googletest/gtest/tests/Makefile projects/kyua-use-googletest-test-interface/lib/googletest/gtest_main/tests/Makefile Modified: projects/kyua-use-googletest-test-interface/lib/googletest/gmock/tests/Makefile ============================================================================== --- projects/kyua-use-googletest-test-interface/lib/googletest/gmock/tests/Makefile Sun Mar 31 06:20:00 2019 (r345749) +++ projects/kyua-use-googletest-test-interface/lib/googletest/gmock/tests/Makefile Sun Mar 31 06:21:32 2019 (r345750) @@ -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/kyua-use-googletest-test-interface/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/kyua-use-googletest-test-interface/lib/googletest/gtest/tests/Makefile Sun Mar 31 06:20:00 2019 (r345749) +++ projects/kyua-use-googletest-test-interface/lib/googletest/gtest/tests/Makefile Sun Mar 31 06:21:32 2019 (r345750) @@ -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/kyua-use-googletest-test-interface/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/kyua-use-googletest-test-interface/lib/googletest/gtest_main/tests/Makefile Sun Mar 31 06:20:00 2019 (r345749) +++ projects/kyua-use-googletest-test-interface/lib/googletest/gtest_main/tests/Makefile Sun Mar 31 06:21:32 2019 (r345750) @@ -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}