Skip to content

Commit

Permalink
testing: fix output formatting
Browse files Browse the repository at this point in the history
Revision 5e7fd762f356 has changed the output formatting in a way that
is no longer in line with the format described by the revision
ff0ade0b937b which has introduced this functionality.
When decorating the first line, instead of indenting the whole line,
the current implementation adds indentation right after the "decorate"
part and  before the "log" message.
The fix addresses this issue.

R=golang-dev, iant, minux.ma, r, rsc, remyoudompheng
CC=golang-dev
https://golang.org/cl/7304094
  • Loading branch information
Robert Dinu authored and robpike committed Feb 21, 2013
1 parent 1903ad7 commit 782cbb4
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/pkg/testing/testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,21 +166,17 @@ func decorate(s string) string {
line = 1
}
buf := new(bytes.Buffer)
// Every line is indented at least one tab.
buf.WriteByte('\t')
fmt.Fprintf(buf, "%s:%d: ", file, line)

lines := strings.Split(s, "\n")
if l := len(lines); l > 1 && lines[l-1] == "" {
lines = lines[:l-1]
}
for i, line := range lines {
if i > 0 {
buf.WriteByte('\n')
}
// Every line is indented at least one tab.
buf.WriteByte('\t')
if i > 0 {
// Second and subsequent lines are indented an extra tab.
buf.WriteByte('\t')
buf.WriteString("\n\t\t")
}
buf.WriteString(line)
}
Expand Down

0 comments on commit 782cbb4

Please sign in to comment.