Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

testing: fix extra tabs when t.Log("string")

Browse source 
t.Log("line 1\nline 2\nline 3")

Old output:
=== RUN TestLine3
--- PASS: TestLine3 (0.00 seconds)
testing_test.go:25: 	line 1
		line 2
		line 3
		PASS

New output:
=== RUN TestLine3
--- PASS: TestLine3 (0.00 seconds)
testing_test.go:24: 	line 1
		line 2
		line 3
PASS

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6613069
This commit is contained in:
Shenghou Ma 2012-10-08 00:21:53 +08:00
parent f8485954bf
commit 51310d8320
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pkg/testing/testing.go
View file

@ -160,6 +160,9 @@ func decorate(s string) string {
fmt.Fprintf(buf, "%s:%d: ", file, line) fmt.Fprintf(buf, "%s:%d: ", file, line)
lines := strings.Split(s, "\n") lines := strings.Split(s, "\n")
if l := len(lines); l > 1 && lines[l-1] == "" {
lines = lines[:l-1]
}
for i, line := range lines { for i, line := range lines {
if i > 0 { if i > 0 {
buf.WriteByte('\n') buf.WriteByte('\n')
@ -172,10 +175,7 @@ func decorate(s string) string {
} }
buf.WriteString(line) buf.WriteString(line)
} }
if l := len(s); l > 0 && s[len(s)-1] != '\n' {
// Add final new line if needed.
buf.WriteByte('\n') buf.WriteByte('\n')
}
return buf.String() return buf.String()
} }