Skip to content

K
k3s
Commit 90d99b34 authored by Ryan Hitchman's avatar Ryan Hitchman
Browse files
Options

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.
parent 137268d3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
third_party/forked/shell2junit/sh2ju.sh
View file @ 90d99b34
...@@ -136,21 +136,13 @@ function juLog() { ...@@ -136,21 +136,13 @@ function juLog() {
# write the junit xml report # write the junit xml report
## failure tag ## failure tag
[[ ${err} = 0 ]] && failure="" || failure=" [[ ${err} = 0 ]] && failure="" || failure="
<failure type=\"ScriptError\" message=\"Script Error\"> <failure type=\"ScriptError\" message=\"Script Error\"><![CDATA[${errMsg}]]></failure>
<![CDATA[
${errMsg}
]]>
</failure>
" "
## testcase tag ## testcase tag
content="${content} content="${content}
<testcase assertions=\"1\" name=\"${name}\" time=\"${time}\" classname=\"${class}\"> <testcase assertions=\"1\" name=\"${name}\" time=\"${time}\" classname=\"${class}\">
${failure} ${failure}
<system-err> <system-err><![CDATA[${errMsg}]]></system-err>
<![CDATA[
${errMsg}
]]>
</system-err>
</testcase> </testcase>
" "
## testsuite block ## testsuite block
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment