From: Abseil Team <absl-team@google.com>
Date: Tue, 17 Jan 2023 15:12:03 +0000 (-0800)
Subject: gmock_output_test: normalize golden file output to unix line endings
X-Git-Tag: v1.13.0~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac7a126f39d5bcd909b78c9e69900c76659b1bbb;p=googletest.git

gmock_output_test: normalize golden file output to unix line endings

When checked out on Windows, the repo might use \r\n line endings,
and so the golden output has them.  Adjust for that.

PiperOrigin-RevId: 502577222
Change-Id: Iabfe537f6d95a49bf6bdcb934e855d28c65f6f89
---

diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py
index 6b4ab90..d7c3f27 100755
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
@@ -159,6 +159,9 @@ class GMockOutputTest(gmock_test_utils.TestCase):
     golden_file = open(GOLDEN_PATH, 'rb')
     golden = golden_file.read().decode('utf-8')
     golden_file.close()
+    # On Windows the repository might have been checked out with \r\n line
+    # endings, so normalize it here.
+    golden = ToUnixLineEnding(golden)
 
     # The normalized output should match the golden file.
     self.assertEqual(golden, output)