From fcdca5dc0a1e672edddc9155c09c4e538608220b Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Thu, 12 Mar 2020 14:29:45 -0700
Subject: [PATCH] Handle the cases where stdout may have CRLF suffix on windows
 in xla parse_flags_from_env_test

PiperOrigin-RevId: 300624885
Change-Id: I794990b523cc7417298e41d3ebd49f441fd5432f
---
 tensorflow/compiler/xla/parse_flags_from_env_test.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/compiler/xla/parse_flags_from_env_test.cc b/tensorflow/compiler/xla/parse_flags_from_env_test.cc
index f967a788dec..e3552470f63 100644
--- a/tensorflow/compiler/xla/parse_flags_from_env_test.cc
+++ b/tensorflow/compiler/xla/parse_flags_from_env_test.cc
@@ -143,6 +143,9 @@ TEST(ParseFlagsFromEnv, EnvAndFlag) {
     string stdout_str;
     int child_status = child.Communicate(nullptr, &stdout_str, nullptr);
     CHECK_EQ(child_status, 0) << "test " << i;
+    // On windows, we get CR characters. Remove them.
+    stdout_str.erase(std::remove(stdout_str.begin(), stdout_str.end(), '\r'),
+                     stdout_str.end());
     CHECK_EQ(stdout_str, test[i].expected_value) << "test " << i;
   }
 }