From c766084e8ded7a01ced2652e8001839bcbc1550b Mon Sep 17 00:00:00 2001
From: Abhishek Jain <akjain2052@gmail.com>
Date: Mon, 21 Dec 2020 15:20:33 +0530
Subject: [PATCH] Fix TextFormatMapTest.DynamicMessage issue#5136

Clean up a multi-line string to conform to Unix line endings.
---
 src/google/protobuf/map_test.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc
index 8fb0b908f5a9..768858f76638 100644
--- a/src/google/protobuf/map_test.cc
+++ b/src/google/protobuf/map_test.cc
@@ -3528,6 +3528,7 @@ TEST(TextFormatMapTest, DynamicMessage) {
                                                   "testdata/map_test_data.txt"),
                         &expected_text, true));
 
+  CleanStringLineEndings(&expected_text, false);
   EXPECT_EQ(message->DebugString(), expected_text);
 }