From cd024ff37bc5950173e4c7f34f7259d85825e810 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 9 Apr 2020 01:55:35 +0000 Subject: Import GoogleTest 1.10.0 GoogleTest 1.10.0 is the last official release series planned for GoogleTest. After 1.10.x, Google is switching GoogleTest to a "release on master" model, as documented here: https://abseil.io/about/philosophy . More information about what's captured between releases can be found on the GitHub release page: https://github.com/google/googletest/releases . --- googletest/test/googletest-output-test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'googletest/test/googletest-output-test.py') diff --git a/googletest/test/googletest-output-test.py b/googletest/test/googletest-output-test.py index 2d69e353a19e3..c727f17a4963a 100755 --- a/googletest/test/googletest-output-test.py +++ b/googletest/test/googletest-output-test.py @@ -55,7 +55,6 @@ NO_STACKTRACE_SUPPORT_FLAG = '--no_stacktrace_support' IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' IS_WINDOWS = os.name == 'nt' -# FIXME: remove the _lin suffix. GOLDEN_NAME = 'googletest-output-test-golden-lin.txt' PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('googletest-output-test_') @@ -287,7 +286,7 @@ class GTestOutputTest(gtest_test_utils.TestCase): # sequences when we read the golden file irrespective of an operating # system used. Therefore, we need to strip those \r's from newlines # unconditionally. - golden = ToUnixLineEnding(golden_file.read()) + golden = ToUnixLineEnding(golden_file.read().decode()) golden_file.close() # We want the test to pass regardless of certain features being -- cgit v1.2.3