From owner-svn-ports-all@freebsd.org Tue Jan 1 20:20:26 2019 Return-Path: Delivered-To: svn-ports-all@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 92CC31427416; Tue, 1 Jan 2019 20:20:26 +0000 (UTC) (envelope-from jbeich@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 31C5C84718; Tue, 1 Jan 2019 20:20:26 +0000 (UTC) (envelope-from jbeich@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 1F47B26F9B; Tue, 1 Jan 2019 20:20:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x01KKP7A037745; Tue, 1 Jan 2019 20:20:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x01KKPRa037744; Tue, 1 Jan 2019 20:20:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201901012020.x01KKPRa037744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 1 Jan 2019 20:20:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488934 - head/devel/googletest/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/googletest/files X-SVN-Commit-Revision: 488934 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 31C5C84718 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.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jan 2019 20:20:26 -0000 Author: jbeich Date: Tue Jan 1 20:20:25 2019 New Revision: 488934 URL: https://svnweb.freebsd.org/changeset/ports/488934 Log: devel/googletest: drop GCC 4.2 hack after r480987/r480989 Modified: head/devel/googletest/files/patch-bsd-defines (contents, props changed) Modified: head/devel/googletest/files/patch-bsd-defines ============================================================================== --- head/devel/googletest/files/patch-bsd-defines Tue Jan 1 20:13:42 2019 (r488933) +++ head/devel/googletest/files/patch-bsd-defines Tue Jan 1 20:20:25 2019 (r488934) @@ -1,6 +1,5 @@ o Add DragonFly and GNU/kFreeBSD support o Implement GetThreadCount() for BSDs -o Work around StreamingListenerTest with GCC 4.2 --- include/gtest/internal/gtest-port-arch.h.orig 2017-09-23 23:21:02 UTC +++ include/gtest/internal/gtest-port-arch.h @@ -177,21 +176,3 @@ o Work around StreamingListenerTest with GCC 4.2 void* ThreadFunc(void* data) { internal::Mutex* mutex = static_cast(data); mutex->Lock(); ---- test/gtest_unittest.cc.orig 2017-09-23 23:21:02 UTC -+++ test/gtest_unittest.cc -@@ -118,6 +118,7 @@ TEST_F(StreamingListenerTest, OnTestIterationEnd) { - EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output()); - } - -+#if GTEST_LANG_CXX11 // workaround breakage with GCC 4.2 - TEST_F(StreamingListenerTest, OnTestCaseStart) { - *output() = ""; - streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", NULL, NULL)); -@@ -129,6 +130,7 @@ TEST_F(StreamingListenerTest, OnTestCaseEnd) { - streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", NULL, NULL)); - EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output()); - } -+#endif - - TEST_F(StreamingListenerTest, OnTestStart) { - *output() = "";