From: Robert Dinu <r@oktett.se>
Date: Thu, 21 Feb 2013 22:17:43 +0000 (-0800)
Subject: testing: fix output formatting
X-Git-Tag: go1.1rc2~913
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=782cbb4f90dc873eced4248e100e69a6502d7aee;p=gostls13.git

testing: fix output formatting

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
---

diff --git a/src/pkg/testing/testing.go b/src/pkg/testing/testing.go
index 357d6f5f27..b1dafd0c3d 100644
--- a/src/pkg/testing/testing.go
+++ b/src/pkg/testing/testing.go
@@ -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)
 	}