From 48687c79e89f5ee536e1ec40a4451113bbf5d665 Mon Sep 17 00:00:00 2001
From: willyn <willyn@google.com>
Date: Mon, 24 Jun 2024 20:37:18 +0000
Subject: [PATCH] Remove the --ignore-blank-lines flag from the
 e2e_logging_content.sh script.

PiperOrigin-RevId: 646205236
---
 test/integration/e2e_logging_content.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/test/integration/e2e_logging_content.sh b/test/integration/e2e_logging_content.sh
index 92988fc..1aabec0 100755
--- a/test/integration/e2e_logging_content.sh
+++ b/test/integration/e2e_logging_content.sh
@@ -74,16 +74,8 @@ echo "Checking output..."
 # Check the results
 readonly STDOUT_RESULT_EXPECTED="$(echo -n "${STDOUT_MSG%.}")"
 
-# There is a bug with the Batch API where blank lines
-# do not get printed to log files.
-# Temporarily ignore blank lines for the Batch provider.
-diff_args=()
-if [[ "${DSUB_PROVIDER}" == "google-batch" ]]; then
-  diff_args+=("--ignore-blank-lines")
-fi
-
 readonly STDOUT_RESULT="$(gsutil cat "${STDOUT_LOG}")"
-if ! diff "${diff_args[@]}" <(echo "${STDOUT_RESULT_EXPECTED}") <(echo "${STDOUT_RESULT}"); then
+if ! diff <(echo "${STDOUT_RESULT_EXPECTED}") <(echo "${STDOUT_RESULT}"); then
   echo "STDOUT file does not match expected"
   exit 1
 fi
@@ -91,7 +83,7 @@ fi
 readonly STDERR_RESULT_EXPECTED="$(echo -n "${STDERR_MSG%.}")"
 
 readonly STDERR_RESULT="$(gsutil cat "${STDERR_LOG}")"
-if ! diff "${diff_args[@]}" <(echo "${STDERR_RESULT_EXPECTED}") <(echo "${STDERR_RESULT}"); then
+if ! diff <(echo "${STDERR_RESULT_EXPECTED}") <(echo "${STDERR_RESULT}"); then
   echo "STDERR file does not match expected"
   exit 1
 fi