Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 1 Jan 2019 20:20:25 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r488934 - head/devel/googletest/files
Message-ID:  <201901012020.x01KKPRa037744@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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<internal::Mutex*>(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() = "";

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901012020.x01KKPRa037744>