Skip to content

Commit 0798325

Browse files
authored
Merge pull request kubernetes#129769 from aojea/revert-129701-test-shell-output
Revert "tests: include stdout of failed commands in JUnit"
2 parents a444a5b + 1065377 commit 0798325

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

third_party/forked/shell2junit/sh2ju.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
### -ierror="RegExp" : same as -error but case insensitive
2121
### -fail="RegExp" : Any line from stderr which contains this pattern becomes part of
2222
### the failure messsage, without the text matching that pattern.
23-
### Example: -fail="^ERROR: "
23+
### Example: -failure="^ERROR: "
2424
### Default is to use the entire stderr as failure message.
2525
### -output="Path" : path to output directory, defaults to "./results"
2626
### - Junit reports are left in the folder 'result' under the directory where the script is executed.
@@ -129,7 +129,6 @@ function juLog() {
129129
[[ -n "${H}" ]] && err=1
130130
fi
131131
[[ ${err} -ne 0 ]] && echo "+++ error: ${err}" | tee -a ${outf}
132-
outMsg=$(cat ${outf})
133132
rm -f ${outf}
134133

135134
errMsg=$(cat ${errf})
@@ -164,7 +163,6 @@ ${failureMsg}
164163
<testcase assertions=\"1\" name=\"${name}\" time=\"${time}\" classname=\"${class}\">
165164
${failure}
166165
<system-err><![CDATA[${errMsg}]]></system-err>
167-
<system-out><![CDATA[${outMsg}]]></system-out>
168166
</testcase>
169167
"
170168
## testsuite block

0 commit comments

Comments
 (0)