diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2020-04-09 01:55:35 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2020-04-09 01:55:35 +0000 |
| commit | cd024ff37bc5950173e4c7f34f7259d85825e810 (patch) | |
| tree | 24e26b52391d78c7c7b65168aca8f803fde926b1 /googletest/test/googletest-output-test.py | |
| parent | 83481c8c5c0cd0b3fc86f39b2985efd4e300200a (diff) | |
Notes
Diffstat (limited to 'googletest/test/googletest-output-test.py')
| -rwxr-xr-x | googletest/test/googletest-output-test.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googletest/test/googletest-output-test.py b/googletest/test/googletest-output-test.py index 2d69e353a19e..c727f17a4963 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 |