Skip to content

K
k3s
Commit 9312af4f authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Fix newlines in TAP stdout/stderr output

It turns out, newlines are not "printable", causing the TAP stderr/stdout output to be smushed. Also address etune's comment on pr3208.
parent cae57229
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
hack/e2e.go
View file @ 9312af4f
...@@ -499,10 +499,12 @@ func printBashOutputs(headerprefix, lineprefix, stdout, stderr string, escape bo ...@@ -499,10 +499,12 @@ func printBashOutputs(headerprefix, lineprefix, stdout, stderr string, escape bo
func escapeOutput(s string) (out string) { func escapeOutput(s string) (out string) {
for _, r := range s { for _, r := range s {
switch { switch {
case r == '\n':
out += string(r)
case !strconv.IsPrint(r): case !strconv.IsPrint(r):
out += " " out += " "
case r == ':': case r == ':':
out += "\u02D0" // "ː", MODIFIER LETTER TRIANGULAR COLON out += "\ua789" // "꞉", modifier letter colon
default: default:
out += string(r) out += string(r)
} }
......
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