From 90d99b346f570bebefd66f05176cc1c74f57560e Mon Sep 17 00:00:00 2001
From: Ryan Hitchman <rmmh@google.com>
Date: Wed, 28 Mar 2018 20:10:31 -0700
Subject: [PATCH] Fix spurious whitespace in messages from sh2ju.

<failure>
<![CDATA[
...
]]>
</failure>

creates a <failure> tag with text == "\n\n...\n".

It needs to be on one line.
---
 third_party/forked/shell2junit/sh2ju.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/third_party/forked/shell2junit/sh2ju.sh b/third_party/forked/shell2junit/sh2ju.sh
index e461475366a..64da996d631 100755
--- a/third_party/forked/shell2junit/sh2ju.sh
+++ b/third_party/forked/shell2junit/sh2ju.sh
@@ -136,21 +136,13 @@ function juLog() {
   # write the junit xml report
   ## failure tag
   [[ ${err} = 0 ]] && failure="" || failure="
-      <failure type=\"ScriptError\" message=\"Script Error\">
-      <![CDATA[
-      ${errMsg}
-      ]]>
-      </failure>
+      <failure type=\"ScriptError\" message=\"Script Error\"><![CDATA[${errMsg}]]></failure>
   "
   ## testcase tag
   content="${content}
     <testcase assertions=\"1\" name=\"${name}\" time=\"${time}\" classname=\"${class}\">
     ${failure}
-    <system-err>
-<![CDATA[
-${errMsg}
-]]>
-    </system-err>
+    <system-err><![CDATA[${errMsg}]]></system-err>
     </testcase>
   "
   ## testsuite block