mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 14:07:14 +00:00
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.
This commit is contained in:
parent
137268d332
commit
90d99b346f
12
third_party/forked/shell2junit/sh2ju.sh
vendored
12
third_party/forked/shell2junit/sh2ju.sh
vendored
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user