diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-07-17 15:36:04 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-07-17 15:36:04 -0400 |
| commit | ad52f7d0bd5c6f06a2fbade11f116f43cf814226 (patch) | |
| tree | a5fa57e409275c063f1d94531ceb95f1ebca0f2b | |
| parent | 63e878b6242f54385999e82271eb64c88c48afee (diff) | |
| parent | 0ef404e2e7ae9b6adea1c80b37182f49a25b6523 (diff) | |
| download | googletest-ad52f7d0bd5c6f06a2fbade11f116f43cf814226.tar.gz googletest-ad52f7d0bd5c6f06a2fbade11f116f43cf814226.tar.bz2 googletest-ad52f7d0bd5c6f06a2fbade11f116f43cf814226.zip | |
Merge branch 'master' of github.com:google/googletest
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 1 | ||||
| -rwxr-xr-x | googlemock/test/gmock_output_test.py | 4 |
2 files changed, 4 insertions, 1 deletions
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 <functional> #include <map> #include <memory> #include <set> 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. |