From 1f809607b516cfe48a73b82c0f285ebd041c2763 Mon Sep 17 00:00:00 2001 From: Adam Badura Date: Thu, 11 Jul 2019 09:49:59 +0200 Subject: [PATCH 1/2] Add missing include gmock-spec-builders.h uses std::function (in MockFunction) but did not include to provide it. Apparently, it worked since the header must have been included by something else but better be safe than sorry. --- googlemock/include/gmock/gmock-spec-builders.h | 1 + 1 file changed, 1 insertion(+) diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 1f261bd2..255d6ad6 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -61,6 +61,7 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ +#include #include #include #include From 0ef404e2e7ae9b6adea1c80b37182f49a25b6523 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 17 Jul 2019 12:56:41 -0400 Subject: [PATCH 2/2] Googletest export Internal change PiperOrigin-RevId: 258587862 --- googlemock/test/gmock_output_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index 0527bd93..25f99f2b 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -39,6 +39,7 @@ gmock_output_test.py """ +from io import open # pylint: disable=redefined-builtin, g-importing-member import os import re import sys @@ -152,10 +153,11 @@ def GetNormalizedCommandOutputAndLeakyTests(cmd): class GMockOutputTest(gmock_test_utils.TestCase): + def testOutput(self): (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND) golden_file = open(GOLDEN_PATH, 'rb') - golden = golden_file.read() + golden = golden_file.read().decode('utf-8') golden_file.close() # The normalized output should match the golden file.